Browse Source

Merge pull request #4549 in CORE/base-third from persist/10.0 to persist/jsy

* commit 'f5ca43cad3125c2bcaf8ac6bf6b63ae70728e1ba':
  REPORT-64924 update: bouncycastle要求从1.67升级到1.68
persist/jsy
superman 3 years ago
parent
commit
dcccf1a9cd
  1. 2
      fine-bouncycastle/readme.md
  2. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/LICENSE.java
  3. 3
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/BERGenerator.java
  4. 1
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/DERSequence.java
  5. 1
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/DERSet.java
  6. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Attribute.java
  7. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Attributes.java
  8. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/AuthEnvelopedData.java
  9. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/AuthenticatedData.java
  10. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CCMParameters.java
  11. 6
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CMSAttributes.java
  12. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CompressedData.java
  13. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CompressedDataParser.java
  14. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/ContentInfo.java
  15. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/ContentInfoParser.java
  16. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/DigestedData.java
  17. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EncryptedContentInfo.java
  18. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EncryptedContentInfoParser.java
  19. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EncryptedData.java
  20. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EnvelopedData.java
  21. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EnvelopedDataParser.java
  22. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Evidence.java
  23. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/GCMParameters.java
  24. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/IssuerAndSerialNumber.java
  25. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KEKIdentifier.java
  26. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KEKRecipientInfo.java
  27. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KeyAgreeRecipientIdentifier.java
  28. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java
  29. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java
  30. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/MetaData.java
  31. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java
  32. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OriginatorInfo.java
  33. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OriginatorPublicKey.java
  34. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OtherKeyAttribute.java
  35. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OtherRecipientInfo.java
  36. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OtherRevocationInfoFormat.java
  37. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java
  38. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientEncryptedKey.java
  39. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientIdentifier.java
  40. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientInfo.java
  41. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java
  42. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SCVPReqRes.java
  43. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignedData.java
  44. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignedDataParser.java
  45. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignerIdentifier.java
  46. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignerInfo.java
  47. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Time.java
  48. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampAndCRL.java
  49. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampTokenEvidence.java
  50. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampedData.java
  51. 7
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampedDataParser.java
  52. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/ecc/MQVuserKeyingMaterial.java
  53. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/dvcs/DVCSObjectIdentifiers.java
  54. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/eac/EACObjectIdentifiers.java
  55. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/isismtt/x509/AdmissionSyntax.java
  56. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/kisa/KISAObjectIdentifiers.java
  57. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/ntt/NTTObjectIdentifiers.java
  58. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java
  59. 32
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java
  60. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/teletrust/TeleTrusTNamedCurves.java
  61. 45
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/tsp/ArchiveTimeStamp.java
  62. 7
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/x500/style/BCStyle.java
  63. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/x509/KeyPurposeId.java
  64. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/x509/PolicyMappings.java
  65. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEParticipant.java
  66. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java
  67. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroups.java
  68. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEUtil.java
  69. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/digests/RIPEMD160Digest.java
  70. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/digests/SM3Digest.java
  71. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/digests/TigerDigest.java
  72. 1
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/encodings/OAEPEncoding.java
  73. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESEngine.java
  74. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESFastEngine.java
  75. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESLightEngine.java
  76. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESWrapEngine.java
  77. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/ARIAWrapEngine.java
  78. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/CamelliaWrapEngine.java
  79. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/DESedeWrapEngine.java
  80. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/HC128Engine.java
  81. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/HC256Engine.java
  82. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/ISAACEngine.java
  83. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/NaccacheSternEngine.java
  84. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RC2WrapEngine.java
  85. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RC532Engine.java
  86. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RC564Engine.java
  87. 4
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RFC3394WrapEngine.java
  88. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/SEEDWrapEngine.java
  89. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/SerpentEngine.java
  90. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/TnepresEngine.java
  91. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/Zuc128Engine.java
  92. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/Zuc256CoreEngine.java
  93. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/Zuc256Engine.java
  94. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java
  95. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java
  96. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java
  97. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java
  98. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/macs/Zuc128Mac.java
  99. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/macs/Zuc256Mac.java
  100. 2
      fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/modes/EAXBlockCipher.java
  101. Some files were not shown because too many files have changed in this diff Show More

2
fine-bouncycastle/readme.md

@ -1,2 +1,2 @@
版本:1.67<br> 版本:1.68<br>
源码:https://www.bouncycastle.org/latest_releases.html<br> 源码:https://www.bouncycastle.org/latest_releases.html<br>

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/LICENSE.java

