Merge pull request #4533 in CORE/base-third from bugfix/10.0 to feature/10.0

* commit 'ceea54625752f566c910a97ccaf500036be7373e':
  REPORT-64924 update: bouncycastle要求从1.67升级到1.68

fine-bouncycastle/readme.md

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

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
  *
- * 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>
  * 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, 
@@ -26,7 +26,7 @@ import com.fr.third.org.bouncycastle.util.Strings;
 public class LICENSE
 {
     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()
       + "Permission is hereby granted, free of charge, to any person obtaining a copy of this software "

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.
  */
 public class BERGenerator
-    extends
+    extends ASN1Generator
-    ASN1Generator
 {
     private boolean _tagged = false;
     private boolean _isExplicit;

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

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

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

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

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * This is common implementation for them all:
  * <pre>

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;
 
 /**
- * <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.
  * <p>

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;
 
 /**
- * <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
  * which define what really is being signed.
  * <pre>

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;
 
 /**
- * <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>
  * <pre>
  CCMParameters ::= SEQUENCE {

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>
  * contentType      ::= 1.2.840.113549.1.9.3
  * messageDigest    ::= 1.2.840.113549.1.9.4
@@ -28,7 +28,7 @@ public interface CMSAttributes
     ASN1ObjectIdentifier  signingTime = PKCSObjectIdentifiers.pkcs_9_at_signingTime;
     /** PKCS#9: 1.2.840.113549.1.9.6 */
     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  cmsAlgorithmProtect = PKCSObjectIdentifiers.id_aa_cmsAlgorithmProtect;

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;
 
 /** 
- * <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>
  * CompressedData ::= SEQUENCE {

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;
 
 /**
- * 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>
  * <pre>
  * CompressedData ::= SEQUENCE {

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;
 
 /**
- * <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>
  * ContentInfo ::= SEQUENCE {

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;
 
 /**
- * <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>
  * ContentInfo ::= SEQUENCE {

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;
 
 /** 
- * <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>
  * DigestedData ::= SEQUENCE {
  *       version CMSVersion,

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;
 
 /**
- * <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>
  * EncryptedContentInfo ::= SEQUENCE {

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;
 
 /**
- * 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>
  * <pre>
  * EncryptedContentInfo ::= SEQUENCE {

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;
 
 /**
- * <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>
  * <pre>
  * EncryptedData ::= SEQUENCE {

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;
 
 /**
- * <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>
  * EnvelopedData ::= SEQUENCE {
  *     version CMSVersion,

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;
 
 /** 
- * 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>
  * <pre>
  * EnvelopedData ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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>
  * <pre>
  GCMParameters ::= SEQUENCE {

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;
 
 /**
- * <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>
  * <pre>
  * IssuerAndSerialNumber ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <pre>
  * KeyTransRecipientInfo ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <pre>
  * OriginatorIdentifierOrKey ::= CHOICE {

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;
 
 /**
- * <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>
  * RFC 3369:
  *

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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>
  * <pre>
  * OtherKeyAttribute ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <pre>
  * OtherRecipientInfo ::= SEQUENCE {

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;
 
 /**
- * <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>
  * <pre>
  * OtherRevocationInfoFormat ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <pre>
  * PasswordRecipientInfo ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <pre>
  * RecipientEncryptedKey ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <pre>
  * RecipientIdentifier ::= CHOICE {

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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>
  * A signed data object containing multitude of {@link SignerInfo}s.
  * <pre>

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;
 
 /**
- * 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>
  * <pre>
  * SignedData ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <p>
  * The certificates referred to by this are at containing {@link SignedData} structure.

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;
 
 /**
- * <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}.
  * <pre>
  * PKCS#7:

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * <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.
  * <pre>
  * TimeStampAndCRL ::= SEQUENCE {

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;
 
 /**
- * <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.
  * <pre>
  * TimeStampTokenEvidence ::=

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;
 
 /**
- * <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.
  * <p>
  * <pre>

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;
 
 /**
- * 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.
  * <p>
  * <pre>
@@ -71,6 +71,11 @@ public class TimeStampedDataParser
         return null;
     }
 
+    public int getVersion()
+    {
+        return version.getValue().intValue();
+    }
+    
     public DERIA5String getDataUri()
     {
         return dataUri;

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;
 
 /**
- * <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>
  * MQVuserKeyingMaterial ::= SEQUENCE {
  *   ephemeralPublicKey OriginatorPublicKey,

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;
 
 /**
- * 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
  */
 public interface DVCSObjectIdentifiers

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
  * (Bundesamt fü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>
  * <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

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
  * id-isis-at-namingAuthorities and must be applied for.
  * <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.
  * <li> By means of the data type ProfessionInfo certain professions,
  * specializations, disciplines, fields of activity, etc. are identified. A

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)
  * ({iso(1) member-body(2) kr(410) kisa(200004)})
  * <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
  * 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
  */
 public interface KISAObjectIdentifiers

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;
 
 /**
- * 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
  * in Cryptographic Message Syntax (CMS)
  */

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;
 
 /**
- * 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.
  */
 public interface OCSPObjectIdentifiers

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 */
     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
     /** PKCS#9: 1.2.840.113549.1.9.16.2.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 */
     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
 
     /*
      * 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");
     
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
-    /** 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");
 
     /** 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> */

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"
- * 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
 {

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
     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.
@@ -64,26 +64,31 @@ public class ArchiveTimeStamp
         PartialHashtree[] reducedHashTree,
         ContentInfo timeStamp)
     {
-        this.digestAlgorithm = digestAlgorithm;
+        this(digestAlgorithm, null, reducedHashTree, timeStamp);
-        this.reducedHashTree = new DERSequence(reducedHashTree);
-        this.timeStamp = timeStamp;
     }
 
     public ArchiveTimeStamp(
-        AlgorithmIdentifier digestAlgorithm,
-        Attributes attributes,
-        PartialHashtree[] reducedHashTree,
         ContentInfo timeStamp)
     {
-        this.digestAlgorithm = digestAlgorithm;
+        this(null, null, null, timeStamp);
-        this.attributes = attributes;
-        this.reducedHashTree = new DERSequence(reducedHashTree);
-        this.timeStamp = timeStamp;
     }
 
     public ArchiveTimeStamp(
+        AlgorithmIdentifier digestAlgorithm,
+        Attributes attributes,
+        PartialHashtree[] reducedHashTree,
         ContentInfo timeStamp)
     {
+        this.digestAlgorithm = digestAlgorithm;
+        this.attributes = attributes;
+        if (reducedHashTree != null)
+        {
+            this.reducedHashTree = new DERSequence(reducedHashTree);
+        }
+        else
+        {
+            this.reducedHashTree = null;
+        }
         this.timeStamp = timeStamp;
     }
 
@@ -94,6 +99,9 @@ public class ArchiveTimeStamp
             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++)
         {
             Object obj = sequence.getObjectAt(i);
@@ -105,13 +113,13 @@ public class ArchiveTimeStamp
                 switch (taggedObject.getTagNo())
                 {
                 case 0:
-                    digestAlgorithm = AlgorithmIdentifier.getInstance(taggedObject, false);
+                    digAlg = AlgorithmIdentifier.getInstance(taggedObject, false);
                     break;
                 case 1:
-                    attributes = Attributes.getInstance(taggedObject, false);
+                    attrs = Attributes.getInstance(taggedObject, false);
                     break;
                 case 2:
-                    reducedHashTree = ASN1Sequence.getInstance(taggedObject, false);
+                    rHashTree = ASN1Sequence.getInstance(taggedObject, false);
                     break;
                 default:
                     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));
     }
 

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 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)
      */
