From 454f5e65e84d49a34d7839343b584a21b34b7cd9 Mon Sep 17 00:00:00 2001
From: Peter Dettman
Date: Tue, 21 Jun 2022 23:10:22 +0700
Subject: Cleanup old build systems
---
BouncyCastle-PCL.sln | 46 -
BouncyCastle.Mobile.sln | 38 -
FxCop/CustomDictionary.xml | 119 -
Portable.BouncyCastle.nuspec | 112 -
crypto-test/App.ico | Bin 1078 -> 0 bytes
crypto-test/CryptoTest.cs | 52 -
crypto-test/crypto-test.csproj | 104 -
crypto.tests.Net45/Properties/AssemblyInfo.cs | 36 -
crypto.tests.Net45/crypto.tests.Net45.csproj | 92 -
crypto.tests.Net45/packages.config | 5 -
crypto/BouncyCastle.Android.csproj | 1801 ---
crypto/BouncyCastle.csproj | 5 +-
crypto/BouncyCastle.iOS.csproj | 1796 ---
crypto/NBuild.build | 247 -
crypto/checklist.txt | 14 -
crypto/crypto.Net45.csproj | 54 -
crypto/crypto.csproj | 14724 -------------------
crypto/crypto.dotnet.csproj | 98 -
crypto/crypto.dotnet.project.json | 17 -
crypto/crypto.pcl.csproj | 106 -
crypto/crypto.pcl2.csproj | 92 -
crypto/src/asn1/Asn1Exception.cs | 2 +-
crypto/src/asn1/Asn1ParsingException.cs | 2 +-
crypto/src/asn1/Asn1TaggedObject.cs | 3 +-
crypto/src/asn1/DerGeneralizedTime.cs | 2 +-
crypto/src/asn1/x509/NameConstraints.cs | 2 +-
crypto/src/asn1/x509/PolicyMappings.cs | 2 +-
crypto/src/asn1/x509/X509Name.cs | 6 +-
crypto/src/bcpg/BcpgInputStream.cs | 2 +-
.../cms/CMSAttributeTableGenerationException.cs | 2 +-
crypto/src/cms/CMSException.cs | 2 +-
crypto/src/cms/CMSSignedDataGenerator.cs | 2 +-
crypto/src/cms/CMSStreamException.cs | 2 +-
crypto/src/cms/CMSTypedStream.cs | 2 +-
.../cms/DefaultSignedAttributeTableGenerator.cs | 2 +-
crypto/src/crypto/CryptoException.cs | 2 +-
crypto/src/crypto/DataLengthException.cs | 2 +-
crypto/src/crypto/InvalidCipherTextException.cs | 2 +-
crypto/src/crypto/MaxBytesExceededException.cs | 2 +-
crypto/src/crypto/OutputLengthException.cs | 2 +-
.../crypto/prng/CryptoApiEntropySourceProvider.cs | 2 +-
crypto/src/crypto/prng/CryptoApiRandomGenerator.cs | 2 +-
crypto/src/crypto/prng/ThreadedSeedGenerator.cs | 8 +-
crypto/src/math/BigInteger.cs | 2 +-
crypto/src/ocsp/OCSPException.cs | 2 +-
crypto/src/openpgp/PgpDataValidationException.cs | 2 +-
crypto/src/openpgp/PgpException.cs | 2 +-
crypto/src/openpgp/PgpKeyValidationException.cs | 2 +-
crypto/src/openssl/EncryptionException.cs | 2 +-
crypto/src/openssl/PEMException.cs | 2 +-
crypto/src/openssl/PasswordException.cs | 2 +-
crypto/src/pkix/PkixCertPathBuilderException.cs | 2 +-
crypto/src/pkix/PkixCertPathValidatorException.cs | 2 +-
.../pkix/PkixNameConstraintValidatorException.cs | 2 +-
crypto/src/security/DotNetUtilities.cs | 2 +-
crypto/src/security/GeneralSecurityException.cs | 2 +-
crypto/src/security/InvalidKeyException.cs | 2 +-
crypto/src/security/InvalidParameterException.cs | 2 +-
crypto/src/security/KeyException.cs | 2 +-
crypto/src/security/SecureRandom.cs | 2 +-
crypto/src/security/SecurityUtilityException.cs | 2 +-
crypto/src/security/SignatureException.cs | 2 +-
.../security/cert/CertificateEncodingException.cs | 2 +-
crypto/src/security/cert/CertificateException.cs | 2 +-
.../security/cert/CertificateExpiredException.cs | 2 +-
.../cert/CertificateNotYetValidException.cs | 2 +-
.../security/cert/CertificateParsingException.cs | 2 +-
crypto/src/security/cert/CrlException.cs | 2 +-
crypto/src/tls/AbstractTlsContext.cs | 11 -
crypto/src/tls/TlsUtilities.cs | 4 -
crypto/src/tsp/TSPException.cs | 2 +-
crypto/src/tsp/TSPValidationException.cs | 2 +-
crypto/src/util/Enums.cs | 25 +-
crypto/src/util/Platform.cs | 33 +-
crypto/src/util/Strings.cs | 6 +-
crypto/src/util/io/StreamOverflowException.cs | 2 +-
crypto/src/util/io/pem/PemGenerationException.cs | 2 +-
crypto/src/x509/store/IX509Selector.cs | 4 +-
crypto/src/x509/store/NoSuchStoreException.cs | 2 +-
crypto/src/x509/store/X509StoreException.cs | 2 +-
crypto/test/src/asn1/test/ASN1IntegerTest.cs | 4 +-
crypto/test/src/asn1/test/MiscTest.cs | 2 +-
crypto/test/src/crypto/test/SP80038GTest.cs | 2 +-
crypto/test/src/security/test/SecureRandomTest.cs | 4 +-
crypto/test/src/security/test/TestDotNetUtil.cs | 2 +-
crypto/test/src/test/SP80038GTest.cs | 4 +-
crypto/test/src/util/test/SimpleTest.cs | 18 -
crypto/test/src/util/test/TestFailedException.cs | 2 +-
crypto/testcfg.nunit | 6 -
csharp.sln | 29 -
90 files changed, 75 insertions(+), 19756 deletions(-)
delete mode 100644 BouncyCastle-PCL.sln
delete mode 100644 BouncyCastle.Mobile.sln
delete mode 100644 FxCop/CustomDictionary.xml
delete mode 100644 Portable.BouncyCastle.nuspec
delete mode 100644 crypto-test/App.ico
delete mode 100644 crypto-test/CryptoTest.cs
delete mode 100644 crypto-test/crypto-test.csproj
delete mode 100644 crypto.tests.Net45/Properties/AssemblyInfo.cs
delete mode 100644 crypto.tests.Net45/crypto.tests.Net45.csproj
delete mode 100644 crypto.tests.Net45/packages.config
delete mode 100644 crypto/BouncyCastle.Android.csproj
delete mode 100644 crypto/BouncyCastle.iOS.csproj
delete mode 100644 crypto/NBuild.build
delete mode 100644 crypto/checklist.txt
delete mode 100644 crypto/crypto.Net45.csproj
delete mode 100644 crypto/crypto.csproj
delete mode 100644 crypto/crypto.dotnet.csproj
delete mode 100644 crypto/crypto.dotnet.project.json
delete mode 100644 crypto/crypto.pcl.csproj
delete mode 100644 crypto/crypto.pcl2.csproj
delete mode 100644 crypto/testcfg.nunit
delete mode 100644 csharp.sln
diff --git a/BouncyCastle-PCL.sln b/BouncyCastle-PCL.sln
deleted file mode 100644
index afd9396fa..000000000
--- a/BouncyCastle-PCL.sln
+++ /dev/null
@@ -1,46 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 12.00
-# Visual Studio 14
-VisualStudioVersion = 14.0.24606.1
-MinimumVisualStudioVersion = 10.0.40219.1
-Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{43196EF9-B75F-4ABB-8967-DAFD621A7D05}"
- ProjectSection(SolutionItems) = preProject
- Portable.BouncyCastle.nuspec = Portable.BouncyCastle.nuspec
- README.md = README.md
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto.pcl", "Crypto\crypto.pcl.csproj", "{38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto.tests.Net45", "crypto.tests.Net45\crypto.tests.Net45.csproj", "{45473847-8AF8-4BAF-B768-442C6875B8CE}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto.pcl2", "crypto\crypto.pcl2.csproj", "{38872A5F-E87E-4FAD-B109-8EB7B2E6A4A1}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto.dotnet", "crypto\crypto.dotnet.csproj", "{38872A5F-E87E-4FAD-B109-8EB7B2E6A4A2}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Release|Any CPU.Build.0 = Release|Any CPU
- {45473847-8AF8-4BAF-B768-442C6875B8CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {45473847-8AF8-4BAF-B768-442C6875B8CE}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {45473847-8AF8-4BAF-B768-442C6875B8CE}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {45473847-8AF8-4BAF-B768-442C6875B8CE}.Release|Any CPU.Build.0 = Release|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A1}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A1}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A1}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A1}.Release|Any CPU.Build.0 = Release|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A2}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A2}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A2}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A2}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(SolutionProperties) = preSolution
- HideSolutionNode = FALSE
- EndGlobalSection
-EndGlobal
diff --git a/BouncyCastle.Mobile.sln b/BouncyCastle.Mobile.sln
deleted file mode 100644
index 0b41d742d..000000000
--- a/BouncyCastle.Mobile.sln
+++ /dev/null
@@ -1,38 +0,0 @@
-
-Microsoft Visual Studio Solution File, Format Version 11.00
-# Visual Studio 2010
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BouncyCastle", "crypto\BouncyCastle.csproj", "{4C235092-820C-4DEB-9074-D356FB797D8B}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BouncyCastle.iOS", "crypto\BouncyCastle.iOS.csproj", "{0249241C-205E-4AC0-828B-90F822359B9E}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "BouncyCastle.Android", "crypto\BouncyCastle.Android.csproj", "{A0D302CB-8866-4AB1-98B9-F0772EABF5DF}"
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "UnitTests", "crypto\test\UnitTests.csproj", "{D4EB669D-7C88-48C0-A480-C5CC73A7369B}"
-EndProject
-Global
- GlobalSection(SolutionConfigurationPlatforms) = preSolution
- Debug|Any CPU = Debug|Any CPU
- Release|Any CPU = Release|Any CPU
- EndGlobalSection
- GlobalSection(ProjectConfigurationPlatforms) = postSolution
- {0249241C-205E-4AC0-828B-90F822359B9E}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {0249241C-205E-4AC0-828B-90F822359B9E}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {0249241C-205E-4AC0-828B-90F822359B9E}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {0249241C-205E-4AC0-828B-90F822359B9E}.Release|Any CPU.Build.0 = Release|Any CPU
- {4C235092-820C-4DEB-9074-D356FB797D8B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {4C235092-820C-4DEB-9074-D356FB797D8B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {4C235092-820C-4DEB-9074-D356FB797D8B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {4C235092-820C-4DEB-9074-D356FB797D8B}.Release|Any CPU.Build.0 = Release|Any CPU
- {A0D302CB-8866-4AB1-98B9-F0772EABF5DF}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {A0D302CB-8866-4AB1-98B9-F0772EABF5DF}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {A0D302CB-8866-4AB1-98B9-F0772EABF5DF}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {A0D302CB-8866-4AB1-98B9-F0772EABF5DF}.Release|Any CPU.Build.0 = Release|Any CPU
- {D4EB669D-7C88-48C0-A480-C5CC73A7369B}.Debug|Any CPU.ActiveCfg = Debug|Any CPU
- {D4EB669D-7C88-48C0-A480-C5CC73A7369B}.Debug|Any CPU.Build.0 = Debug|Any CPU
- {D4EB669D-7C88-48C0-A480-C5CC73A7369B}.Release|Any CPU.ActiveCfg = Release|Any CPU
- {D4EB669D-7C88-48C0-A480-C5CC73A7369B}.Release|Any CPU.Build.0 = Release|Any CPU
- EndGlobalSection
- GlobalSection(MonoDevelopProperties) = preSolution
- StartupItem = crypto\BouncyCastle.csproj
- EndGlobalSection
-EndGlobal
diff --git a/FxCop/CustomDictionary.xml b/FxCop/CustomDictionary.xml
deleted file mode 100644
index 7f9080348..000000000
--- a/FxCop/CustomDictionary.xml
+++ /dev/null
@@ -1,119 +0,0 @@
-
-
-
-
- Pgp
- Pbe
- Rsa
- Dsa
- Gamal
- Aes
- a
- b
- x
- X
- C
- y
- k
- Y
- p
- q
- P
- n
- m
- e
- g
- d
- r
- s
- t
- v
- str
- tokenizer
- oid
- Bcpg
- Sqrt
- Pkcs
- Asn1
- Ber
- Der
- priv
- Videotex
- Subpacket
- Subpackets
- unhashed
- Twofish
- Paddings
- dP
- dQ
- Tbc
- Tpb
- Gnb
- Kdf
- Diffie
- Hellman
- Ede
- Cbc
- Cfb
- Cts
- Ofb
- Sha
- Oaep
- ies
- mgf
- Naccache
- ccm
- gcd
- Alg
- Oids
- Params
- Pkix
- Pki
- Etsi
- Trus
- Nist
- Ecb
- Cbc
- Cfb
- Ofb
- Smime
- Unotice
- Cps
- Tbs
- spki
- Crl
- Oiw
- Icao
- Esf
- Cmp
- Pka
- Crc
- Infos
- Ori
- o
- datagroup
- gost
- param
- req
- resp
- tsa
- tst
-
-
-
-
- El
- ECDH
- ECDHC
- ECNR
- Fp
- F2m
- sBox
- cL
- Gn
- Pp
- Tp
- Qt
-
-
-
\ No newline at end of file
diff --git a/Portable.BouncyCastle.nuspec b/Portable.BouncyCastle.nuspec
deleted file mode 100644
index ece85f9d1..000000000
--- a/Portable.BouncyCastle.nuspec
+++ /dev/null
@@ -1,112 +0,0 @@
-
-
-
- Portable.BouncyCastle
- 1.8.0-rc3
- Bouncy Castle PCL
- Oren Novotny
- onovotny
- https://github.com/onovotny/BouncyCastle-PCL
- false
- BouncyCastle.Crypto is a cryptography API providing:
- -Generation and parsing of PKCS#12 files.
- -X.509: Generators and parsers for V1 and V3 certificates, V2 CRLs and attribute certificates.
- -PBE algorithms supported by PBEUtil: PBEwithMD2andDES-CBC, PBEwithMD2andRC2-CBC, PBEwithMD5andDES-CBC, PBEwithMD5andRC2-CBC, PBEwithSHA1andDES-CBC, PBEwithSHA1andRC2-CBC, PBEwithSHA-1and128bitRC4, PBEwithSHA-1and40bitRC4, PBEwithSHA-1and3-keyDESEDE-CBC, PBEwithSHA-1and2-keyDESEDE-CBC, PBEwithSHA-1and128bitRC2-CBC, PBEwithSHA-1and40bitRC2-CBC, PBEwithHmacSHA-1, PBEwithHmacSHA-224, PBEwithHmacSHA-256, PBEwithHmacRIPEMD128, PBEwithHmacRIPEMD160, and PBEwithHmacRIPEMD256.
- -Signature algorithms supported by SignerUtilities: MD2withRSA, MD4withRSA, MD5withRSA, RIPEMD128withRSA, RIPEMD160withRSA, RIPEMD256withRSA, SHA-1withRSA, SHA-224withRSA, SHA-256withRSAandMGF1, SHA-384withRSAandMGF1, SHA-512withRSAandMGF1, SHA-1withDSA, and SHA-1withECDSA.
- -Symmetric key algorithms: AES, Blowfish, Camellia, CAST5, CAST6, DESede, DES, GOST28147, HC-128, HC-256, IDEA, NaccacheStern, RC2, RC4, RC5-32, RC5-64, RC6, Rijndael, Serpent, Skipjack, TEA/XTEA, Twofish, and VMPC.
- -Symmetric key modes: CBC, CFB, CTS, GOFB, OFB, OpenPGPCFB, and SIC (or CTR).
- -Symmetric key paddings: ISO10126d2, ISO7816d4, PKCS#5/7, TBC, X.923, and Zero Byte.
- -Asymmetric key algorithms: RSA (with blinding), ElGamal, DSA, ECDSA.
- -Asymmetric key paddings/encodings: ISO9796d1, OAEP, and PKCS#1.
- -Digests: GOST3411, MD2, MD4, MD5, RIPEMD128, RIPEMD160, RIPEMD256, RIPEMD320, SHA-1, SHA-224, SHA-256, SHA-384, SHA-512, Tiger, and Whirlpool.
- -Signer mechanisms: DSA, ECDSA, ECGOST3410, GOST3410, ISO9796d2, PSS, RSA.
- -Key Agreement: Diffie-Hellman and EC-DH.
- -Macs: CBCBlockCipher, CFBBlockCipher, GOST28147, HMac, and ISO9797 Alg. 3.
- -PBE generators: PKCS#12, and PKCS#5 - schemes 1 and 2.
- -OpenPGP (RFC 2440)
- -Cryptographic Message Syntax (CMS, RFC 3852), including streaming API.
- -Online Certificate Status Protocol (OCSP, RFC 2560).
- -Time Stamp Protocol (TSP, RFC 3161).
- -TLS/SSL Client with support for client side authentication.
-
- Support for .NET 4, Windows Phone 8, Windows Phone App 8.1, Windows 8, MonoTouch, MonoAndroid, Xamarin.iOS, Core CLR
-
- en-US
- bouncycastle, cryptography, encryption, security, PCL, wp8, wpa81, coreclr, dotnet, dnx, uwp, sl5, monotouch, monoandroid, xamarin, xamarin.ios
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto-test/App.ico b/crypto-test/App.ico
deleted file mode 100644
index 3a5525fd7..000000000
Binary files a/crypto-test/App.ico and /dev/null differ
diff --git a/crypto-test/CryptoTest.cs b/crypto-test/CryptoTest.cs
deleted file mode 100644
index 5a411b482..000000000
--- a/crypto-test/CryptoTest.cs
+++ /dev/null
@@ -1,52 +0,0 @@
-using System;
-
-namespace crypto_test
-{
- public class CryptoTest
- {
- ///
- /// The main entry point for the application.
- ///
- [STAThread]
- static void Main(string[] args)
- {
- DateTime before = DateTime.Now;
-
- try
- {
- Org.BouncyCastle.Asn1.Tests.RegressionTest.Main(args);
- //Org.BouncyCastle.Bcpg.OpenPgp.Tests.Dsa2Test.?
- Org.BouncyCastle.Bcpg.OpenPgp.Tests.RegressionTest.Main(args);
- Org.BouncyCastle.Bcpg.OpenPgp.Examples.Tests.AllTests.Main(args);
- Org.BouncyCastle.Cms.Tests.AllTests.Main(args);
- Org.BouncyCastle.Crypto.Agreement.Tests.AllTests.Main(args);
- Org.BouncyCastle.Crypto.Tests.RegressionTest.Main(args);
- Org.BouncyCastle.Crypto.IO.Tests.AllTests.Main(args);
- Org.BouncyCastle.Math.Tests.AllTests.Main(args);
- Org.BouncyCastle.Math.EC.Tests.AllTests.Main(args);
- Org.BouncyCastle.Ocsp.Tests.AllTests.Main(args);
- //Org.BouncyCastle.Pkcs.Tests.?
- Org.BouncyCastle.Pkcs.Tests.EncryptedPrivateKeyInfoTest.Main(args);
- Org.BouncyCastle.Pkcs.Tests.Pkcs10Test.Main(args);
- Org.BouncyCastle.Pkcs.Tests.Pkcs12StoreTest.Main(args);
- //Org.BouncyCastle.OpenSsl.Tests.?
- Org.BouncyCastle.OpenSsl.Tests.ReaderTest.Main(args);
- Org.BouncyCastle.OpenSsl.Tests.WriterTest.Main(args);
- //Org.BouncyCastle.Security.Tests.?
- Org.BouncyCastle.Tests.RegressionTest.Main(args);
- Org.BouncyCastle.Tsp.Tests.AllTests.Main(args);
- //Org.BouncyCastle.X509.Tests.?
- }
- catch (Exception e)
- {
- Console.WriteLine("Tests failed with exception: " + e.Message);
- Console.WriteLine(e.StackTrace);
- }
-
- DateTime after = DateTime.Now;
- long elapsedTicks = after.Ticks - before.Ticks;
-
- Console.WriteLine("Done in {0}ms.", elapsedTicks / TimeSpan.TicksPerMillisecond);
- }
- }
-}
diff --git a/crypto-test/crypto-test.csproj b/crypto-test/crypto-test.csproj
deleted file mode 100644
index 9bb4cdbb9..000000000
--- a/crypto-test/crypto-test.csproj
+++ /dev/null
@@ -1,104 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/crypto.tests.Net45/Properties/AssemblyInfo.cs b/crypto.tests.Net45/Properties/AssemblyInfo.cs
deleted file mode 100644
index 52472faf8..000000000
--- a/crypto.tests.Net45/Properties/AssemblyInfo.cs
+++ /dev/null
@@ -1,36 +0,0 @@
-using System.Reflection;
-using System.Runtime.CompilerServices;
-using System.Runtime.InteropServices;
-
-// General Information about an assembly is controlled through the following
-// set of attributes. Change these attribute values to modify the information
-// associated with an assembly.
-[assembly: AssemblyTitle("crypto.tests.Net45")]
-[assembly: AssemblyDescription("")]
-[assembly: AssemblyConfiguration("")]
-[assembly: AssemblyCompany("")]
-[assembly: AssemblyProduct("crypto.tests.Net45")]
-[assembly: AssemblyCopyright("Copyright © 2014")]
-[assembly: AssemblyTrademark("")]
-[assembly: AssemblyCulture("")]
-
-// Setting ComVisible to false makes the types in this assembly not visible
-// to COM components. If you need to access a type in this assembly from
-// COM, set the ComVisible attribute to true on that type.
-[assembly: ComVisible(false)]
-
-// The following GUID is for the ID of the typelib if this project is exposed to COM
-[assembly: Guid("22ae3209-5ce9-448c-9212-04b9e8f6361e")]
-
-// Version information for an assembly consists of the following four values:
-//
-// Major Version
-// Minor Version
-// Build Number
-// Revision
-//
-// You can specify all the values or you can default the Build and Revision Numbers
-// by using the '*' as shown below:
-// [assembly: AssemblyVersion("1.0.*")]
-[assembly: AssemblyVersion("1.0.0.0")]
-[assembly: AssemblyFileVersion("1.0.0.0")]
diff --git a/crypto.tests.Net45/crypto.tests.Net45.csproj b/crypto.tests.Net45/crypto.tests.Net45.csproj
deleted file mode 100644
index 729043d39..000000000
--- a/crypto.tests.Net45/crypto.tests.Net45.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {45473847-8AF8-4BAF-B768-442C6875B8CE}
- Library
- Properties
- crypto.tests
- crypto.tests.Net45
- v4.5
- 512
-
-
- true
- full
- false
- bin\Debug\
- TRACE;DEBUG;LIB;PORTABLE;NEW_REFLECTION
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE;LIB;PORTABLE
- prompt
- 4
-
-
-
- ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.dll
- False
-
-
- ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.core.interfaces.dll
- False
-
-
- ..\packages\NUnit.2.6.4\lib\nunit.framework.dll
- True
-
-
- ..\packages\NUnitTestAdapter.2.0.0\lib\nunit.util.dll
- False
-
-
- ..\packages\NUnitTestAdapter.2.0.0\lib\NUnit.VisualStudio.TestAdapter.dll
- False
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- %(RecursiveDir)%(Filename)%(Extension)
-
-
- %(RecursiveDir)%(Filename)%(Extension)
-
-
-
-
- {38872a5f-e87e-4fad-b109-8eb7b2e6a4a0}
- crypto.pcl
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto.tests.Net45/packages.config b/crypto.tests.Net45/packages.config
deleted file mode 100644
index 1f8800b2c..000000000
--- a/crypto.tests.Net45/packages.config
+++ /dev/null
@@ -1,5 +0,0 @@
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto/BouncyCastle.Android.csproj b/crypto/BouncyCastle.Android.csproj
deleted file mode 100644
index 28150ee85..000000000
--- a/crypto/BouncyCastle.Android.csproj
+++ /dev/null
@@ -1,1801 +0,0 @@
-
-
-
- Debug
- AnyCPU
- AnyCPU
- 8.0.30703
- 2.0
- {A0D302CB-8866-4AB1-98B9-F0772EABF5DF}
- {EFBA0AD7-5A72-4C68-AF49-83D382785DCF};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Library
- Org.BouncyCastle
- Resources
- Assets
- False
- BouncyCastle
- v4.4
-
-
- true
- full
- false
- bin\Debug\lib\MonoAndroid
- obj\Debug\lib\MonoAndroid
- DEBUG;TRACE;INCLUDE_IDEA;__MOBILE__;__ANDROID__;
- prompt
- 4
- None
- false
-
-
- full
- true
- bin\Release\lib\MonoAndroid
- obj\Release\lib\MonoAndroid
- TRACE;INCLUDE_IDEA;__MOBILE__;__ANDROID__;
- prompt
- 4
- false
- false
-
-
- true
-
-
- ..\BouncyCastle.snk
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto/BouncyCastle.csproj b/crypto/BouncyCastle.csproj
index ae6996a96..609de04de 100644
--- a/crypto/BouncyCastle.csproj
+++ b/crypto/BouncyCastle.csproj
@@ -18,7 +18,7 @@
false
bin\Debug\lib\net20\
obj\Debug\lib\net20\
- DEBUG;TRACE;INCLUDE_IDEA;
+ DEBUG;TRACE
prompt
4
false
@@ -27,7 +27,7 @@
true
bin\Release\lib\net20\
obj\Release\lib\net20\
- TRACE;INCLUDE_IDEA;
+ TRACE
doc\BouncyCastle.xml
prompt
4
@@ -1789,7 +1789,6 @@
-
\ No newline at end of file
diff --git a/crypto/BouncyCastle.iOS.csproj b/crypto/BouncyCastle.iOS.csproj
deleted file mode 100644
index 2ccc627f4..000000000
--- a/crypto/BouncyCastle.iOS.csproj
+++ /dev/null
@@ -1,1796 +0,0 @@
-
-
-
- Debug
- AnyCPU
- AnyCPU
- 8.0.30703
- 2.0
- {0249241C-205E-4AC0-828B-90F822359B9E}
- {FEACFBD2-3405-455C-9665-78FE426C6842};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Library
- Org.BouncyCastle
- Resources
- BouncyCastle
- Xamarin.iOS
-
-
- true
- full
- false
- bin\Debug\lib\Xamarin.iOS
- obj\Debug\lib\Xamarin.iOS
- DEBUG;TRACE;INCLUDE_IDEA;__MOBILE__;__IOS__;
- prompt
- 4
- false
-
-
- true
- bin\Release\lib\Xamarin.iOS
- obj\Release\lib\Xamarin.iOS
- TRACE;INCLUDE_IDEA;__MOBILE__;__IOS__;
- prompt
- 4
- false
-
-
- true
-
-
- ..\BouncyCastle.snk
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/crypto/NBuild.build b/crypto/NBuild.build
deleted file mode 100644
index 557ad362e..000000000
--- a/crypto/NBuild.build
+++ /dev/null
@@ -1,247 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
- Compile targets will be signed using keyfile ../BouncyCastle.snk
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/crypto/checklist.txt b/crypto/checklist.txt
deleted file mode 100644
index d81cf5ffb..000000000
--- a/crypto/checklist.txt
+++ /dev/null
@@ -1,14 +0,0 @@
------------------
-Release Checklist
------------------
-
-- Update to latest from git
-- Run 'nant -t:net-1.1 clean test'
-- Edit AssemblyInfo.cs: Change version and check copyright
-- Edit NBuild.build: Change version
-- Edit License.html: Check copyright
-- Edit Readme.html: Add release notes
-- Commit changes to git
-- Tag git repository with "release-${version}"
-- Push changes/tag to git
-- Run 'nant -t:net-1.1 clean dist'
diff --git a/crypto/crypto.Net45.csproj b/crypto/crypto.Net45.csproj
deleted file mode 100644
index 14b3581f5..000000000
--- a/crypto/crypto.Net45.csproj
+++ /dev/null
@@ -1,54 +0,0 @@
-
-
-
-
- Debug
- AnyCPU
- {45473847-8AF8-4BAF-B768-442C6875B8CF}
- Library
- Properties
- crypto
- crypto
- v2.0
- 512
-
-
-
- true
- full
- false
- bin\Debug\
- TRACE;DEBUG;LIB;PCL;SILVERLIGHT
- prompt
- 4
-
-
- pdbonly
- true
- bin\Release\
- TRACE;LIB;PCL;SILVERLIGHT
- prompt
- 4
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto/crypto.csproj b/crypto/crypto.csproj
deleted file mode 100644
index 3fd0a5bda..000000000
--- a/crypto/crypto.csproj
+++ /dev/null
@@ -1,14724 +0,0 @@
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
-
diff --git a/crypto/crypto.dotnet.csproj b/crypto/crypto.dotnet.csproj
deleted file mode 100644
index d9ae0db87..000000000
--- a/crypto/crypto.dotnet.csproj
+++ /dev/null
@@ -1,98 +0,0 @@
-
-
-
- Local
- 7.10.3077
- 2.0
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A2}
- Debug
- AnyCPU
-
-
- crypto
- ..\BouncyCastle.snk
- JScript
- Grid
- IE50
- false
- Library
- crypto
- OnBuildSuccess
-
- v5.0
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
-
-
- 14.0
-
-
-
-
- bin\dotnet\Debug\
- obj\dotnet\Debug\
- false
- 285212672
- false
-
- TRACE;DEBUG;PORTABLE;NO_THREADS;NEW_REFLECTION;SYS_RUNTIME;DOTNET
- doc\dotnet\crypto.xml
- true
- 4096
- false
- 1591
- false
- false
- false
- false
- 4
- full
- prompt
-
-
- bin\dotnet\Release\
- obj\dotnet\Release\
- false
- 285212672
- false
-
- TRACE;PORTABLE;NO_THREADS;NEW_REFLECTION;SYS_RUNTIME;DOTNET
- doc\dotnet\crypto.xml
- true
- 4096
- false
- 1591
- true
- false
- false
- false
- 4
- pdbonly
- prompt
-
-
- true
-
-
-
-
-
-
-
- dotnet;uap10.0;net46
-
-
-
- BouncyCastle.snk
-
-
-
-
-
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto/crypto.dotnet.project.json b/crypto/crypto.dotnet.project.json
deleted file mode 100644
index e80002612..000000000
--- a/crypto/crypto.dotnet.project.json
+++ /dev/null
@@ -1,17 +0,0 @@
-{
- "supports": {
- "net46.app": {},
- "uwp.10.0.app": {},
- "dnxcore50.app": {}
- },
- "dependencies": {
- "Microsoft.NETCore": "5.0.0",
- "Microsoft.NETCore.Portable.Compatibility": "1.0.0",
- "NuSpec.ReferenceGenerator": "1.3.4"
- },
- "frameworks": {
- "dotnet": {
- "imports": "portable-net452+win81"
- }
- }
-}
\ No newline at end of file
diff --git a/crypto/crypto.pcl.csproj b/crypto/crypto.pcl.csproj
deleted file mode 100644
index 1c3735177..000000000
--- a/crypto/crypto.pcl.csproj
+++ /dev/null
@@ -1,106 +0,0 @@
-
-
-
- Local
- 7.10.3077
- 2.0
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}
- Debug
- AnyCPU
-
-
- crypto
- ..\BouncyCastle.snk
- JScript
- Grid
- IE50
- false
- Library
- crypto
- OnBuildSuccess
-
-
-
- v4.0
-
-
- 12.0
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile328
- false
- 10.0
- publish\
- true
- Disk
- false
- Foreground
- 7
- Days
- false
- false
- true
- 0
- 1.0.0.%2a
- false
- true
-
-
- bin\pcl\Debug\
- obj\pcl\Debug\
- false
- 285212672
- false
-
- TRACE;DEBUG;PORTABLE;NO_THREADS
- doc\pcl\crypto.xml
- true
- 4096
- false
- 1591
- false
- false
- false
- false
- 4
- full
- prompt
-
-
- bin\pcl\Release\
- obj\pcl\Release\
- false
- 285212672
- false
-
- TRACE;PORTABLE;NO_THREADS
- doc\pcl\crypto.xml
- true
- 4096
- false
- 1591
- true
- false
- false
- false
- 4
- pdbonly
- prompt
-
-
- true
-
-
-
-
-
-
-
- BouncyCastle.snk
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto/crypto.pcl2.csproj b/crypto/crypto.pcl2.csproj
deleted file mode 100644
index 4edf1139e..000000000
--- a/crypto/crypto.pcl2.csproj
+++ /dev/null
@@ -1,92 +0,0 @@
-
-
-
- Local
- 7.10.3077
- 2.0
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A1}
- Debug
- AnyCPU
-
-
- crypto
- ..\BouncyCastle.snk
- JScript
- Grid
- IE50
- false
- Library
- crypto
- OnBuildSuccess
-
- v4.5
- {786C830F-07A1-408B-BD7F-6EE04809D6DB};{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}
- Profile259
- 10.0
-
-
-
-
- bin\pcl2\Debug\
- obj\pcl2\Debug\
- false
- 285212672
- false
-
- TRACE;DEBUG;PORTABLE;NO_THREADS;NEW_REFLECTION;SYS_RUNTIME
- doc\pcl2\crypto.xml
- true
- 4096
- false
- 1591
- false
- false
- false
- false
- 4
- full
- prompt
-
-
- bin\pcl2\Release\
- obj\pcl2\Release\
- false
- 285212672
- false
-
- TRACE;PORTABLE;NO_THREADS;NEW_REFLECTION;SYS_RUNTIME
- doc\pcl2\crypto.xml
- true
- 4096
- false
- 1591
- true
- false
- false
- false
- 4
- pdbonly
- prompt
-
-
- true
-
-
-
-
-
-
-
-
-
-
-
- BouncyCastle.snk
-
-
-
-
-
-
-
-
\ No newline at end of file
diff --git a/crypto/src/asn1/Asn1Exception.cs b/crypto/src/asn1/Asn1Exception.cs
index 1dfe1732c..9e4afb49f 100644
--- a/crypto/src/asn1/Asn1Exception.cs
+++ b/crypto/src/asn1/Asn1Exception.cs
@@ -3,7 +3,7 @@ using System.IO;
namespace Org.BouncyCastle.Asn1
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class Asn1Exception
diff --git a/crypto/src/asn1/Asn1ParsingException.cs b/crypto/src/asn1/Asn1ParsingException.cs
index 84cdb780d..294e4c2c9 100644
--- a/crypto/src/asn1/Asn1ParsingException.cs
+++ b/crypto/src/asn1/Asn1ParsingException.cs
@@ -2,7 +2,7 @@ using System;
namespace Org.BouncyCastle.Asn1
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class Asn1ParsingException
diff --git a/crypto/src/asn1/Asn1TaggedObject.cs b/crypto/src/asn1/Asn1TaggedObject.cs
index 8882cdcb7..f2eca9ad8 100644
--- a/crypto/src/asn1/Asn1TaggedObject.cs
+++ b/crypto/src/asn1/Asn1TaggedObject.cs
@@ -379,8 +379,7 @@ namespace Org.BouncyCastle.Asn1
internal static Asn1Object CreatePrimitive(int tagClass, int tagNo, byte[] contentsOctets)
{
// Note: !CONSTRUCTED => IMPLICIT
- return new DLTaggedObject(ParsedImplicit, tagClass, tagNo,
- new DerOctetString(contentsOctets));
+ return new DLTaggedObject(ParsedImplicit, tagClass, tagNo, new DerOctetString(contentsOctets));
}
private static Asn1TaggedObject CheckedCast(Asn1Object asn1Object)
diff --git a/crypto/src/asn1/DerGeneralizedTime.cs b/crypto/src/asn1/DerGeneralizedTime.cs
index ed2cb5e62..1efa792df 100644
--- a/crypto/src/asn1/DerGeneralizedTime.cs
+++ b/crypto/src/asn1/DerGeneralizedTime.cs
@@ -181,7 +181,7 @@ namespace Org.BouncyCastle.Asn1
char sign = '+';
DateTime time = ToDateTime();
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
long offset = time.Ticks - time.ToUniversalTime().Ticks;
if (offset < 0)
{
diff --git a/crypto/src/asn1/x509/NameConstraints.cs b/crypto/src/asn1/x509/NameConstraints.cs
index b8cc7c0ab..40178c126 100644
--- a/crypto/src/asn1/x509/NameConstraints.cs
+++ b/crypto/src/asn1/x509/NameConstraints.cs
@@ -43,7 +43,7 @@ namespace Org.BouncyCastle.Asn1.X509
}
}
-#if !(SILVERLIGHT || PORTABLE)
+#if !PORTABLE
public NameConstraints(
ArrayList permitted,
ArrayList excluded)
diff --git a/crypto/src/asn1/x509/PolicyMappings.cs b/crypto/src/asn1/x509/PolicyMappings.cs
index 928ad134d..8c9f97814 100644
--- a/crypto/src/asn1/x509/PolicyMappings.cs
+++ b/crypto/src/asn1/x509/PolicyMappings.cs
@@ -29,7 +29,7 @@ namespace Org.BouncyCastle.Asn1.X509
this.seq = seq;
}
-#if !(SILVERLIGHT || PORTABLE)
+#if !PORTABLE
public PolicyMappings(
Hashtable mappings)
: this((IDictionary)mappings)
diff --git a/crypto/src/asn1/x509/X509Name.cs b/crypto/src/asn1/x509/X509Name.cs
index bd8f9fb3e..33c395712 100644
--- a/crypto/src/asn1/x509/X509Name.cs
+++ b/crypto/src/asn1/x509/X509Name.cs
@@ -3,7 +3,7 @@ using System.Collections;
using System.IO;
using System.Text;
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
using System.Collections.Generic;
#endif
@@ -208,7 +208,7 @@ namespace Org.BouncyCastle.Asn1.X509
private static readonly bool[] defaultReverse = { false };
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
/**
* default look up table translating OID values into their common symbols following
* the convention in RFC 2253 with a few extras
@@ -1024,7 +1024,7 @@ namespace Org.BouncyCastle.Asn1.X509
bool reverse,
IDictionary oidSymbols)
{
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
List
*/
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class TspValidationException
diff --git a/crypto/src/util/Enums.cs b/crypto/src/util/Enums.cs
index 9e908c4c0..c369511d4 100644
--- a/crypto/src/util/Enums.cs
+++ b/crypto/src/util/Enums.cs
@@ -1,7 +1,6 @@
using System;
-using System.Text;
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE
+#if PORTABLE
using System.Collections;
using System.Reflection;
#endif
@@ -23,15 +22,7 @@ namespace Org.BouncyCastle.Utilities
s = s.Replace('-', '_');
s = s.Replace('/', '_');
-#if NETCF_1_0
- FieldInfo field = enumType.GetField(s, BindingFlags.Static | BindingFlags.Public);
- if (field != null)
- {
- return (Enum)field.GetValue(null);
- }
-#else
return (Enum)Enum.Parse(enumType, s, false);
-#endif
}
throw new ArgumentException();
@@ -42,21 +33,7 @@ namespace Org.BouncyCastle.Utilities
if (!IsEnumType(enumType))
throw new ArgumentException("Not an enumeration type", "enumType");
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT
- IList result = Platform.CreateArrayList();
- FieldInfo[] fields = enumType.GetFields(BindingFlags.Static | BindingFlags.Public);
- foreach (FieldInfo field in fields)
- {
- // Note: Argument to GetValue() ignored since the fields are static,
- // but Silverlight for Windows Phone throws exception if we pass null
- result.Add(field.GetValue(enumType));
- }
- object[] arr = new object[result.Count];
- result.CopyTo(arr, 0);
- return arr;
-#else
return Enum.GetValues(enumType);
-#endif
}
internal static Enum GetArbitraryValue(System.Type enumType)
diff --git a/crypto/src/util/Platform.cs b/crypto/src/util/Platform.cs
index 547cef3fa..b0cd5dcb7 100644
--- a/crypto/src/util/Platform.cs
+++ b/crypto/src/util/Platform.cs
@@ -3,7 +3,7 @@ using System.Globalization;
using System.IO;
using System.Text;
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
using System.Collections.Generic;
#else
using System.Collections;
@@ -15,22 +15,10 @@ namespace Org.BouncyCastle.Utilities
{
private static readonly CompareInfo InvariantCompareInfo = CultureInfo.InvariantCulture.CompareInfo;
-#if NETCF_1_0 || NETCF_2_0
- private static string GetNewLine()
- {
- MemoryStream buf = new MemoryStream();
- StreamWriter w = new StreamWriter(buf, Encoding.UTF8);
- w.WriteLine();
- Dispose(w);
- byte[] bs = buf.ToArray();
- return Encoding.UTF8.GetString(bs, 0, bs.Length);
- }
-#else
private static string GetNewLine()
{
return Environment.NewLine;
}
-#endif
internal static bool EqualsIgnoreCase(string a, string b)
{
@@ -41,7 +29,7 @@ namespace Org.BouncyCastle.Utilities
#endif
}
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET)
+#if PORTABLE && !DOTNET
internal static string GetEnvironmentVariable(
string variable)
{
@@ -64,28 +52,13 @@ namespace Org.BouncyCastle.Utilities
}
#endif
-#if NETCF_1_0
- internal static Exception CreateNotImplementedException(
- string message)
- {
- return new Exception("Not implemented: " + message);
- }
-
- internal static bool Equals(
- object a,
- object b)
- {
- return a == b || (a != null && b != null && a.Equals(b));
- }
-#else
internal static Exception CreateNotImplementedException(
string message)
{
return new NotImplementedException(message);
}
-#endif
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
internal static System.Collections.IList CreateArrayList()
{
return new List();
diff --git a/crypto/src/util/Strings.cs b/crypto/src/util/Strings.cs
index 73a15ea73..83d1f13fb 100644
--- a/crypto/src/util/Strings.cs
+++ b/crypto/src/util/Strings.cs
@@ -77,7 +77,7 @@ namespace Org.BouncyCastle.Utilities
public static string FromAsciiByteArray(
byte[] bytes)
{
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
// TODO Check for non-ASCII bytes in input?
return Encoding.UTF8.GetString(bytes, 0, bytes.Length);
#else
@@ -88,7 +88,7 @@ namespace Org.BouncyCastle.Utilities
public static byte[] ToAsciiByteArray(
char[] cs)
{
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
// TODO Check for non-ASCII characters in input?
return Encoding.UTF8.GetBytes(cs);
#else
@@ -99,7 +99,7 @@ namespace Org.BouncyCastle.Utilities
public static byte[] ToAsciiByteArray(
string s)
{
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
// TODO Check for non-ASCII characters in input?
return Encoding.UTF8.GetBytes(s);
#else
diff --git a/crypto/src/util/io/StreamOverflowException.cs b/crypto/src/util/io/StreamOverflowException.cs
index 36d21e23e..7e100e7b5 100644
--- a/crypto/src/util/io/StreamOverflowException.cs
+++ b/crypto/src/util/io/StreamOverflowException.cs
@@ -3,7 +3,7 @@ using System.IO;
namespace Org.BouncyCastle.Utilities.IO
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class StreamOverflowException
diff --git a/crypto/src/util/io/pem/PemGenerationException.cs b/crypto/src/util/io/pem/PemGenerationException.cs
index 6b3958577..a49dda0e7 100644
--- a/crypto/src/util/io/pem/PemGenerationException.cs
+++ b/crypto/src/util/io/pem/PemGenerationException.cs
@@ -2,7 +2,7 @@ using System;
namespace Org.BouncyCastle.Utilities.IO.Pem
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class PemGenerationException
diff --git a/crypto/src/x509/store/IX509Selector.cs b/crypto/src/x509/store/IX509Selector.cs
index 75358cbbf..4459903e7 100644
--- a/crypto/src/x509/store/IX509Selector.cs
+++ b/crypto/src/x509/store/IX509Selector.cs
@@ -3,11 +3,11 @@ using System;
namespace Org.BouncyCastle.X509.Store
{
public interface IX509Selector
-#if !(SILVERLIGHT || PORTABLE)
+#if !PORTABLE
: ICloneable
#endif
{
-#if SILVERLIGHT || PORTABLE
+#if PORTABLE
object Clone();
#endif
bool Match(object obj);
diff --git a/crypto/src/x509/store/NoSuchStoreException.cs b/crypto/src/x509/store/NoSuchStoreException.cs
index 28b18892a..bf6bdf76c 100644
--- a/crypto/src/x509/store/NoSuchStoreException.cs
+++ b/crypto/src/x509/store/NoSuchStoreException.cs
@@ -2,7 +2,7 @@ using System;
namespace Org.BouncyCastle.X509.Store
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class NoSuchStoreException
diff --git a/crypto/src/x509/store/X509StoreException.cs b/crypto/src/x509/store/X509StoreException.cs
index ea7e51e79..f697c116a 100644
--- a/crypto/src/x509/store/X509StoreException.cs
+++ b/crypto/src/x509/store/X509StoreException.cs
@@ -2,7 +2,7 @@ using System;
namespace Org.BouncyCastle.X509.Store
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class X509StoreException
diff --git a/crypto/test/src/asn1/test/ASN1IntegerTest.cs b/crypto/test/src/asn1/test/ASN1IntegerTest.cs
index 3d0c6fcd0..0e37a7e10 100644
--- a/crypto/test/src/asn1/test/ASN1IntegerTest.cs
+++ b/crypto/test/src/asn1/test/ASN1IntegerTest.cs
@@ -24,7 +24,7 @@ namespace Org.BouncyCastle.Asn1.Tests
public override void PerformTest()
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
SetAllowUnsafeProperty(true);
@@ -351,7 +351,7 @@ namespace Org.BouncyCastle.Asn1.Tests
private void SetAllowUnsafeProperty(bool allowUnsafe)
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable(DerInteger.AllowUnsafeProperty, allowUnsafe ? "true" : "false");
diff --git a/crypto/test/src/asn1/test/MiscTest.cs b/crypto/test/src/asn1/test/MiscTest.cs
index 3a7eb5af6..44158ab3e 100644
--- a/crypto/test/src/asn1/test/MiscTest.cs
+++ b/crypto/test/src/asn1/test/MiscTest.cs
@@ -85,7 +85,7 @@ namespace Org.BouncyCastle.Asn1.Tests
private void SetAllowUnsafeProperty(bool allowUnsafe)
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable(DerInteger.AllowUnsafeProperty, allowUnsafe ? "true" : "false");
diff --git a/crypto/test/src/crypto/test/SP80038GTest.cs b/crypto/test/src/crypto/test/SP80038GTest.cs
index 676a564bf..d8fe83150 100644
--- a/crypto/test/src/crypto/test/SP80038GTest.cs
+++ b/crypto/test/src/crypto/test/SP80038GTest.cs
@@ -274,7 +274,7 @@ namespace Org.BouncyCastle.Crypto.Tests
private void testDisable()
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
+#if PORTABLE && !DOTNET
// Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable("org.bouncycastle.fpe.disable", "true");
diff --git a/crypto/test/src/security/test/SecureRandomTest.cs b/crypto/test/src/security/test/SecureRandomTest.cs
index a474b5339..8aac422fd 100644
--- a/crypto/test/src/security/test/SecureRandomTest.cs
+++ b/crypto/test/src/security/test/SecureRandomTest.cs
@@ -3,21 +3,19 @@ using System.Text;
using NUnit.Framework;
-using Org.BouncyCastle.Crypto;
using Org.BouncyCastle.Crypto.Digests;
using Org.BouncyCastle.Crypto.Engines;
using Org.BouncyCastle.Crypto.Macs;
using Org.BouncyCastle.Crypto.Prng;
using Org.BouncyCastle.Crypto.Parameters;
using Org.BouncyCastle.Utilities;
-using Org.BouncyCastle.Utilities.Test;
namespace Org.BouncyCastle.Security.Tests
{
[TestFixture]
public class SecureRandomTest
{
-#if !(NETCF_1_0 || PORTABLE)
+#if !PORTABLE
[Test]
public void TestCryptoApi()
{
diff --git a/crypto/test/src/security/test/TestDotNetUtil.cs b/crypto/test/src/security/test/TestDotNetUtil.cs
index 3354be0b9..062eada0e 100644
--- a/crypto/test/src/security/test/TestDotNetUtil.cs
+++ b/crypto/test/src/security/test/TestDotNetUtil.cs
@@ -1,4 +1,4 @@
-#if !(NETCF_1_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
using System;
using System.Security.Cryptography;
diff --git a/crypto/test/src/test/SP80038GTest.cs b/crypto/test/src/test/SP80038GTest.cs
index 05dc7dded..adf6f35d8 100644
--- a/crypto/test/src/test/SP80038GTest.cs
+++ b/crypto/test/src/test/SP80038GTest.cs
@@ -272,8 +272,8 @@ namespace Org.BouncyCastle.Tests
private void testDisable()
{
-#if NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || (PORTABLE && !DOTNET) || NET_1_1
- // Can't SetEnvironmentVariable !
+#if PORTABLE && !DOTNET
+ // Can't SetEnvironmentVariable !
#else
Environment.SetEnvironmentVariable("org.bouncycastle.fpe.disable", "true");
try
diff --git a/crypto/test/src/util/test/SimpleTest.cs b/crypto/test/src/util/test/SimpleTest.cs
index b2eb670ff..fdb857fb8 100644
--- a/crypto/test/src/util/test/SimpleTest.cs
+++ b/crypto/test/src/util/test/SimpleTest.cs
@@ -196,28 +196,10 @@ namespace Org.BouncyCastle.Utilities.Test
#endif
}
-#if NETCF_1_0 || NETCF_2_0
- private static string GetNewLine()
- {
- MemoryStream buf = new MemoryStream();
- StreamWriter w = new StreamWriter(buf, Encoding.ASCII);
- w.WriteLine();
- w.Close();
- byte[] bs = buf.ToArray();
- return Encoding.ASCII.GetString(bs, 0, bs.Length);
- }
-
- internal static string GetEnvironmentVariable(
- string variable)
- {
- return null;
- }
-#else
private static string GetNewLine()
{
return Environment.NewLine;
}
-#endif
internal static readonly string NewLine = GetNewLine();
diff --git a/crypto/test/src/util/test/TestFailedException.cs b/crypto/test/src/util/test/TestFailedException.cs
index 54dc840bc..215e1fd20 100644
--- a/crypto/test/src/util/test/TestFailedException.cs
+++ b/crypto/test/src/util/test/TestFailedException.cs
@@ -2,7 +2,7 @@ using System;
namespace Org.BouncyCastle.Utilities.Test
{
-#if !(NETCF_1_0 || NETCF_2_0 || SILVERLIGHT || PORTABLE)
+#if !PORTABLE
[Serializable]
#endif
public class TestFailedException
diff --git a/crypto/testcfg.nunit b/crypto/testcfg.nunit
deleted file mode 100644
index e4061da06..000000000
--- a/crypto/testcfg.nunit
+++ /dev/null
@@ -1,6 +0,0 @@
-
-
-
-
-
-
diff --git a/csharp.sln b/csharp.sln
deleted file mode 100644
index ce64a084a..000000000
--- a/csharp.sln
+++ /dev/null
@@ -1,29 +0,0 @@
-Microsoft Visual Studio Solution File, Format Version 8.00
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto", "crypto\crypto.csproj", "{38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Project("{FAE04EC0-301F-11D3-BF4B-00C04F79EFBC}") = "crypto-test", "crypto-test\crypto-test.csproj", "{C857AD68-8F1B-4C7A-A76B-3DC03CBE4FB0}"
- ProjectSection(ProjectDependencies) = postProject
- EndProjectSection
-EndProject
-Global
- GlobalSection(SolutionConfiguration) = preSolution
- Debug = Debug
- Release = Release
- EndGlobalSection
- GlobalSection(ProjectConfiguration) = postSolution
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Debug.ActiveCfg = Debug|.NET
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Debug.Build.0 = Debug|.NET
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Release.ActiveCfg = Release|.NET
- {38872A5F-E87E-4FAD-B109-8EB7B2E6A4A0}.Release.Build.0 = Release|.NET
- {C857AD68-8F1B-4C7A-A76B-3DC03CBE4FB0}.Debug.ActiveCfg = Debug|.NET
- {C857AD68-8F1B-4C7A-A76B-3DC03CBE4FB0}.Debug.Build.0 = Debug|.NET
- {C857AD68-8F1B-4C7A-A76B-3DC03CBE4FB0}.Release.ActiveCfg = Release|.NET
- {C857AD68-8F1B-4C7A-A76B-3DC03CBE4FB0}.Release.Build.0 = Release|.NET
- EndGlobalSection
- GlobalSection(ExtensibilityGlobals) = postSolution
- EndGlobalSection
- GlobalSection(ExtensibilityAddIns) = postSolution
- EndGlobalSection
-EndGlobal
--
cgit 1.4.1