Fixes and tidying up for release

1 files changed, 66 insertions, 17 deletions

diff --git a/crypto/BouncyCastle.csproj b/crypto/BouncyCastle.csproj
index 5dfdd35e5..af51afd16 100644
--- a/crypto/BouncyCastle.csproj
+++ b/crypto/BouncyCastle.csproj
@@ -556,6 +556,15 @@
     <Compile Include="src\bcpg\sig\SignatureExpirationTime.cs" />
     <Compile Include="src\bcpg\sig\SignerUserId.cs" />
     <Compile Include="src\bcpg\sig\TrustSignature.cs" />
+    <Compile Include="src\cmp\CertificateConfirmationContent.cs" />
+    <Compile Include="src\cmp\CertificateConfirmationContentBuilder.cs" />
+    <Compile Include="src\cmp\CertificateStatus.cs" />
+    <Compile Include="src\cmp\CmpException.cs" />
+    <Compile Include="src\cmp\GeneralPkiMessage.cs" />
+    <Compile Include="src\cmp\ProtectedPkiMessage.cs" />
+    <Compile Include="src\cmp\ProtectedPkiMessageBuilder.cs" />
+    <Compile Include="src\cmp\RevocationDetails.cs" />
+    <Compile Include="src\cmp\RevocationDetailsBuilder.cs" />
     <Compile Include="src\cms\BaseDigestCalculator.cs" />
     <Compile Include="src\cms\CMSAttributeTableGenerationException.cs" />
     <Compile Include="src\cms\CMSAttributeTableGenerator.cs" />
@@ -597,6 +606,7 @@
     <Compile Include="src\cms\CounterSignatureDigestCalculator.cs" />
     <Compile Include="src\cms\DefaultAuthenticatedAttributeTableGenerator.cs" />
     <Compile Include="src\cms\DefaultSignedAttributeTableGenerator.cs" />
+    <Compile Include="src\cms\EnvelopedDataHelper.cs" />
     <Compile Include="src\cms\IDigestCalculator.cs" />
     <Compile Include="src\cms\KEKRecipientInfoGenerator.cs" />
     <Compile Include="src\cms\KEKRecipientInformation.cs" />
@@ -620,6 +630,20 @@
     <Compile Include="src\cms\SignerInformation.cs" />
     <Compile Include="src\cms\SignerInformationStore.cs" />
     <Compile Include="src\cms\SimpleAttributeTableGenerator.cs" />
+    <Compile Include="src\crmf\AuthenticatorControl.cs" />
+    <Compile Include="src\crmf\CertificateRequestMessage.cs" />
+    <Compile Include="src\crmf\CertificateRequestMessageBuilder.cs" />
+    <Compile Include="src\crmf\CrmfException.cs" />
+    <Compile Include="src\crmf\DefaultPKMacPrimitivesProvider.cs" />
+    <Compile Include="src\crmf\EncryptedValueBuilder.cs" />
+    <Compile Include="src\crmf\IControl.cs" />
+    <Compile Include="src\crmf\IEncryptedValuePadder.cs" />
+    <Compile Include="src\crmf\IPKMacPrimitivesProvider.cs" />
+    <Compile Include="src\crmf\PkiArchiveControl.cs" />
+    <Compile Include="src\crmf\PkiArchiveControlBuilder.cs" />
+    <Compile Include="src\crmf\PKMacBuilder.cs" />
+    <Compile Include="src\crmf\ProofOfPossessionSigningKeyBuilder.cs" />
+    <Compile Include="src\crmf\RegTokenControl.cs" />
     <Compile Include="src\crypto\AsymmetricCipherKeyPair.cs" />
     <Compile Include="src\crypto\AsymmetricKeyParameter.cs" />
     <Compile Include="src\crypto\BufferedAeadBlockCipher.cs" />
@@ -644,15 +668,22 @@
     <Compile Include="src\crypto\IBlockCipher.cs" />
     <Compile Include="src\crypto\IBlockResult.cs" />
     <Compile Include="src\crypto\IBufferedCipher.cs" />
+    <Compile Include="src\crypto\ICipher.cs" />
+    <Compile Include="src\crypto\ICipherBuilder.cs" />
+    <Compile Include="src\crypto\ICipherBuilderWithKey.cs" />
     <Compile Include="src\crypto\ICipherParameters.cs" />
-    <Compile Include="src\crypto\IDSA.cs" />
-    <Compile Include="src\crypto\IDsaExt.cs" />
+    <Compile Include="src\crypto\IDecryptorBuilderProvider.cs" />
     <Compile Include="src\crypto\IDerivationFunction.cs" />
     <Compile Include="src\crypto\IDerivationParameters.cs" />
     <Compile Include="src\crypto\IDigest.cs" />