@ -5,7 +5,7 @@ import com.fr.third.org.bouncycastle.util.Strings;
/** /**
* The Bouncy Castle License * The Bouncy Castle License
* *
* Copyright (c) 2000-2019 The Legion Of The Bouncy Castle Inc. (http://www.bouncycastle.org) * Copyright (c) 2000-2021 The Legion Of The Bouncy Castle Inc. (https://www.bouncycastle.org)
* <p> * <p>
* Permission is hereby granted, free of charge, to any person obtaining a copy of this software * Permission is hereby granted, free of charge, to any person obtaining a copy of this software
* and associated documentation files (the "Software"), to deal in the Software without restriction, * and associated documentation files (the "Software"), to deal in the Software without restriction,
@ -26,7 +26,7 @@ import com.fr.third.org.bouncycastle.util.Strings;
public class LICENSE public class LICENSE
{ {
public static final String licenseText = public static final String licenseText =
"Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (http://www.bouncycastle.org) " "Copyright (c) 2000-2021 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org) "
+ Strings.lineSeparator() + Strings.lineSeparator()
+ Strings.lineSeparator() + Strings.lineSeparator()
+ "Permission is hereby granted, free of charge, to any person obtaining a copy of this software " + "Permission is hereby granted, free of charge, to any person obtaining a copy of this software "

3
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/BERGenerator.java

@ -7,8 +7,7 @@ import java.io.OutputStream;
* Base class for generators for indefinite-length structures. * Base class for generators for indefinite-length structures.
*/ */
public class BERGenerator public class BERGenerator
extends extends ASN1Generator
ASN1Generator
{ {
private boolean _tagged = false; private boolean _tagged = false;
private boolean _isExplicit; private boolean _isExplicit;

1
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/DERSequence.java

@ -1,7 +1,6 @@
package com.fr.third.org.bouncycastle.asn1; package com.fr.third.org.bouncycastle.asn1;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
/** /**
* Definite length SEQUENCE, encoding tells explicit number of bytes * Definite length SEQUENCE, encoding tells explicit number of bytes

1
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/DERSet.java

@ -1,7 +1,6 @@
package com.fr.third.org.bouncycastle.asn1; package com.fr.third.org.bouncycastle.asn1;
import java.io.IOException; import java.io.IOException;
import java.io.OutputStream;
/** /**
* A DER encoded SET object * A DER encoded SET object

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Attribute.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1Set;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#page-14">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#page-14">RFC 5652</a>:
* Attribute is a pair of OID (as type identifier) + set of values. * Attribute is a pair of OID (as type identifier) + set of values.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Attributes.java

@ -8,7 +8,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DLSet; import com.fr.third.org.bouncycastle.asn1.DLSet;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652">RFC 5652</a> defines * <a href="https://tools.ietf.org/html/rfc5652">RFC 5652</a> defines
* 5 "SET OF Attribute" entities with 5 different names. * 5 "SET OF Attribute" entities with 5 different names.
* This is common implementation for them all: * This is common implementation for them all:
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/AuthEnvelopedData.java

@ -12,7 +12,7 @@ import com.fr.third.org.bouncycastle.asn1.BERSequence;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5083">RFC 5083</a>: * <a href="https://tools.ietf.org/html/rfc5083">RFC 5083</a>:
* *
* CMS AuthEnveloped Data object. * CMS AuthEnveloped Data object.
* <p> * <p>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/AuthenticatedData.java

@ -15,7 +15,7 @@ import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-9.1">RFC 5652</a> section 9.1: * <a href="https://tools.ietf.org/html/rfc5652#section-9.1">RFC 5652</a> section 9.1:
* The AuthenticatedData carries AuthAttributes and other data * The AuthenticatedData carries AuthAttributes and other data
* which define what really is being signed. * which define what really is being signed.
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CCMParameters.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.util.Arrays; import com.fr.third.org.bouncycastle.util.Arrays;
/** /**
* <a href="http://tools.ietf.org/html/rfc5084">RFC 5084</a>: CCMParameters object. * <a href="https://tools.ietf.org/html/rfc5084">RFC 5084</a>: CCMParameters object.
* <p> * <p>
* <pre> * <pre>
CCMParameters ::= SEQUENCE { CCMParameters ::= SEQUENCE {

6
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CMSAttributes.java

@ -5,8 +5,8 @@ import com.fr.third.org.bouncycastle.asn1.pkcs.PKCSObjectIdentifiers;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652">RFC 5652</a> CMS attribute OID constants. * <a href="https://tools.ietf.org/html/rfc5652">RFC 5652</a> CMS attribute OID constants.
* and <a href="http://tools.ietf.org/html/rfc6211">RFC 6211</a> Algorithm Identifier Protection Attribute. * and <a href="https://tools.ietf.org/html/rfc6211">RFC 6211</a> Algorithm Identifier Protection Attribute.
* <pre> * <pre>
* contentType ::= 1.2.840.113549.1.9.3 * contentType ::= 1.2.840.113549.1.9.3
* messageDigest ::= 1.2.840.113549.1.9.4 * messageDigest ::= 1.2.840.113549.1.9.4
@ -28,7 +28,7 @@ public interface CMSAttributes
ASN1ObjectIdentifier signingTime = PKCSObjectIdentifiers.pkcs_9_at_signingTime; ASN1ObjectIdentifier signingTime = PKCSObjectIdentifiers.pkcs_9_at_signingTime;
/** PKCS#9: 1.2.840.113549.1.9.6 */ /** PKCS#9: 1.2.840.113549.1.9.6 */
ASN1ObjectIdentifier counterSignature = PKCSObjectIdentifiers.pkcs_9_at_counterSignature; ASN1ObjectIdentifier counterSignature = PKCSObjectIdentifiers.pkcs_9_at_counterSignature;
/** PKCS#9: 1.2.840.113549.1.9.16.6.2.4 - See <a href="http://tools.ietf.org/html/rfc2634">RFC 2634</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.6.2.4 - See <a href="https://tools.ietf.org/html/rfc2634">RFC 2634</a> */
ASN1ObjectIdentifier contentHint = PKCSObjectIdentifiers.id_aa_contentHint; ASN1ObjectIdentifier contentHint = PKCSObjectIdentifiers.id_aa_contentHint;
ASN1ObjectIdentifier cmsAlgorithmProtect = PKCSObjectIdentifiers.id_aa_cmsAlgorithmProtect; ASN1ObjectIdentifier cmsAlgorithmProtect = PKCSObjectIdentifiers.id_aa_cmsAlgorithmProtect;

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CompressedData.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.BERSequence;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc3274">RFC 3274</a>: CMS Compressed Data. * <a href="https://tools.ietf.org/html/rfc3274">RFC 3274</a>: CMS Compressed Data.
* *
* <pre> * <pre>
* CompressedData ::= SEQUENCE { * CompressedData ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/CompressedDataParser.java

@ -7,7 +7,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1SequenceParser;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* Parser of <a href="http://tools.ietf.org/html/rfc3274">RFC 3274</a> {@link CompressedData} object. * Parser of <a href="https://tools.ietf.org/html/rfc3274">RFC 3274</a> {@link CompressedData} object.
* <p> * <p>
* <pre> * <pre>
* CompressedData ::= SEQUENCE { * CompressedData ::= SEQUENCE {

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/ContentInfo.java

@ -11,8 +11,8 @@ import com.fr.third.org.bouncycastle.asn1.BERSequence;
import com.fr.third.org.bouncycastle.asn1.BERTaggedObject; import com.fr.third.org.bouncycastle.asn1.BERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-3">RFC 5652</a> ContentInfo, and * <a href="https://tools.ietf.org/html/rfc5652#section-3">RFC 5652</a> ContentInfo, and
* <a href="http://tools.ietf.org/html/rfc5652#section-5.2">RFC 5652</a> EncapsulatedContentInfo objects. * <a href="https://tools.ietf.org/html/rfc5652#section-5.2">RFC 5652</a> EncapsulatedContentInfo objects.
* *
* <pre> * <pre>
* ContentInfo ::= SEQUENCE { * ContentInfo ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/ContentInfoParser.java

@ -8,7 +8,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1SequenceParser;
import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObjectParser; import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObjectParser;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-3">RFC 5652</a> {@link ContentInfo} object parser. * <a href="https://tools.ietf.org/html/rfc5652#section-3">RFC 5652</a> {@link ContentInfo} object parser.
* *
* <pre> * <pre>
* ContentInfo ::= SEQUENCE { * ContentInfo ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/DigestedData.java

@ -12,7 +12,7 @@ import com.fr.third.org.bouncycastle.asn1.DEROctetString;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-7">RFC 5652</a> DigestedData object. * <a href="https://tools.ietf.org/html/rfc5652#section-7">RFC 5652</a> DigestedData object.
* <pre> * <pre>
* DigestedData ::= SEQUENCE { * DigestedData ::= SEQUENCE {
* version CMSVersion, * version CMSVersion,

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EncryptedContentInfo.java

@ -12,7 +12,7 @@ import com.fr.third.org.bouncycastle.asn1.BERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EncryptedContentInfo object. * <a href="https://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EncryptedContentInfo object.
* *
* <pre> * <pre>
* EncryptedContentInfo ::= SEQUENCE { * EncryptedContentInfo ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EncryptedContentInfoParser.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObjectParser;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* Parser for <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EncryptedContentInfo object. * Parser for <a href="https://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EncryptedContentInfo object.
* <p> * <p>
* <pre> * <pre>
* EncryptedContentInfo ::= SEQUENCE { * EncryptedContentInfo ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EncryptedData.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.BERSequence;
import com.fr.third.org.bouncycastle.asn1.BERTaggedObject; import com.fr.third.org.bouncycastle.asn1.BERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-8">RFC 5652</a> EncryptedData object. * <a href="https://tools.ietf.org/html/rfc5652#section-8">RFC 5652</a> EncryptedData object.
* <p> * <p>
* <pre> * <pre>
* EncryptedData ::= SEQUENCE { * EncryptedData ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EnvelopedData.java

@ -13,7 +13,7 @@ import com.fr.third.org.bouncycastle.asn1.BERSequence;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EnvelopedData object. * <a href="https://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> EnvelopedData object.
* <pre> * <pre>
* EnvelopedData ::= SEQUENCE { * EnvelopedData ::= SEQUENCE {
* version CMSVersion, * version CMSVersion,

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/EnvelopedDataParser.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObjectParser;
import com.fr.third.org.bouncycastle.asn1.BERTags; import com.fr.third.org.bouncycastle.asn1.BERTags;
/** /**
* Parser of <a href="http://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> {@link EnvelopedData} object. * Parser of <a href="https://tools.ietf.org/html/rfc5652#section-6.1">RFC 5652</a> {@link EnvelopedData} object.
* <p> * <p>
* <pre> * <pre>
* EnvelopedData ::= SEQUENCE { * EnvelopedData ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Evidence.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.tsp.EvidenceRecord; import com.fr.third.org.bouncycastle.asn1.tsp.EvidenceRecord;
/** /**
* <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>: * <a href="https://tools.ietf.org/html/rfc5544">RFC 5544</a>:
* Binding Documents with Time-Stamps; Evidence object. * Binding Documents with Time-Stamps; Evidence object.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/GCMParameters.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.util.Arrays; import com.fr.third.org.bouncycastle.util.Arrays;
/** /**
* <a href="http://tools.ietf.org/html/rfc5084">RFC 5084</a>: GCMParameters object. * <a href="https://tools.ietf.org/html/rfc5084">RFC 5084</a>: GCMParameters object.
* <p> * <p>
* <pre> * <pre>
GCMParameters ::= SEQUENCE { GCMParameters ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/IssuerAndSerialNumber.java

@ -14,7 +14,7 @@ import com.fr.third.org.bouncycastle.asn1.x509.X509CertificateStructure;
import com.fr.third.org.bouncycastle.asn1.x509.X509Name; import com.fr.third.org.bouncycastle.asn1.x509.X509Name;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-10.2.4">RFC 5652</a>: IssuerAndSerialNumber object. * <a href="https://tools.ietf.org/html/rfc5652#section-10.2.4">RFC 5652</a>: IssuerAndSerialNumber object.
* <p> * <p>
* <pre> * <pre>
* IssuerAndSerialNumber ::= SEQUENCE { * IssuerAndSerialNumber ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KEKIdentifier.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DEROctetString;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.3">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.3">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KEKRecipientInfo.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.3">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.3">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KeyAgreeRecipientIdentifier.java

@ -8,7 +8,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KeyAgreeRecipientInfo.java

@ -12,7 +12,7 @@ import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/KeyTransRecipientInfo.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <pre> * <pre>
* KeyTransRecipientInfo ::= SEQUENCE { * KeyTransRecipientInfo ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/MetaData.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.asn1.DERUTF8String; import com.fr.third.org.bouncycastle.asn1.DERUTF8String;
/** /**
* <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>: * <a href="https://tools.ietf.org/html/rfc5544">RFC 5544</a>:
* Binding Documents with Time-Stamps; MetaData object. * Binding Documents with Time-Stamps; MetaData object.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OriginatorIdentifierOrKey.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.x509.SubjectKeyIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.SubjectKeyIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <pre> * <pre>
* OriginatorIdentifierOrKey ::= CHOICE { * OriginatorIdentifierOrKey ::= CHOICE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OriginatorInfo.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>: OriginatorInfo object. * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>: OriginatorInfo object.
* <pre> * <pre>
* RFC 3369: * RFC 3369:
* *

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OriginatorPublicKey.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OtherKeyAttribute.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1Sequence;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-10.2.7">RFC 5652</a>: OtherKeyAttribute object. * <a href="https://tools.ietf.org/html/rfc5652#section-10.2.7">RFC 5652</a>: OtherKeyAttribute object.
* <p> * <p>
* <pre> * <pre>
* OtherKeyAttribute ::= SEQUENCE { * OtherKeyAttribute ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OtherRecipientInfo.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.5">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.5">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <pre> * <pre>
* OtherRecipientInfo ::= SEQUENCE { * OtherRecipientInfo ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/OtherRevocationInfoFormat.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-10.2.1">RFC 5652</a>: OtherRevocationInfoFormat object. * <a href="https://tools.ietf.org/html/rfc5652#section-10.2.1">RFC 5652</a>: OtherRevocationInfoFormat object.
* <p> * <p>
* <pre> * <pre>
* OtherRevocationInfoFormat ::= SEQUENCE { * OtherRevocationInfoFormat ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/PasswordRecipientInfo.java

@ -12,7 +12,7 @@ import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-10.2.7">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-10.2.7">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <pre> * <pre>
* PasswordRecipientInfo ::= SEQUENCE { * PasswordRecipientInfo ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientEncryptedKey.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <pre> * <pre>
* RecipientEncryptedKey ::= SEQUENCE { * RecipientEncryptedKey ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientIdentifier.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.1">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <pre> * <pre>
* RecipientIdentifier ::= CHOICE { * RecipientIdentifier ::= CHOICE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientInfo.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/RecipientKeyIdentifier.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DEROctetString;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-6.2.2">RFC 5652</a>:
* Content encryption key delivery mechanisms. * Content encryption key delivery mechanisms.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SCVPReqRes.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5940">RFC 5940</a>: * <a href="https://tools.ietf.org/html/rfc5940">RFC 5940</a>:
* Additional Cryptographic Message Syntax (CMS) Revocation Information Choices. * Additional Cryptographic Message Syntax (CMS) Revocation Information Choices.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignedData.java

@ -16,7 +16,7 @@ import com.fr.third.org.bouncycastle.asn1.BERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-5.1">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-5.1">RFC 5652</a>:
* <p> * <p>
* A signed data object containing multitude of {@link SignerInfo}s. * A signed data object containing multitude of {@link SignerInfo}s.
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignedDataParser.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObjectParser;
import com.fr.third.org.bouncycastle.asn1.BERTags; import com.fr.third.org.bouncycastle.asn1.BERTags;
/** /**
* Parser for <a href="http://tools.ietf.org/html/rfc5652#section-5.1">RFC 5652</a>: {@link SignedData} object. * Parser for <a href="https://tools.ietf.org/html/rfc5652#section-5.1">RFC 5652</a>: {@link SignedData} object.
* <p> * <p>
* <pre> * <pre>
* SignedData ::= SEQUENCE { * SignedData ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignerIdentifier.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERTaggedObject; import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-5.3">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-5.3">RFC 5652</a>:
* Identify who signed the containing {@link SignerInfo} object. * Identify who signed the containing {@link SignerInfo} object.
* <p> * <p>
* The certificates referred to by this are at containing {@link SignedData} structure. * The certificates referred to by this are at containing {@link SignedData} structure.

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/SignerInfo.java

@ -16,7 +16,7 @@ import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier; import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-5.3">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-5.3">RFC 5652</a>:
* Signature container per Signer, see {@link SignerIdentifier}. * Signature container per Signer, see {@link SignerIdentifier}.
* <pre> * <pre>
* PKCS#7: * PKCS#7:

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/Time.java

@ -16,7 +16,7 @@ import com.fr.third.org.bouncycastle.asn1.DERGeneralizedTime;
import com.fr.third.org.bouncycastle.asn1.DERUTCTime; import com.fr.third.org.bouncycastle.asn1.DERUTCTime;
/** /**
* <a href="http://tools.ietf.org/html/rfc5652#section-11.3">RFC 5652</a>: * <a href="https://tools.ietf.org/html/rfc5652#section-11.3">RFC 5652</a>:
* Dual-mode timestamp format producing either UTCTIme or GeneralizedTime. * Dual-mode timestamp format producing either UTCTIme or GeneralizedTime.
* <p> * <p>
* <pre> * <pre>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampAndCRL.java

@ -8,7 +8,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
import com.fr.third.org.bouncycastle.asn1.x509.CertificateList; import com.fr.third.org.bouncycastle.asn1.x509.CertificateList;
/** /**
* <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a> * <a href="https://tools.ietf.org/html/rfc5544">RFC 5544</a>
* Binding Documents with Time-Stamps; TimeStampAndCRL object. * Binding Documents with Time-Stamps; TimeStampAndCRL object.
* <pre> * <pre>
* TimeStampAndCRL ::= SEQUENCE { * TimeStampAndCRL ::= SEQUENCE {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampTokenEvidence.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1TaggedObject;
import com.fr.third.org.bouncycastle.asn1.DERSequence; import com.fr.third.org.bouncycastle.asn1.DERSequence;
/** /**
* <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a> * <a href="https://tools.ietf.org/html/rfc5544">RFC 5544</a>
* Binding Documents with Time-Stamps; TimeStampTokenEvidence object. * Binding Documents with Time-Stamps; TimeStampTokenEvidence object.
* <pre> * <pre>
* TimeStampTokenEvidence ::= * TimeStampTokenEvidence ::=

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampedData.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.BERSequence;
import com.fr.third.org.bouncycastle.asn1.DERIA5String; import com.fr.third.org.bouncycastle.asn1.DERIA5String;
/** /**
* <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>: * <a href="https://tools.ietf.org/html/rfc5544">RFC 5544</a>:
* Binding Documents with Time-Stamps; TimeStampedData object. * Binding Documents with Time-Stamps; TimeStampedData object.
* <p> * <p>
* <pre> * <pre>

7
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/TimeStampedDataParser.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1SequenceParser;
import com.fr.third.org.bouncycastle.asn1.DERIA5String; import com.fr.third.org.bouncycastle.asn1.DERIA5String;
/** /**
* Parser for <a href="http://tools.ietf.org/html/rfc5544">RFC 5544</a>: * Parser for <a href="https://tools.ietf.org/html/rfc5544">RFC 5544</a>:
* {@link TimeStampedData} object. * {@link TimeStampedData} object.
* <p> * <p>
* <pre> * <pre>
@ -71,6 +71,11 @@ public class TimeStampedDataParser
return null; return null;
} }
public int getVersion()
{
return version.getValue().intValue();
}
public DERIA5String getDataUri() public DERIA5String getDataUri()
{ {
return dataUri; return dataUri;

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/cms/ecc/MQVuserKeyingMaterial.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.asn1.DERTaggedObject;
import com.fr.third.org.bouncycastle.asn1.cms.OriginatorPublicKey; import com.fr.third.org.bouncycastle.asn1.cms.OriginatorPublicKey;
/** /**
* <a href="http://tools.ietf.org/html/rfc5753">RFC 5753/3278</a>: MQVuserKeyingMaterial object. * <a href="https://tools.ietf.org/html/rfc5753">RFC 5753/3278</a>: MQVuserKeyingMaterial object.
* <pre> * <pre>
* MQVuserKeyingMaterial ::= SEQUENCE { * MQVuserKeyingMaterial ::= SEQUENCE {
* ephemeralPublicKey OriginatorPublicKey, * ephemeralPublicKey OriginatorPublicKey,

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/dvcs/DVCSObjectIdentifiers.java

@ -3,7 +3,7 @@ package com.fr.third.org.bouncycastle.asn1.dvcs;
import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier; import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier;
/** /**
* OIDs for <a href="http://tools.ietf.org/html/rfc3029">RFC 3029</a> * OIDs for <a href="https://tools.ietf.org/html/rfc3029">RFC 3029</a>
* Data Validation and Certification Server Protocols * Data Validation and Certification Server Protocols
*/ */
public interface DVCSObjectIdentifiers public interface DVCSObjectIdentifiers

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/eac/EACObjectIdentifiers.java

@ -5,7 +5,7 @@ import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier;
/** /**
* German Federal Office for Information Security * German Federal Office for Information Security
* (Bundesamt f&uuml;r Sicherheit in der Informationstechnik) * (Bundesamt f&uuml;r Sicherheit in der Informationstechnik)
* <a href="http://www.bsi.bund.de/">http://www.bsi.bund.de/</a> * <a href="https://www.bsi.bund.de/">https://www.bsi.bund.de/</a>
* <p> * <p>
* <a href="https://www.bsi.bund.de/EN/Publications/TechnicalGuidelines/TR03110/BSITR03110.html">BSI TR-03110</a> * <a href="https://www.bsi.bund.de/EN/Publications/TechnicalGuidelines/TR03110/BSITR03110.html">BSI TR-03110</a>
* Technical Guideline Advanced Security Mechanisms for Machine Readable Travel Documents * Technical Guideline Advanced Security Mechanisms for Machine Readable Travel Documents

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/isismtt/x509/AdmissionSyntax.java

@ -67,8 +67,8 @@ import com.fr.third.org.bouncycastle.asn1.x509.GeneralName;
* component namingAuthorityId are grouped under the OID-branch * component namingAuthorityId are grouped under the OID-branch
* id-isis-at-namingAuthorities and must be applied for. * id-isis-at-namingAuthorities and must be applied for.
* <li>See * <li>See
* http://www.teletrust.de/anwend.asp?Id=30200&amp;Sprache=E_&amp;HomePG=0 for * https://www.teletrust.de/anwend.asp?Id=30200&amp;Sprache=E_&amp;HomePG=0 for
* an application form and http://www.teletrust.de/links.asp?id=30220,11 * an application form and https://www.teletrust.de/links.asp?id=30220,11
* for an overview of registered naming authorities. * for an overview of registered naming authorities.
* <li> By means of the data type ProfessionInfo certain professions, * <li> By means of the data type ProfessionInfo certain professions,
* specializations, disciplines, fields of activity, etc. are identified. A * specializations, disciplines, fields of activity, etc. are identified. A

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/kisa/KISAObjectIdentifiers.java

@ -6,10 +6,10 @@ import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier;
* Korea Information Security Agency (KISA) * Korea Information Security Agency (KISA)
* ({iso(1) member-body(2) kr(410) kisa(200004)}) * ({iso(1) member-body(2) kr(410) kisa(200004)})
* <p> * <p>
* See <a href="http://tools.ietf.org/html/rfc4010">RFC 4010</a> * See <a href="https://tools.ietf.org/html/rfc4010">RFC 4010</a>
* Use of the SEED Encryption Algorithm * Use of the SEED Encryption Algorithm
* in Cryptographic Message Syntax (CMS), * in Cryptographic Message Syntax (CMS),
* and <a href="http://tools.ietf.org/html/rfc4269">RFC 4269</a> * and <a href="https://tools.ietf.org/html/rfc4269">RFC 4269</a>
* The SEED Encryption Algorithm * The SEED Encryption Algorithm
*/ */
public interface KISAObjectIdentifiers public interface KISAObjectIdentifiers

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/ntt/NTTObjectIdentifiers.java

@ -3,7 +3,7 @@ package com.fr.third.org.bouncycastle.asn1.ntt;
import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier; import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier;
/** /**
* From <a href="http://tools.ietf.org/html/rfc3657">RFC 3657</a> * From <a href="https://tools.ietf.org/html/rfc3657">RFC 3657</a>
* Use of the Camellia Encryption Algorithm * Use of the Camellia Encryption Algorithm
* in Cryptographic Message Syntax (CMS) * in Cryptographic Message Syntax (CMS)
*/ */

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/ocsp/OCSPObjectIdentifiers.java

@ -3,7 +3,7 @@ package com.fr.third.org.bouncycastle.asn1.ocsp;
import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier; import com.fr.third.org.bouncycastle.asn1.ASN1ObjectIdentifier;
/** /**
* OIDs for <a href="http://tools.ietf.org/html/rfc2560">RFC 2560</a> and <a href="http://tools.ietf.org/html/rfc6960">RFC 6960</a> * OIDs for <a href="https://tools.ietf.org/html/rfc2560">RFC 2560</a> and <a href="https://tools.ietf.org/html/rfc6960">RFC 6960</a>
* Online Certificate Status Protocol - OCSP. * Online Certificate Status Protocol - OCSP.
*/ */
public interface OCSPObjectIdentifiers public interface OCSPObjectIdentifiers

32
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/pkcs/PKCSObjectIdentifiers.java

@ -327,7 +327,7 @@ public interface PKCSObjectIdentifiers
/** PKCS#9: 1.2.840.113549.1.9.16.2.1 -- smime attribute receiptRequest */ /** PKCS#9: 1.2.840.113549.1.9.16.2.1 -- smime attribute receiptRequest */
ASN1ObjectIdentifier id_aa_receiptRequest = id_aa.branch("1"); ASN1ObjectIdentifier id_aa_receiptRequest = id_aa.branch("1");
/** PKCS#9: 1.2.840.113549.1.9.16.2.4 - See <a href="http://tools.ietf.org/html/rfc2634">RFC 2634</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.4 - See <a href="https://tools.ietf.org/html/rfc2634">RFC 2634</a> */
ASN1ObjectIdentifier id_aa_contentHint = id_aa.branch("4"); // See RFC 2634 ASN1ObjectIdentifier id_aa_contentHint = id_aa.branch("4"); // See RFC 2634
/** PKCS#9: 1.2.840.113549.1.9.16.2.5 */ /** PKCS#9: 1.2.840.113549.1.9.16.2.5 */
ASN1ObjectIdentifier id_aa_msgSigDigest = id_aa.branch("5"); ASN1ObjectIdentifier id_aa_msgSigDigest = id_aa.branch("5");
@ -344,40 +344,40 @@ public interface PKCSObjectIdentifiers
/** PKCS#9: 1.2.840.113549.1.9.16.2.47 */ /** PKCS#9: 1.2.840.113549.1.9.16.2.47 */
ASN1ObjectIdentifier id_aa_signingCertificateV2 = id_aa.branch("47"); ASN1ObjectIdentifier id_aa_signingCertificateV2 = id_aa.branch("47");
/** PKCS#9: 1.2.840.113549.1.9.16.2.7 - See <a href="http://tools.ietf.org/html/rfc2634">RFC 2634</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.7 - See <a href="https://tools.ietf.org/html/rfc2634">RFC 2634</a> */
ASN1ObjectIdentifier id_aa_contentIdentifier = id_aa.branch("7"); // See RFC 2634 ASN1ObjectIdentifier id_aa_contentIdentifier = id_aa.branch("7"); // See RFC 2634
/* /*
* RFC 3126 * RFC 3126
*/ */
/** PKCS#9: 1.2.840.113549.1.9.16.2.14 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.14 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_signatureTimeStampToken = id_aa.branch("14"); ASN1ObjectIdentifier id_aa_signatureTimeStampToken = id_aa.branch("14");
/** PKCS#9: 1.2.840.113549.1.9.16.2.15 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.15 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_sigPolicyId = id_aa.branch("15"); ASN1ObjectIdentifier id_aa_ets_sigPolicyId = id_aa.branch("15");
/** PKCS#9: 1.2.840.113549.1.9.16.2.16 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.16 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_commitmentType = id_aa.branch("16"); ASN1ObjectIdentifier id_aa_ets_commitmentType = id_aa.branch("16");
/** PKCS#9: 1.2.840.113549.1.9.16.2.17 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.17 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_signerLocation = id_aa.branch("17"); ASN1ObjectIdentifier id_aa_ets_signerLocation = id_aa.branch("17");
/** PKCS#9: 1.2.840.113549.1.9.16.2.18 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.18 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_signerAttr = id_aa.branch("18"); ASN1ObjectIdentifier id_aa_ets_signerAttr = id_aa.branch("18");
/** PKCS#9: 1.2.840.113549.1.9.16.6.2.19 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.6.2.19 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_otherSigCert = id_aa.branch("19"); ASN1ObjectIdentifier id_aa_ets_otherSigCert = id_aa.branch("19");
/** PKCS#9: 1.2.840.113549.1.9.16.2.20 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.20 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_contentTimestamp = id_aa.branch("20"); ASN1ObjectIdentifier id_aa_ets_contentTimestamp = id_aa.branch("20");
/** PKCS#9: 1.2.840.113549.1.9.16.2.21 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.21 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_certificateRefs = id_aa.branch("21"); ASN1ObjectIdentifier id_aa_ets_certificateRefs = id_aa.branch("21");
/** PKCS#9: 1.2.840.113549.1.9.16.2.22 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.22 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_revocationRefs = id_aa.branch("22"); ASN1ObjectIdentifier id_aa_ets_revocationRefs = id_aa.branch("22");
/** PKCS#9: 1.2.840.113549.1.9.16.2.23 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.23 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_certValues = id_aa.branch("23"); ASN1ObjectIdentifier id_aa_ets_certValues = id_aa.branch("23");
/** PKCS#9: 1.2.840.113549.1.9.16.2.24 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.24 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_revocationValues = id_aa.branch("24"); ASN1ObjectIdentifier id_aa_ets_revocationValues = id_aa.branch("24");
/** PKCS#9: 1.2.840.113549.1.9.16.2.25 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.25 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_escTimeStamp = id_aa.branch("25"); ASN1ObjectIdentifier id_aa_ets_escTimeStamp = id_aa.branch("25");
/** PKCS#9: 1.2.840.113549.1.9.16.2.26 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.26 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_certCRLTimestamp = id_aa.branch("26"); ASN1ObjectIdentifier id_aa_ets_certCRLTimestamp = id_aa.branch("26");
/** PKCS#9: 1.2.840.113549.1.9.16.2.27 - <a href="http://tools.ietf.org/html/rfc3126">RFC 3126</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.27 - <a href="https://tools.ietf.org/html/rfc3126">RFC 3126</a> */
ASN1ObjectIdentifier id_aa_ets_archiveTimestamp = id_aa.branch("27"); ASN1ObjectIdentifier id_aa_ets_archiveTimestamp = id_aa.branch("27");
/** PKCS#9: 1.2.840.113549.1.9.16.2.37 - <a href="https://tools.ietf.org/html/rfc4108#section-2.2.5">RFC 4108</a> */ /** PKCS#9: 1.2.840.113549.1.9.16.2.37 - <a href="https://tools.ietf.org/html/rfc4108#section-2.2.5">RFC 4108</a> */

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/teletrust/TeleTrusTNamedCurves.java

@ -15,7 +15,7 @@ import com.fr.third.org.bouncycastle.util.encoders.Hex;
/** /**
* Elliptic curves defined in "ECC Brainpool Standard Curves and Curve Generation" * Elliptic curves defined in "ECC Brainpool Standard Curves and Curve Generation"
* http://www.ecc-brainpool.org/download/draft_pkix_additional_ecc_dp.txt * https://www.ecc-brainpool.org/download/draft_pkix_additional_ecc_dp.txt
*/ */
public class TeleTrusTNamedCurves public class TeleTrusTNamedCurves
{ {

45
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/tsp/ArchiveTimeStamp.java

@ -33,10 +33,10 @@ import com.fr.third.org.bouncycastle.asn1.x509.AlgorithmIdentifier;
public class ArchiveTimeStamp public class ArchiveTimeStamp
extends ASN1Object extends ASN1Object
{ {
private AlgorithmIdentifier digestAlgorithm; private final AlgorithmIdentifier digestAlgorithm;
private Attributes attributes; private final Attributes attributes;
private ASN1Sequence reducedHashTree; private final ASN1Sequence reducedHashTree;
private ContentInfo timeStamp; private final ContentInfo timeStamp;
/** /**
* Return an ArchiveTimestamp from the given object. * Return an ArchiveTimestamp from the given object.
@ -64,26 +64,31 @@ public class ArchiveTimeStamp
PartialHashtree[] reducedHashTree, PartialHashtree[] reducedHashTree,
ContentInfo timeStamp) ContentInfo timeStamp)
{ {
this.digestAlgorithm = digestAlgorithm; this(digestAlgorithm, null, reducedHashTree, timeStamp);
this.reducedHashTree = new DERSequence(reducedHashTree);
this.timeStamp = timeStamp;
} }
public ArchiveTimeStamp( public ArchiveTimeStamp(
AlgorithmIdentifier digestAlgorithm,
Attributes attributes,
PartialHashtree[] reducedHashTree,
ContentInfo timeStamp) ContentInfo timeStamp)
{ {
this.digestAlgorithm = digestAlgorithm; this(null, null, null, timeStamp);
this.attributes = attributes;
this.reducedHashTree = new DERSequence(reducedHashTree);
this.timeStamp = timeStamp;
} }
public ArchiveTimeStamp( public ArchiveTimeStamp(
AlgorithmIdentifier digestAlgorithm,
Attributes attributes,
PartialHashtree[] reducedHashTree,
ContentInfo timeStamp) ContentInfo timeStamp)
{ {
this.digestAlgorithm = digestAlgorithm;
this.attributes = attributes;
if (reducedHashTree != null)
{
this.reducedHashTree = new DERSequence(reducedHashTree);
}
else
{
this.reducedHashTree = null;
}
this.timeStamp = timeStamp; this.timeStamp = timeStamp;
} }
@ -94,6 +99,9 @@ public class ArchiveTimeStamp
throw new IllegalArgumentException("wrong sequence size in constructor: " + sequence.size()); throw new IllegalArgumentException("wrong sequence size in constructor: " + sequence.size());
} }
AlgorithmIdentifier digAlg = null;
Attributes attrs = null;
ASN1Sequence rHashTree = null;
for (int i = 0; i < sequence.size() - 1; i++) for (int i = 0; i < sequence.size() - 1; i++)
{ {
Object obj = sequence.getObjectAt(i); Object obj = sequence.getObjectAt(i);
@ -105,13 +113,13 @@ public class ArchiveTimeStamp
switch (taggedObject.getTagNo()) switch (taggedObject.getTagNo())
{ {
case 0: case 0:
digestAlgorithm = AlgorithmIdentifier.getInstance(taggedObject, false); digAlg = AlgorithmIdentifier.getInstance(taggedObject, false);
break; break;
case 1: case 1:
attributes = Attributes.getInstance(taggedObject, false); attrs = Attributes.getInstance(taggedObject, false);
break; break;
case 2: case 2:
reducedHashTree = ASN1Sequence.getInstance(taggedObject, false); rHashTree = ASN1Sequence.getInstance(taggedObject, false);
break; break;
default: default:
throw new IllegalArgumentException("invalid tag no in constructor: " throw new IllegalArgumentException("invalid tag no in constructor: "
@ -120,6 +128,9 @@ public class ArchiveTimeStamp
} }
} }
digestAlgorithm = digAlg;
attributes = attrs;
reducedHashTree = rHashTree;
timeStamp = ContentInfo.getInstance(sequence.getObjectAt(sequence.size() - 1)); timeStamp = ContentInfo.getInstance(sequence.getObjectAt(sequence.size() - 1));
} }

7
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/x500/style/BCStyle.java

@ -76,6 +76,8 @@ public class BCStyle
public static final ASN1ObjectIdentifier GENERATION = new ASN1ObjectIdentifier("2.5.4.44").intern(); public static final ASN1ObjectIdentifier GENERATION = new ASN1ObjectIdentifier("2.5.4.44").intern();
public static final ASN1ObjectIdentifier UNIQUE_IDENTIFIER = new ASN1ObjectIdentifier("2.5.4.45").intern(); public static final ASN1ObjectIdentifier UNIQUE_IDENTIFIER = new ASN1ObjectIdentifier("2.5.4.45").intern();
public static final ASN1ObjectIdentifier DESCRIPTION = new ASN1ObjectIdentifier("2.5.4.13").intern();
/** /**
* businessCategory - DirectoryString(SIZE(1..128) * businessCategory - DirectoryString(SIZE(1..128)
*/ */
@ -96,6 +98,7 @@ public class BCStyle
*/ */
public static final ASN1ObjectIdentifier PSEUDONYM = new ASN1ObjectIdentifier("2.5.4.65").intern(); public static final ASN1ObjectIdentifier PSEUDONYM = new ASN1ObjectIdentifier("2.5.4.65").intern();
public static final ASN1ObjectIdentifier ROLE = new ASN1ObjectIdentifier("2.5.4.72").intern();
/** /**
* RFC 3039 DateOfBirth - GeneralizedTime - YYYYMMDD000000Z * RFC 3039 DateOfBirth - GeneralizedTime - YYYYMMDD000000Z
@ -213,6 +216,8 @@ public class BCStyle
DefaultSymbols.put(GIVENNAME, "GIVENNAME"); DefaultSymbols.put(GIVENNAME, "GIVENNAME");
DefaultSymbols.put(INITIALS, "INITIALS"); DefaultSymbols.put(INITIALS, "INITIALS");
DefaultSymbols.put(GENERATION, "GENERATION"); DefaultSymbols.put(GENERATION, "GENERATION");
DefaultSymbols.put(DESCRIPTION, "DESCRIPTION");
DefaultSymbols.put(ROLE, "ROLE");
DefaultSymbols.put(UnstructuredAddress, "unstructuredAddress"); DefaultSymbols.put(UnstructuredAddress, "unstructuredAddress");
DefaultSymbols.put(UnstructuredName, "unstructuredName"); DefaultSymbols.put(UnstructuredName, "unstructuredName");
DefaultSymbols.put(UNIQUE_IDENTIFIER, "UniqueIdentifier"); DefaultSymbols.put(UNIQUE_IDENTIFIER, "UniqueIdentifier");
@ -249,6 +254,8 @@ public class BCStyle
DefaultLookUp.put("givenname", GIVENNAME); DefaultLookUp.put("givenname", GIVENNAME);
DefaultLookUp.put("initials", INITIALS); DefaultLookUp.put("initials", INITIALS);
DefaultLookUp.put("generation", GENERATION); DefaultLookUp.put("generation", GENERATION);
DefaultLookUp.put("description", DESCRIPTION);
DefaultLookUp.put("role", ROLE);
DefaultLookUp.put("unstructuredaddress", UnstructuredAddress); DefaultLookUp.put("unstructuredaddress", UnstructuredAddress);
DefaultLookUp.put("unstructuredname", UnstructuredName); DefaultLookUp.put("unstructuredname", UnstructuredName);
DefaultLookUp.put("uniqueidentifier", UNIQUE_IDENTIFIER); DefaultLookUp.put("uniqueidentifier", UNIQUE_IDENTIFIER);

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/x509/KeyPurposeId.java

@ -123,12 +123,12 @@ public class KeyPurposeId
/** /**
* Microsoft Server Gated Crypto (msSGC) see http://www.alvestrand.no/objectid/1.3.6.1.4.1.311.10.3.3.html * Microsoft Server Gated Crypto (msSGC) see https://www.alvestrand.no/objectid/1.3.6.1.4.1.311.10.3.3.html
*/ */
public static final KeyPurposeId id_kp_msSGC = new KeyPurposeId(new ASN1ObjectIdentifier("1.3.6.1.4.1.311.10.3.3")); public static final KeyPurposeId id_kp_msSGC = new KeyPurposeId(new ASN1ObjectIdentifier("1.3.6.1.4.1.311.10.3.3"));
/** /**
* Netscape Server Gated Crypto (nsSGC) see http://www.alvestrand.no/objectid/2.16.840.1.113730.4.1.html * Netscape Server Gated Crypto (nsSGC) see https://www.alvestrand.no/objectid/2.16.840.1.113730.4.1.html
*/ */
public static final KeyPurposeId id_kp_nsSGC = new KeyPurposeId(new ASN1ObjectIdentifier("2.16.840.1.113730.4.1")); public static final KeyPurposeId id_kp_nsSGC = new KeyPurposeId(new ASN1ObjectIdentifier("2.16.840.1.113730.4.1"));

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/asn1/x509/PolicyMappings.java

@ -18,7 +18,7 @@ import com.fr.third.org.bouncycastle.asn1.DERSequence;
* subjectDomainPolicy CertPolicyId } * subjectDomainPolicy CertPolicyId }
* </pre> * </pre>
* *
* @see <a href="http://www.faqs.org/rfc/rfc3280.txt">RFC 3280, section 4.2.1.6</a> * @see <a href="https://www.faqs.org/rfc/rfc3280.txt">RFC 3280, section 4.2.1.6</a>
*/ */
public class PolicyMappings public class PolicyMappings
extends ASN1Object extends ASN1Object

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEParticipant.java

@ -49,7 +49,7 @@ import com.fr.third.org.bouncycastle.util.Arrays;
* These are the trivial techniques to optimize the communication. * These are the trivial techniques to optimize the communication.
* <p> * <p>
* The key confirmation process is implemented as specified in * The key confirmation process is implemented as specified in
* <a href="http://csrc.nist.gov/publications/nistpubs/800-56A/SP800-56A_Revision1_Mar08-2007.pdf">NIST SP 800-56A Revision 1</a>, * <a href="https://csrc.nist.gov/publications/nistpubs/800-56A/SP800-56A_Revision1_Mar08-2007.pdf">NIST SP 800-56A Revision 1</a>,
* Section 8.2 Unilateral Key Confirmation for Key Agreement Schemes. * Section 8.2 Unilateral Key Confirmation for Key Agreement Schemes.
* <p> * <p>
* This class is stateful and NOT threadsafe. * This class is stateful and NOT threadsafe.

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroup.java

@ -10,7 +10,7 @@ import java.math.BigInteger;
* <p> * <p>
* See {@link JPAKEPrimeOrderGroups} for convenient standard groups. * See {@link JPAKEPrimeOrderGroups} for convenient standard groups.
* <p> * <p>
* NIST <a href="http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf">publishes</a> * NIST <a href="https://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf">publishes</a>
* many groups that can be used for the desired level of security. * many groups that can be used for the desired level of security.
*/ */
public class JPAKEPrimeOrderGroup public class JPAKEPrimeOrderGroup

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEPrimeOrderGroups.java

@ -11,7 +11,7 @@ import java.math.BigInteger;
* <p> * <p>
* The prime order groups below are taken from Sun's JDK JavaDoc (docs/guide/security/CryptoSpec.html#AppB), * The prime order groups below are taken from Sun's JDK JavaDoc (docs/guide/security/CryptoSpec.html#AppB),
* and from the prime order groups * and from the prime order groups
* <a href="http://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf">published by NIST</a>. * <a href="https://csrc.nist.gov/groups/ST/toolkit/documents/Examples/DSA2_All.pdf">published by NIST</a>.
*/ */
public class JPAKEPrimeOrderGroups public class JPAKEPrimeOrderGroups
{ {

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/agreement/jpake/JPAKEUtil.java

@ -317,7 +317,7 @@ public class JPAKEUtil
/** /**
* Calculates the MacTag (to be used for key confirmation), as defined by * Calculates the MacTag (to be used for key confirmation), as defined by
* <a href="http://csrc.nist.gov/publications/nistpubs/800-56A/SP800-56A_Revision1_Mar08-2007.pdf">NIST SP 800-56A Revision 1</a>, * <a href="https://csrc.nist.gov/publications/nistpubs/800-56A/SP800-56A_Revision1_Mar08-2007.pdf">NIST SP 800-56A Revision 1</a>,
* Section 8.2 Unilateral Key Confirmation for Key Agreement Schemes. * Section 8.2 Unilateral Key Confirmation for Key Agreement Schemes.
* <pre> * <pre>
* MacTag = HMAC(MacKey, MacLen, MacData) * MacTag = HMAC(MacKey, MacLen, MacData)

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/digests/RIPEMD160Digest.java

@ -5,7 +5,7 @@ import com.fr.third.org.bouncycastle.util.Memoable;
/** /**
* implementation of RIPEMD see, * implementation of RIPEMD see,
* http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html * https://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
*/ */
public class RIPEMD160Digest public class RIPEMD160Digest
extends GeneralDigest extends GeneralDigest

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/digests/SM3Digest.java

@ -5,7 +5,7 @@ import com.fr.third.org.bouncycastle.util.Pack;
/** /**
* Implementation of Chinese SM3 digest as described at * Implementation of Chinese SM3 digest as described at
* http://tools.ietf.org/html/draft-shen-sm3-hash-01 * https://tools.ietf.org/html/draft-shen-sm3-hash-01
* and at .... ( Chinese PDF ) * and at .... ( Chinese PDF )
* <p> * <p>
* The specification says "process a bit stream", * The specification says "process a bit stream",

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/digests/TigerDigest.java

@ -5,8 +5,8 @@ import com.fr.third.org.bouncycastle.util.Memoable;
/** /**
* implementation of Tiger based on: * implementation of Tiger based on:
* <a href="http://www.cs.technion.ac.il/~biham/Reports/Tiger"> * <a href="https://www.cs.technion.ac.il/~biham/Reports/Tiger">
* http://www.cs.technion.ac.il/~biham/Reports/Tiger</a> * https://www.cs.technion.ac.il/~biham/Reports/Tiger</a>
*/ */
public class TigerDigest public class TigerDigest
implements ExtendedDigest, Memoable implements ExtendedDigest, Memoable

1
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/encodings/OAEPEncoding.java

@ -297,6 +297,7 @@ public class OAEPEncoding
byte[] output = new byte[block.length - start]; byte[] output = new byte[block.length - start];
System.arraycopy(block, start, output, 0, output.length); System.arraycopy(block, start, output, 0, output.length);
Arrays.fill(block, (byte)0);
return output; return output;
} }

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESEngine.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.util.Pack;
/** /**
* an implementation of the AES (Rijndael), from FIPS-197. * an implementation of the AES (Rijndael), from FIPS-197.
* <p> * <p>
* For further details see: <a href="http://csrc.nist.gov/encryption/aes/">http://csrc.nist.gov/encryption/aes/</a>. * For further details see: <a href="https://csrc.nist.gov/encryption/aes/">https://csrc.nist.gov/encryption/aes/</a>.
* *
* This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at * This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at
* <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a> * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESFastEngine.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.util.Pack;
/** /**
* an implementation of the AES (Rijndael), from FIPS-197. * an implementation of the AES (Rijndael), from FIPS-197.
* <p> * <p>
* For further details see: <a href="http://csrc.nist.gov/encryption/aes/">http://csrc.nist.gov/encryption/aes/</a>. * For further details see: <a href="https://csrc.nist.gov/encryption/aes/">https://csrc.nist.gov/encryption/aes/</a>.
* *
* This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at * This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at
* <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a> * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESLightEngine.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.util.Pack;
/** /**
* an implementation of the AES (Rijndael), from FIPS-197. * an implementation of the AES (Rijndael), from FIPS-197.
* <p> * <p>
* For further details see: <a href="http://csrc.nist.gov/encryption/aes/">http://csrc.nist.gov/encryption/aes/</a>. * For further details see: <a href="https://csrc.nist.gov/encryption/aes/">https://csrc.nist.gov/encryption/aes/</a>.
* *
* This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at * This implementation is based on optimizations from Dr. Brian Gladman's paper and C code at
* <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a> * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/AESWrapEngine.java

@ -4,7 +4,7 @@ package com.fr.third.org.bouncycastle.crypto.engines;
* an implementation of the AES Key Wrapper from the NIST Key Wrap * an implementation of the AES Key Wrapper from the NIST Key Wrap
* Specification. * Specification.
* <p> * <p>
* For further details see: <a href="http://csrc.nist.gov/encryption/kms/key-wrap.pdf">http://csrc.nist.gov/encryption/kms/key-wrap.pdf</a>. * For further details see: <a href="https://csrc.nist.gov/encryption/kms/key-wrap.pdf">https://csrc.nist.gov/encryption/kms/key-wrap.pdf</a>.
*/ */
public class AESWrapEngine public class AESWrapEngine
extends RFC3394WrapEngine extends RFC3394WrapEngine

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/ARIAWrapEngine.java

@ -4,7 +4,7 @@ package com.fr.third.org.bouncycastle.crypto.engines;
* an implementation of the ARIA Key Wrapper from the NIST Key Wrap * an implementation of the ARIA Key Wrapper from the NIST Key Wrap
* Specification. * Specification.
* <p> * <p>
* For further details see: <a href="http://csrc.nist.gov/encryption/kms/key-wrap.pdf">http://csrc.nist.gov/encryption/kms/key-wrap.pdf</a>. * For further details see: <a href="https://csrc.nist.gov/encryption/kms/key-wrap.pdf">https://csrc.nist.gov/encryption/kms/key-wrap.pdf</a>.
*/ */
public class ARIAWrapEngine public class ARIAWrapEngine
extends RFC3394WrapEngine extends RFC3394WrapEngine

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/CamelliaWrapEngine.java

@ -3,7 +3,7 @@ package com.fr.third.org.bouncycastle.crypto.engines;
/** /**
* An implementation of the Camellia key wrapper based on RFC 3657/RFC 3394. * An implementation of the Camellia key wrapper based on RFC 3657/RFC 3394.
* <p> * <p>
* For further details see: <a href="http://www.ietf.org/rfc/rfc3657.txt">http://www.ietf.org/rfc/rfc3657.txt</a>. * For further details see: <a href="https://www.ietf.org/rfc/rfc3657.txt">https://www.ietf.org/rfc/rfc3657.txt</a>.
*/ */
public class CamelliaWrapEngine public class CamelliaWrapEngine
extends RFC3394WrapEngine extends RFC3394WrapEngine

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/DESedeWrapEngine.java

@ -305,7 +305,7 @@ public class DESedeWrapEngine
* - Compute the 20 octet SHA-1 hash on the key being wrapped. * - Compute the 20 octet SHA-1 hash on the key being wrapped.
* - Use the first 8 octets of this hash as the checksum value. * - Use the first 8 octets of this hash as the checksum value.
* *
* For details see http://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum. * For details see https://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum.
* *
* @param key the key to check, * @param key the key to check,
* @return the CMS checksum. * @return the CMS checksum.
@ -325,7 +325,7 @@ public class DESedeWrapEngine
} }
/** /**
* For details see http://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum * For details see https://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum
* *
* @param key key to be validated. * @param key key to be validated.
* @param checksum the checksum. * @param checksum the checksum.

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/HC128Engine.java

@ -12,12 +12,12 @@ import com.fr.third.org.bouncycastle.crypto.params.ParametersWithIV;
* generates keystream from a 128-bit secret key and a 128-bit initialization * generates keystream from a 128-bit secret key and a 128-bit initialization
* vector. * vector.
* <p> * <p>
* http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc128_p3.pdf * https://www.ecrypt.eu.org/stream/p3ciphers/hc/hc128_p3.pdf
* </p><p> * </p><p>
* It is a third phase candidate in the eStream contest, and is patent-free. * It is a third phase candidate in the eStream contest, and is patent-free.
* No attacks are known as of today (April 2007). See * No attacks are known as of today (April 2007). See
* *
* http://www.ecrypt.eu.org/stream/hcp3.html * https://www.ecrypt.eu.org/stream/hcp3.html
* </p> * </p>
*/ */
public class HC128Engine public class HC128Engine

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/HC256Engine.java

@ -12,13 +12,13 @@ import com.fr.third.org.bouncycastle.crypto.params.ParametersWithIV;
* generates keystream from a 256-bit secret key and a 256-bit initialization * generates keystream from a 256-bit secret key and a 256-bit initialization
* vector. * vector.
* <p> * <p>
* http://www.ecrypt.eu.org/stream/p3ciphers/hc/hc256_p3.pdf * https://www.ecrypt.eu.org/stream/p3ciphers/hc/hc256_p3.pdf
* </p><p> * </p><p>
* Its brother, HC-128, is a third phase candidate in the eStream contest. * Its brother, HC-128, is a third phase candidate in the eStream contest.
* The algorithm is patent-free. No attacks are known as of today (April 2007). * The algorithm is patent-free. No attacks are known as of today (April 2007).
* See * See
* *
* http://www.ecrypt.eu.org/stream/hcp3.html * https://www.ecrypt.eu.org/stream/hcp3.html
* </p> * </p>
*/ */
public class HC256Engine public class HC256Engine

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/ISAACEngine.java

@ -9,7 +9,7 @@ import com.fr.third.org.bouncycastle.util.Pack;
/** /**
* Implementation of Bob Jenkin's ISAAC (Indirection Shift Accumulate Add and Count). * Implementation of Bob Jenkin's ISAAC (Indirection Shift Accumulate Add and Count).
* see: http://www.burtleburtle.net/bob/rand/isaacafa.html * see: https://www.burtleburtle.net/bob/rand/isaacafa.html
*/ */
public class ISAACEngine public class ISAACEngine
implements StreamCipher implements StreamCipher

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/NaccacheSternEngine.java

@ -2,7 +2,6 @@ package com.fr.third.org.bouncycastle.crypto.engines;
import java.math.BigInteger; import java.math.BigInteger;
import java.util.Vector; import java.util.Vector;
import com.fr.third.org.bouncycastle.util.Arrays;
import com.fr.third.org.bouncycastle.crypto.AsymmetricBlockCipher; import com.fr.third.org.bouncycastle.crypto.AsymmetricBlockCipher;
import com.fr.third.org.bouncycastle.crypto.CipherParameters; import com.fr.third.org.bouncycastle.crypto.CipherParameters;
@ -11,10 +10,11 @@ import com.fr.third.org.bouncycastle.crypto.InvalidCipherTextException;
import com.fr.third.org.bouncycastle.crypto.params.NaccacheSternKeyParameters; import com.fr.third.org.bouncycastle.crypto.params.NaccacheSternKeyParameters;
import com.fr.third.org.bouncycastle.crypto.params.NaccacheSternPrivateKeyParameters; import com.fr.third.org.bouncycastle.crypto.params.NaccacheSternPrivateKeyParameters;
import com.fr.third.org.bouncycastle.crypto.params.ParametersWithRandom; import com.fr.third.org.bouncycastle.crypto.params.ParametersWithRandom;
import com.fr.third.org.bouncycastle.util.Arrays;
/** /**
* NaccacheStern Engine. For details on this cipher, please see * NaccacheStern Engine. For details on this cipher, please see
* http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf * https://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
*/ */
public class NaccacheSternEngine public class NaccacheSternEngine
implements AsymmetricBlockCipher implements AsymmetricBlockCipher

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RC2WrapEngine.java

@ -351,7 +351,7 @@ public class RC2WrapEngine
* - Compute the 20 octet SHA-1 hash on the key being wrapped. * - Compute the 20 octet SHA-1 hash on the key being wrapped.
* - Use the first 8 octets of this hash as the checksum value. * - Use the first 8 octets of this hash as the checksum value.
* *
* For details see http://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum * For details see https://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum
*/ */
private byte[] calculateCMSKeyChecksum( private byte[] calculateCMSKeyChecksum(
byte[] key) byte[] key)
@ -367,7 +367,7 @@ public class RC2WrapEngine
} }
/* /*
* For details see http://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum * For details see https://www.w3.org/TR/xmlenc-core/#sec-CMSKeyChecksum
*/ */
private boolean checkCMSKeyChecksum( private boolean checkCMSKeyChecksum(
byte[] key, byte[] key,

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RC532Engine.java

@ -8,7 +8,7 @@ import com.fr.third.org.bouncycastle.crypto.params.RC5Parameters;
/** /**
* The specification for RC5 came from the <code>RC5 Encryption Algorithm</code> * The specification for RC5 came from the <code>RC5 Encryption Algorithm</code>
* publication in RSA CryptoBytes, Spring of 1995. * publication in RSA CryptoBytes, Spring of 1995.
* <em>http://www.rsasecurity.com/rsalabs/cryptobytes</em>. * <em>https://www.rsasecurity.com/rsalabs/cryptobytes</em>.
* <p> * <p>
* This implementation has a word size of 32 bits. * This implementation has a word size of 32 bits.
* <p> * <p>

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RC564Engine.java

@ -7,7 +7,7 @@ import com.fr.third.org.bouncycastle.crypto.params.RC5Parameters;
/** /**
* The specification for RC5 came from the <code>RC5 Encryption Algorithm</code> * The specification for RC5 came from the <code>RC5 Encryption Algorithm</code>
* publication in RSA CryptoBytes, Spring of 1995. * publication in RSA CryptoBytes, Spring of 1995.
* <em>http://www.rsasecurity.com/rsalabs/cryptobytes</em>. * <em>https://www.rsasecurity.com/rsalabs/cryptobytes</em>.
* <p> * <p>
* This implementation is set to work with a 64 bit word size. * This implementation is set to work with a 64 bit word size.
* <p> * <p>

4
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/RFC3394WrapEngine.java

@ -14,8 +14,8 @@ import com.fr.third.org.bouncycastle.util.Arrays;
* an implementation of the AES Key Wrapper from the NIST Key Wrap * an implementation of the AES Key Wrapper from the NIST Key Wrap
* Specification as described in RFC 3394. * Specification as described in RFC 3394.
* <p> * <p>
* For further details see: <a href="http://www.ietf.org/rfc/rfc3394.txt">http://www.ietf.org/rfc/rfc3394.txt</a> * For further details see: <a href="https://www.ietf.org/rfc/rfc3394.txt">https://www.ietf.org/rfc/rfc3394.txt</a>
* and <a href="http://csrc.nist.gov/encryption/kms/key-wrap.pdf">http://csrc.nist.gov/encryption/kms/key-wrap.pdf</a>. * and <a href="https://csrc.nist.gov/encryption/kms/key-wrap.pdf">https://csrc.nist.gov/encryption/kms/key-wrap.pdf</a>.
*/ */
public class RFC3394WrapEngine public class RFC3394WrapEngine
implements Wrapper implements Wrapper

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/SEEDWrapEngine.java

@ -3,7 +3,7 @@ package com.fr.third.org.bouncycastle.crypto.engines;
/** /**
* An implementation of the SEED key wrapper based on RFC 4010/RFC 3394. * An implementation of the SEED key wrapper based on RFC 4010/RFC 3394.
* <p> * <p>
* For further details see: <a href="http://www.ietf.org/rfc/rfc4010.txt">http://www.ietf.org/rfc/rfc4010.txt</a>. * For further details see: <a href="https://www.ietf.org/rfc/rfc4010.txt">https://www.ietf.org/rfc/rfc4010.txt</a>.
*/ */
public class SEEDWrapEngine public class SEEDWrapEngine
extends RFC3394WrapEngine extends RFC3394WrapEngine

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/SerpentEngine.java

@ -10,7 +10,7 @@ import com.fr.third.org.bouncycastle.util.Pack;
* Serpent was designed by Ross Anderson, Eli Biham and Lars Knudsen as a * Serpent was designed by Ross Anderson, Eli Biham and Lars Knudsen as a
* candidate algorithm for the NIST AES Quest. * candidate algorithm for the NIST AES Quest.
* <p> * <p>
* For full details see <a href="http://www.cl.cam.ac.uk/~rja14/serpent.html">The Serpent home page</a> * For full details see <a href="https://www.cl.cam.ac.uk/~rja14/serpent.html">The Serpent home page</a>
*/ */
public final class SerpentEngine public final class SerpentEngine
extends SerpentEngineBase extends SerpentEngineBase

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/TnepresEngine.java

@ -12,7 +12,7 @@ import com.fr.third.org.bouncycastle.util.Pack;
* with test vectors in the AES submission and the resulting confusion lead to the Tnepres cipher * with test vectors in the AES submission and the resulting confusion lead to the Tnepres cipher
* as well, which is a byte swapped version of Serpent. * as well, which is a byte swapped version of Serpent.
* <p> * <p>
* For full details see <a href="http://www.cl.cam.ac.uk/~rja14/serpent.html">The Serpent home page</a> * For full details see <a href="https://www.cl.cam.ac.uk/~rja14/serpent.html">The Serpent home page</a>
*/ */
public final class TnepresEngine public final class TnepresEngine
extends SerpentEngineBase extends SerpentEngineBase

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/Zuc128Engine.java

@ -4,7 +4,7 @@ import com.fr.third.org.bouncycastle.util.Memoable;
/** /**
* Zuc256 implementation. * Zuc256 implementation.
* Based on http://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf * Based on https://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf
*/ */
public final class Zuc128Engine public final class Zuc128Engine
extends Zuc128CoreEngine extends Zuc128CoreEngine

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/Zuc256CoreEngine.java

@ -4,7 +4,7 @@ import com.fr.third.org.bouncycastle.util.Memoable;
/** /**
* Zuc256 implementation. * Zuc256 implementation.
* Based on http://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf * Based on https://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf
*/ */
public class Zuc256CoreEngine public class Zuc256CoreEngine
extends Zuc128CoreEngine extends Zuc128CoreEngine

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/engines/Zuc256Engine.java

@ -4,7 +4,7 @@ import com.fr.third.org.bouncycastle.util.Memoable;
/** /**
* Zuc256 implementation. * Zuc256 implementation.
* Based on http://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf * Based on https://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf
*/ */
public final class Zuc256Engine public final class Zuc256Engine
extends Zuc256CoreEngine extends Zuc256CoreEngine

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/NaccacheSternKeyPairGenerator.java

@ -15,7 +15,7 @@ import com.fr.third.org.bouncycastle.util.BigIntegers;
/** /**
* Key generation parameters for NaccacheStern cipher. For details on this cipher, please see * Key generation parameters for NaccacheStern cipher. For details on this cipher, please see
* *
* http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf * https://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
*/ */
public class NaccacheSternKeyPairGenerator public class NaccacheSternKeyPairGenerator
implements AsymmetricCipherKeyPairGenerator implements AsymmetricCipherKeyPairGenerator

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/PKCS12ParametersGenerator.java

@ -11,7 +11,7 @@ import com.fr.third.org.bouncycastle.crypto.params.ParametersWithIV;
* Generator for PBE derived keys and ivs as defined by PKCS 12 V1.0. * Generator for PBE derived keys and ivs as defined by PKCS 12 V1.0.
* <p> * <p>
* The document this implementation is based on can be found at * The document this implementation is based on can be found at
* <a href=http://www.rsasecurity.com/rsalabs/pkcs/pkcs-12/index.html> * <a href=https://www.rsasecurity.com/rsalabs/pkcs/pkcs-12/index.html>
* RSA's PKCS12 Page</a> * RSA's PKCS12 Page</a>
*/ */
public class PKCS12ParametersGenerator public class PKCS12ParametersGenerator

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/PKCS5S1ParametersGenerator.java

@ -12,7 +12,7 @@ import com.fr.third.org.bouncycastle.crypto.params.ParametersWithIV;
* digest used to drive it. * digest used to drive it.
* <p> * <p>
* The document this implementation is based on can be found at * The document this implementation is based on can be found at
* <a href=http://www.rsasecurity.com/rsalabs/pkcs/pkcs-5/index.html> * <a href=https://www.rsasecurity.com/rsalabs/pkcs/pkcs-5/index.html>
* RSA's PKCS5 Page</a> * RSA's PKCS5 Page</a>
*/ */
public class PKCS5S1ParametersGenerator public class PKCS5S1ParametersGenerator

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/generators/PKCS5S2ParametersGenerator.java

@ -14,7 +14,7 @@ import com.fr.third.org.bouncycastle.crypto.util.DigestFactory;
* This generator uses a SHA-1 HMac as the calculation function. * This generator uses a SHA-1 HMac as the calculation function.
* <p> * <p>
* The document this implementation is based on can be found at * The document this implementation is based on can be found at
* <a href=http://www.rsasecurity.com/rsalabs/pkcs/pkcs-5/index.html> * <a href=https://www.rsasecurity.com/rsalabs/pkcs/pkcs-5/index.html>
* RSA's PKCS5 Page</a> * RSA's PKCS5 Page</a>
*/ */
public class PKCS5S2ParametersGenerator public class PKCS5S2ParametersGenerator

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/macs/Zuc128Mac.java

@ -6,7 +6,7 @@ import com.fr.third.org.bouncycastle.crypto.engines.Zuc128CoreEngine;
/** /**
* Zuc128 Mac implementation. * Zuc128 Mac implementation.
* Based on http://www.qtc.jp/3GPP/Specs/eea3eia3specificationv16.pdf * Based on https://www.qtc.jp/3GPP/Specs/eea3eia3specificationv16.pdf
*/ */
public final class Zuc128Mac public final class Zuc128Mac
implements Mac implements Mac

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/macs/Zuc256Mac.java

@ -6,7 +6,7 @@ import com.fr.third.org.bouncycastle.crypto.engines.Zuc256CoreEngine;
/** /**
* Zuc256 Mac implementation. * Zuc256 Mac implementation.
* Based on http://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf * Based on https://www.is.cas.cn/ztzl2016/zouchongzhi/201801/W020180126529970733243.pdf
*/ */
public final class Zuc256Mac public final class Zuc256Mac
implements Mac implements Mac

2
fine-bouncycastle/src/main/java/com/fr/third/org/bouncycastle/crypto/modes/EAXBlockCipher.java

@ -15,7 +15,7 @@ import com.fr.third.org.bouncycastle.util.Arrays;
* A Two-Pass Authenticated-Encryption Scheme Optimized for Simplicity and * A Two-Pass Authenticated-Encryption Scheme Optimized for Simplicity and
* Efficiency - by M. Bellare, P. Rogaway, D. Wagner. * Efficiency - by M. Bellare, P. Rogaway, D. Wagner.
* *
* http://www.cs.ucdavis.edu/~rogaway/papers/eax.pdf * https://www.cs.ucdavis.edu/~rogaway/papers/eax.pdf
* *
* EAX is an AEAD scheme based on CTR and OMAC1/CMAC, that uses a single block * EAX is an AEAD scheme based on CTR and OMAC1/CMAC, that uses a single block
* cipher to encrypt and authenticate data. It's on-line (the length of a * cipher to encrypt and authenticate data. It's on-line (the length of a

Some files were not shown because too many files have changed in this diff Show More

Loading…
Cancel
Save