@@ -96,6 +98,7 @@ public class BCStyle
      */
     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
@@ -213,6 +216,8 @@ public class BCStyle
         DefaultSymbols.put(GIVENNAME, "GIVENNAME");
         DefaultSymbols.put(INITIALS, "INITIALS");
         DefaultSymbols.put(GENERATION, "GENERATION");
+        DefaultSymbols.put(DESCRIPTION, "DESCRIPTION");
+        DefaultSymbols.put(ROLE, "ROLE");
         DefaultSymbols.put(UnstructuredAddress, "unstructuredAddress");
         DefaultSymbols.put(UnstructuredName, "unstructuredName");
         DefaultSymbols.put(UNIQUE_IDENTIFIER, "UniqueIdentifier");
@@ -249,6 +254,8 @@ public class BCStyle
         DefaultLookUp.put("givenname", GIVENNAME);
         DefaultLookUp.put("initials", INITIALS);
         DefaultLookUp.put("generation", GENERATION);
+        DefaultLookUp.put("description", DESCRIPTION);
+        DefaultLookUp.put("role", ROLE);
         DefaultLookUp.put("unstructuredaddress", UnstructuredAddress);
         DefaultLookUp.put("unstructuredname", UnstructuredName);
         DefaultLookUp.put("uniqueidentifier", UNIQUE_IDENTIFIER);

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"));
 
     /**
-     * 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"));
 

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 }
  * </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
     extends ASN1Object

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.
  * <p>
  * 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.
  * <p>
  * This class is stateful and NOT threadsafe.

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

@@ -10,7 +10,7 @@ import java.math.BigInteger;
  * <p>
  * See {@link JPAKEPrimeOrderGroups} for convenient standard groups.
  * <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.
  */
 public class JPAKEPrimeOrderGroup

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

