Merge branch 'master' into vs2010

jstedfast · jstedfast · commit db4a3f72ab5f · 2015-10-23T09:11:33.000-04:00
diff --git a/crypto/src/asn1/cmp/RevDetails.cs b/crypto/src/asn1/cmp/RevDetails.cs
@@ -11,17 +11,15 @@ public class RevDetails
 		private readonly CertTemplate certDetails;
 		private readonly X509Extensions crlEntryDetails;
 
-		private RevDetails(Asn1Sequence seq)
+        private RevDetails(Asn1Sequence seq)
 		{
 			certDetails = CertTemplate.GetInstance(seq[0]);
-
-			if  (seq.Count > 1)
-			{
-				crlEntryDetails = X509Extensions.GetInstance(seq[1]);
-			}
+            crlEntryDetails = seq.Count <= 1
+                ?   null
+                :   X509Extensions.GetInstance(seq[1]);
 		}
 
-		public static RevDetails GetInstance(object obj)
+        public static RevDetails GetInstance(object obj)
 		{
 			if (obj is RevDetails)
 				return (RevDetails)obj;
@@ -33,21 +31,22 @@ public static RevDetails GetInstance(object obj)
 		}
 
 		public RevDetails(CertTemplate certDetails)
+            :   this(certDetails, null)
 		{
-			this.certDetails = certDetails;
 		}
-		
-		public RevDetails(CertTemplate certDetails, X509Extensions crlEntryDetails)
+
+        public RevDetails(CertTemplate certDetails, X509Extensions crlEntryDetails)
 		{
-			this.crlEntryDetails = crlEntryDetails;
+            this.certDetails = certDetails;
+            this.crlEntryDetails = crlEntryDetails;
 		}
 
-		public virtual CertTemplate CertDetails
+        public virtual CertTemplate CertDetails
 		{
 			get { return certDetails; }
 		}
 
-		public virtual X509Extensions CrlEntryDetails
+        public virtual X509Extensions CrlEntryDetails
 		{
 			get { return crlEntryDetails; }
 		}
diff --git a/crypto/src/cms/CMSSignedDataGenerator.cs b/crypto/src/cms/CMSSignedDataGenerator.cs
@@ -174,7 +174,7 @@ internal SignerInfo ToSignerInfo(
                 }
 
 				sigStr.Close();
-                byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal();
+                byte[] sigBytes = ((IBlockResult)calculator.GetResult()).Collect();
 
 				Asn1Set unsignedAttr = null;
 				if (unsAttr != null)
diff --git a/crypto/src/crypto/IBlockResult.cs b/crypto/src/crypto/IBlockResult.cs
@@ -11,14 +11,14 @@ public interface IBlockResult
         /// Return the final result of the operation.
         /// </summary>
         /// <returns>A block of bytes, representing the result of an operation.</returns>
-        byte[] DoFinal();
+        byte[] Collect();
 
         /// <summary>
         /// Store the final result of the operation by copying it into the destination array.
         /// </summary>
         /// <returns>The number of bytes copied into destination.</returns>
         /// <param name="destination">The byte array to copy the result into.</param>
         /// <param name="offset">The offset into destination to start copying the result at.</param>
-        int DoFinal(byte[] destination, int offset);
+        int Collect(byte[] destination, int offset);
     }
 }
diff --git a/crypto/src/crypto/generators/ECKeyPairGenerator.cs b/crypto/src/crypto/generators/ECKeyPairGenerator.cs
@@ -108,12 +108,6 @@ public AsymmetricCipherKeyPair GenerateKeyPair()
                 if (d.CompareTo(BigInteger.Two) < 0 || d.CompareTo(n) >= 0)
                     continue;
 
-                /*
-                 * Require a minimum weight of the NAF representation, since low-weight primes may be
-                 * weak against a version of the number-field-sieve for the discrete-logarithm-problem.
-                 * 
-                 * See "The number field sieve for integers of low weight", Oliver Schirokauer.
-                 */
                 if (WNafUtilities.GetNafWeight(d) < minWeight)
                     continue;
 
diff --git a/crypto/src/crypto/generators/GOST3410KeyPairGenerator.cs b/crypto/src/crypto/generators/GOST3410KeyPairGenerator.cs
@@ -55,12 +55,6 @@ public AsymmetricCipherKeyPair GenerateKeyPair()
                 if (x.SignValue < 1 || x.CompareTo(q) >= 0)
                     continue;
 
-                /*
-                 * Require a minimum weight of the NAF representation, since low-weight primes may be
-                 * weak against a version of the number-field-sieve for the discrete-logarithm-problem.
-                 * 
-                 * See "The number field sieve for integers of low weight", Oliver Schirokauer.
-                 */
                 if (WNafUtilities.GetNafWeight(x) < minWeight)
                     continue;
 
diff --git a/crypto/src/crypto/operators/Asn1Signature.cs b/crypto/src/crypto/operators/Asn1Signature.cs
@@ -422,14 +422,14 @@ internal SigResult(ISigner sig)
             this.sig = sig;
         }
 