+    <Compile Include="src\crypto\IDSA.cs" />
+    <Compile Include="src\crypto\IDsaExt.cs" />
     <Compile Include="src\crypto\IEntropySource.cs" />
     <Compile Include="src\crypto\IEntropySourceProvider.cs" />
+    <Compile Include="src\crypto\IKeyUnwrapper.cs" />
+    <Compile Include="src\crypto\IKeyWrapper.cs" />
     <Compile Include="src\crypto\IMac.cs" />
+    <Compile Include="src\crypto\IMacFactory.cs" />
     <Compile Include="src\crypto\IRawAgreement.cs" />
     <Compile Include="src\crypto\IRsa.cs" />
     <Compile Include="src\crypto\ISignatureFactory.cs" />
@@ -669,23 +700,11 @@
     <Compile Include="src\crypto\KeyGenerationParameters.cs" />
     <Compile Include="src\crypto\MaxBytesExceededException.cs" />
     <Compile Include="src\crypto\OutputLengthException.cs" />
+    <Compile Include="src\crypto\Security.cs" />
+    <Compile Include="src\crypto\SimpleBlockResult.cs" />
+    <Compile Include="src\crypto\StreamBlockCipher.cs" />
     <Compile Include="src\crypto\parameters\HKDFParameters.cs" />
     <Compile Include="src\crypto\PbeParametersGenerator.cs" />
-    <Compile Include="src\crypto\prng\BasicEntropySourceProvider.cs" />
-    <Compile Include="src\crypto\prng\CryptoApiEntropySourceProvider.cs" />
-    <Compile Include="src\crypto\prng\drbg\CtrSP800Drbg.cs" />
-    <Compile Include="src\crypto\prng\drbg\DrbgUtilities.cs" />
-    <Compile Include="src\crypto\prng\drbg\HashSP800Drbg.cs" />
-    <Compile Include="src\crypto\prng\drbg\HMacSP800Drbg.cs" />
-    <Compile Include="src\crypto\prng\drbg\ISP80090Drbg.cs" />
-    <Compile Include="src\crypto\prng\EntropyUtilities.cs" />
-    <Compile Include="src\crypto\prng\IDrbgProvider.cs" />
-    <Compile Include="src\crypto\prng\SP800SecureRandom.cs" />
-    <Compile Include="src\crypto\prng\SP800SecureRandomBuilder.cs" />
-    <Compile Include="src\crypto\prng\X931Rng.cs" />
-    <Compile Include="src\crypto\prng\X931SecureRandom.cs" />
-    <Compile Include="src\crypto\prng\X931SecureRandomBuilder.cs" />
-    <Compile Include="src\crypto\StreamBlockCipher.cs" />
     <Compile Include="src\crypto\agreement\DHAgreement.cs" />
     <Compile Include="src\crypto\agreement\DHBasicAgreement.cs" />
     <Compile Include="src\crypto\agreement\DHStandardGroups.cs" />
@@ -876,11 +895,16 @@
     <Compile Include="src\crypto\modes\gcm\Tables1kGcmExponentiator.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables64kGcmMultiplier.cs" />
     <Compile Include="src\crypto\modes\gcm\Tables8kGcmMultiplier.cs" />
+    <Compile Include="src\crypto\operators\Asn1CipherBuilder.cs" />
+    <Compile Include="src\crypto\operators\Asn1KeyWrapper.cs" />
     <Compile Include="src\crypto\operators\Asn1Signature.cs" />
+    <Compile Include="src\crypto\operators\CmsContentEncryptorBuilder.cs" />
+    <Compile Include="src\crypto\operators\CmsKeyTransRecipientInfoGenerator.cs" />
     <Compile Include="src\crypto\operators\DefaultSignatureCalculator.cs" />
     <Compile Include="src\crypto\operators\DefaultSignatureResult.cs" />
     <Compile Include="src\crypto\operators\DefaultVerifierCalculator.cs" />
     <Compile Include="src\crypto\operators\DefaultVerifierResult.cs" />
+    <Compile Include="src\crypto\operators\GenericKey.cs" />
     <Compile Include="src\crypto\paddings\BlockCipherPadding.cs" />
     <Compile Include="src\crypto\paddings\ISO10126d2Padding.cs" />
     <Compile Include="src\crypto\paddings\ISO7816d4Padding.cs" />
@@ -907,8 +931,10 @@
     <Compile Include="src\crypto\parameters\DsaPublicKeyParameters.cs" />
     <Compile Include="src\crypto\parameters\DsaValidationParameters.cs" />
     <Compile Include="src\crypto\parameters\ECDomainParameters.cs" />
+    <Compile Include="src\crypto\parameters\ECGOST3410Parameters.cs" />
     <Compile Include="src\crypto\parameters\ECKeyGenerationParameters.cs" />
     <Compile Include="src\crypto\parameters\ECKeyParameters.cs" />