@@ -11,7 +11,7 @@ import java.math.BigInteger;
  * <p>
  * The prime order groups below are taken from Sun's JDK JavaDoc (docs/guide/security/CryptoSpec.html#AppB),
  * 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
 {

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
-     * <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.
      * <pre>
      * MacTag = HMAC(MacKey, MacLen, MacData)

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,
- * http://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
+ * https://www.esat.kuleuven.ac.be/~bosselae/ripemd160.html
  */
 public class RIPEMD160Digest
     extends GeneralDigest

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
- * http://tools.ietf.org/html/draft-shen-sm3-hash-01
+ * https://tools.ietf.org/html/draft-shen-sm3-hash-01
  * and at .... ( Chinese PDF )
  * <p>
  * The specification says "process a bit stream",

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:
- * <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
     implements ExtendedDigest, Memoable

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];
 
         System.arraycopy(block, start, output, 0, output.length);
+        Arrays.fill(block, (byte)0);
 
         return output;
     }

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.
  * <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
  * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>

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.
  * <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
  * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>

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.
  * <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
  * <a href="http://fp.gladman.plus.com/cryptography_technology/rijndael/">http://fp.gladman.plus.com/cryptography_technology/rijndael/</a>

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
  * Specification.
  * <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
     extends RFC3394WrapEngine

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
  * Specification.
  * <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
     extends RFC3394WrapEngine

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.
  * <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
     extends RFC3394WrapEngine

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.
      * - 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,
      * @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 checksum the checksum.

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
  * vector.
  * <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>
  * It is a third phase candidate in the eStream contest, and is patent-free.
  * 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>
  */
 public class HC128Engine

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 
  * vector.
  * <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>
  * 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). 
  * See
  * 
- * http://www.ecrypt.eu.org/stream/hcp3.html
+ * https://www.ecrypt.eu.org/stream/hcp3.html
  * </p>
  */
 public class HC256Engine

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).
- * see: http://www.burtleburtle.net/bob/rand/isaacafa.html
+ * see: https://www.burtleburtle.net/bob/rand/isaacafa.html
 */
 public class ISAACEngine
     implements StreamCipher

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.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.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.NaccacheSternPrivateKeyParameters;
 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
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
+ * https://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
  */
 public class NaccacheSternEngine
     implements AsymmetricBlockCipher

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.
      * - 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(
         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(
         byte[] key,

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>
  * publication in RSA CryptoBytes, Spring of 1995. 
- * <em>http://www.rsasecurity.com/rsalabs/cryptobytes</em>.
+ * <em>https://www.rsasecurity.com/rsalabs/cryptobytes</em>.
  * <p>
  * This implementation has a word size of 32 bits.
  * <p>

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>
  * publication in RSA CryptoBytes, Spring of 1995. 
- * <em>http://www.rsasecurity.com/rsalabs/cryptobytes</em>.
+ * <em>https://www.rsasecurity.com/rsalabs/cryptobytes</em>.
  * <p>
  * This implementation is set to work with a 64 bit word size.
  * <p>

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
  * Specification as described in RFC 3394.
  * <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
     implements Wrapper

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.
  * <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
     extends RFC3394WrapEngine

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
  * candidate algorithm for the NIST AES Quest.
  * <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
     extends SerpentEngineBase

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
  * as well, which is a byte swapped version of Serpent.
  * <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
     extends SerpentEngineBase

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.
- * 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
     extends Zuc128CoreEngine

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.
- * 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
     extends Zuc128CoreEngine

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.
- * 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
     extends Zuc256CoreEngine

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
  * 
- * http://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
+ * https://www.gemplus.com/smart/rd/publications/pdf/NS98pkcs.pdf
  */
 public class NaccacheSternKeyPairGenerator 
     implements AsymmetricCipherKeyPairGenerator 

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.
  * <p>
  * 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>
  */
 public class PKCS12ParametersGenerator

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.
  * <p>
  * 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>
  */
 public class PKCS5S1ParametersGenerator

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.
  * <p>
  * 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>
  */
 public class PKCS5S2ParametersGenerator

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.
- * Based on http://www.qtc.jp/3GPP/Specs/eea3eia3specificationv16.pdf
+ * Based on https://www.qtc.jp/3GPP/Specs/eea3eia3specificationv16.pdf
  */
 public final class Zuc128Mac
     implements Mac

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.
- * 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
     implements Mac

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
  * 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
  * cipher to encrypt and authenticate data. It's on-line (the length of a