-        public byte[] DoFinal()
+        public byte[] Collect()
         {
             return sig.GenerateSignature();
         }
 
-        public int DoFinal(byte[] destination, int offset)
+        public int Collect(byte[] destination, int offset)
         {
-            byte[] signature = DoFinal();
+            byte[] signature = Collect();
 
             Array.Copy(signature, 0, destination, offset, signature.Length);
 
diff --git a/crypto/src/ocsp/BasicOCSPRespGenerator.cs b/crypto/src/ocsp/BasicOCSPRespGenerator.cs
@@ -219,7 +219,7 @@ private BasicOcspResp GenerateResponse(
 
                 streamCalculator.Stream.Close();
 
-                bitSig = new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal());
+                bitSig = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect());
 			}
 			catch (Exception e)
 			{
diff --git a/crypto/src/pkcs/Pkcs10CertificationRequest.cs b/crypto/src/pkcs/Pkcs10CertificationRequest.cs
@@ -282,7 +282,7 @@ private void init(
             streamCalculator.Stream.Close();
 
             // Generate Signature.
-            sigBits = new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal());
+            sigBits = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect());
         }
 
         //        internal Pkcs10CertificationRequest(
diff --git a/crypto/src/x509/X509V1CertificateGenerator.cs b/crypto/src/x509/X509V1CertificateGenerator.cs
@@ -186,7 +186,7 @@ public X509Certificate Generate(ISignatureCalculator signatureCalculator)
 
             streamCalculator.Stream.Close();
 
-            return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal());
+            return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
 		}
 
 		private X509Certificate GenerateJcaObject(
diff --git a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs b/crypto/src/x509/X509V2AttributeCertificateGenerator.cs
@@ -180,7 +180,7 @@ public IX509AttributeCertificate Generate(ISignatureCalculator signatureCalculat
 
 			try
 			{
-				v.Add(new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal()));
+				v.Add(new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect()));
 
 				return new X509V2AttributeCertificate(AttributeCertificate.GetInstance(new DerSequence(v)));
 			}
diff --git a/crypto/src/x509/X509V2CRLGenerator.cs b/crypto/src/x509/X509V2CRLGenerator.cs
@@ -243,7 +243,7 @@ public X509Crl Generate(ISignatureCalculator signatureCalculator)
 
             streamCalculator.Stream.Close();
 
-            return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal());
+            return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
         }
 
         private TbsCertificateList GenerateCertList()
diff --git a/crypto/src/x509/X509V3CertificateGenerator.cs b/crypto/src/x509/X509V3CertificateGenerator.cs
@@ -322,7 +322,7 @@ public X509Certificate Generate(ISignatureCalculator signatureCalculator)
 
             streamCalculator.Stream.Close ();
 