+    <Compile Include="src\crypto\parameters\ECNamedDomainParameters.cs" />
     <Compile Include="src\crypto\parameters\ECPrivateKeyParameters.cs" />
     <Compile Include="src\crypto\parameters\ECPublicKeyParameters.cs" />
     <Compile Include="src\crypto\parameters\Ed25519KeyGenerationParameters.cs" />
@@ -961,12 +987,26 @@
     <Compile Include="src\crypto\parameters\X448KeyGenerationParameters.cs" />
     <Compile Include="src\crypto\parameters\X448PrivateKeyParameters.cs" />
     <Compile Include="src\crypto\parameters\X448PublicKeyParameters.cs" />
+    <Compile Include="src\crypto\prng\BasicEntropySourceProvider.cs" />
+    <Compile Include="src\crypto\prng\CryptoApiEntropySourceProvider.cs" />
     <Compile Include="src\crypto\prng\CryptoApiRandomGenerator.cs" />
     <Compile Include="src\crypto\prng\DigestRandomGenerator.cs" />
+    <Compile Include="src\crypto\prng\EntropyUtilities.cs" />
+    <Compile Include="src\crypto\prng\IDrbgProvider.cs" />
     <Compile Include="src\crypto\prng\IRandomGenerator.cs" />
     <Compile Include="src\crypto\prng\ReversedWindowGenerator.cs" />
+    <Compile Include="src\crypto\prng\SP800SecureRandom.cs" />
+    <Compile Include="src\crypto\prng\SP800SecureRandomBuilder.cs" />
     <Compile Include="src\crypto\prng\ThreadedSeedGenerator.cs" />
     <Compile Include="src\crypto\prng\VMPCRandomGenerator.cs" />
+    <Compile Include="src\crypto\prng\X931Rng.cs" />
+    <Compile Include="src\crypto\prng\X931SecureRandom.cs" />
+    <Compile Include="src\crypto\prng\X931SecureRandomBuilder.cs" />
+    <Compile Include="src\crypto\prng\drbg\CtrSP800Drbg.cs" />
+    <Compile Include="src\crypto\prng\drbg\DrbgUtilities.cs" />
+    <Compile Include="src\crypto\prng\drbg\HashSP800Drbg.cs" />
+    <Compile Include="src\crypto\prng\drbg\HMacSP800Drbg.cs" />
+    <Compile Include="src\crypto\prng\drbg\ISP80090Drbg.cs" />
     <Compile Include="src\crypto\signers\DsaDigestSigner.cs" />
     <Compile Include="src\crypto\signers\DsaSigner.cs" />
     <Compile Include="src\crypto\signers\ECDsaSigner.cs" />
@@ -1155,6 +1195,9 @@
     <Compile Include="src\crypto\tls\UrlAndHash.cs" />
     <Compile Include="src\crypto\tls\UseSrtpData.cs" />
     <Compile Include="src\crypto\tls\UserMappingType.cs" />
+    <Compile Include="src\crypto\util\AlgorithmIdentifierFactory.cs" />
+    <Compile Include="src\crypto\util\CipherFactory.cs" />
+    <Compile Include="src\crypto\util\CipherKeyGeneratorFactory.cs" />
     <Compile Include="src\crypto\util\Pack.cs" />
     <Compile Include="src\math\BigInteger.cs" />
     <Compile Include="src\math\Primes.cs" />
@@ -1409,6 +1452,10 @@
     <Compile Include="src\pkcs\Pkcs12Entry.cs" />
     <Compile Include="src\pkcs\Pkcs12Store.cs" />
     <Compile Include="src\pkcs\Pkcs12Utilities.cs" />
+    <Compile Include="src\pkcs\Pkcs8EncryptedPrivateKeyInfo.cs" />
+    <Compile Include="src\pkcs\Pkcs8EncryptedPrivateKeyInfoBuilder.cs" />
+    <Compile Include="src\pkcs\PkcsException.cs" />
+    <Compile Include="src\pkcs\PkcsIOException.cs" />
     <Compile Include="src\pkcs\PrivateKeyInfoFactory.cs" />
     <Compile Include="src\pkcs\X509CertificateEntry.cs" />
     <Compile Include="src\pkix\CertStatus.cs" />
@@ -1509,6 +1556,8 @@
     <Compile Include="src\util\io\BaseInputStream.cs" />
     <Compile Include="src\util\io\BaseOutputStream.cs" />
     <Compile Include="src\util\io\FilterStream.cs" />
+    <Compile Include="src\util\io\MemoryInputStream.cs" />
+    <Compile Include="src\util\io\MemoryOutputStream.cs" />
     <Compile Include="src\util\io\NullOutputStream.cs" />
     <Compile Include="src\util\io\PushbackStream.cs" />
     <Compile Include="src\util\io\StreamOverflowException.cs" />