-			return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal());
+			return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());
 		}
 
 		private X509Certificate GenerateJcaObject(

Original file line number	Diff line number	Diff line change
`@@ -11,17 +11,15 @@ public class RevDetails`
`11`	`11`	`private readonly CertTemplate certDetails;`
`12`	`12`	`private readonly X509Extensions crlEntryDetails;`
`13`	`13`
`14`		`- private RevDetails(Asn1Sequence seq)`
	`14`	`+ private RevDetails(Asn1Sequence seq)`
`15`	`15`	`{`
`16`	`16`	`certDetails = CertTemplate.GetInstance(seq[0]);`
`17`		`-`
`18`		`- if (seq.Count > 1)`
`19`		`- {`
`20`		`- crlEntryDetails = X509Extensions.GetInstance(seq[1]);`
`21`		`- }`
	`17`	`+ crlEntryDetails = seq.Count <= 1`
	`18`	`+ ? null`
	`19`	`+ : X509Extensions.GetInstance(seq[1]);`
`22`	`20`	`}`
`23`	`21`
`24`		`- public static RevDetails GetInstance(object obj)`
	`22`	`+ public static RevDetails GetInstance(object obj)`
`25`	`23`	`{`
`26`	`24`	`if (obj is RevDetails)`
`27`	`25`	`return (RevDetails)obj;`
`@@ -33,21 +31,22 @@ public static RevDetails GetInstance(object obj)`
`33`	`31`	`}`
`34`	`32`
`35`	`33`	`public RevDetails(CertTemplate certDetails)`
	`34`	`+ : this(certDetails, null)`
`36`	`35`	`{`
`37`		`- this.certDetails = certDetails;`
`38`	`36`	`}`
`39`		`-`
`40`		`- public RevDetails(CertTemplate certDetails, X509Extensions crlEntryDetails)`
	`37`	`+`
	`38`	`+ public RevDetails(CertTemplate certDetails, X509Extensions crlEntryDetails)`
`41`	`39`	`{`
`42`		`- this.crlEntryDetails = crlEntryDetails;`
	`40`	`+ this.certDetails = certDetails;`
	`41`	`+ this.crlEntryDetails = crlEntryDetails;`
`43`	`42`	`}`
`44`	`43`
`45`		`- public virtual CertTemplate CertDetails`
	`44`	`+ public virtual CertTemplate CertDetails`
`46`	`45`	`{`
`47`	`46`	`get { return certDetails; }`
`48`	`47`	`}`
`49`	`48`
`50`		`- public virtual X509Extensions CrlEntryDetails`
	`49`	`+ public virtual X509Extensions CrlEntryDetails`
`51`	`50`	`{`
`52`	`51`	`get { return crlEntryDetails; }`
`53`	`52`	`}`
Original file line number	Diff line number	Diff line change
`@@ -174,7 +174,7 @@ internal SignerInfo ToSignerInfo(`
`174`	`174`	`}`
`175`	`175`
`176`	`176`	`sigStr.Close();`
`177`		`- byte[] sigBytes = ((IBlockResult)calculator.GetResult()).DoFinal();`
	`177`	`+ byte[] sigBytes = ((IBlockResult)calculator.GetResult()).Collect();`
`178`	`178`
`179`	`179`	`Asn1Set unsignedAttr = null;`
`180`	`180`	`if (unsAttr != null)`
Original file line number	Diff line number	Diff line change
`@@ -422,14 +422,14 @@ internal SigResult(ISigner sig)`
`422`	`422`	`this.sig = sig;`
`423`	`423`	`}`
`424`	`424`
`425`		`- public byte[] DoFinal()`
	`425`	`+ public byte[] Collect()`
`426`	`426`	`{`
`427`	`427`	`return sig.GenerateSignature();`
`428`	`428`	`}`
`429`	`429`
`430`		`- public int DoFinal(byte[] destination, int offset)`
	`430`	`+ public int Collect(byte[] destination, int offset)`
`431`	`431`	`{`
`432`		`- byte[] signature = DoFinal();`
	`432`	`+ byte[] signature = Collect();`
`433`	`433`
`434`	`434`	`Array.Copy(signature, 0, destination, offset, signature.Length);`
`435`	`435`
Original file line number	Diff line number	Diff line change
`@@ -219,7 +219,7 @@ private BasicOcspResp GenerateResponse(`
`219`	`219`
`220`	`220`	`streamCalculator.Stream.Close();`
`221`	`221`
`222`		`- bitSig = new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal());`
	`222`	`+ bitSig = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect());`
`223`	`223`	`}`
`224`	`224`	`catch (Exception e)`
`225`	`225`	`{`
Original file line number	Diff line number	Diff line change
`@@ -282,7 +282,7 @@ private void init(`
`282`	`282`	`streamCalculator.Stream.Close();`
`283`	`283`
`284`	`284`	`// Generate Signature.`
`285`		`- sigBits = new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal());`
	`285`	`+ sigBits = new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect());`
`286`	`286`	`}`
`287`	`287`
`288`	`288`	`// internal Pkcs10CertificationRequest(`
Original file line number	Diff line number	Diff line change
`@@ -186,7 +186,7 @@ public X509Certificate Generate(ISignatureCalculator signatureCalculator)`
`186`	`186`
`187`	`187`	`streamCalculator.Stream.Close();`
`188`	`188`
`189`		`- return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal());`
	`189`	`+ return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());`
`190`	`190`	`}`
`191`	`191`
`192`	`192`	`private X509Certificate GenerateJcaObject(`
Original file line number	Diff line number	Diff line change
`@@ -180,7 +180,7 @@ public IX509AttributeCertificate Generate(ISignatureCalculator signatureCalculat`
`180`	`180`
`181`	`181`	`try`
`182`	`182`	`{`
`183`		`- v.Add(new DerBitString(((IBlockResult)streamCalculator.GetResult()).DoFinal()));`
	`183`	`+ v.Add(new DerBitString(((IBlockResult)streamCalculator.GetResult()).Collect()));`
`184`	`184`
`185`	`185`	`return new X509V2AttributeCertificate(AttributeCertificate.GetInstance(new DerSequence(v)));`
`186`	`186`	`}`
Original file line number	Diff line number	Diff line change
`@@ -243,7 +243,7 @@ public X509Crl Generate(ISignatureCalculator signatureCalculator)`
`243`	`243`
`244`	`244`	`streamCalculator.Stream.Close();`
`245`	`245`
`246`		`- return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal());`
	`246`	`+ return GenerateJcaObject(tbsCertList, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());`
`247`	`247`	`}`
`248`	`248`
`249`	`249`	`private TbsCertificateList GenerateCertList()`
Original file line number	Diff line number	Diff line change
`@@ -322,7 +322,7 @@ public X509Certificate Generate(ISignatureCalculator signatureCalculator)`
`322`	`322`
`323`	`323`	`streamCalculator.Stream.Close ();`
`324`	`324`
`325`		`- return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).DoFinal());`
	`325`	`+ return GenerateJcaObject(tbsCert, (AlgorithmIdentifier)signatureCalculator.AlgorithmDetails, ((IBlockResult)streamCalculator.GetResult()).Collect());`
`326`	`326`	`}`
`327`	`327`
`328`	`328`	`private X509Certificate GenerateJcaObject(`