diff --git a/.gitattributes b/.gitattributes index 4989b01a53..ff67a9158f 100644 --- a/.gitattributes +++ b/.gitattributes @@ -1,39 +1,68 @@ -# Set default behaviour, in case users don't have core.autocrlf set. -* text=auto +############################################################################### +# Set default behavior to automatically normalize line endings. +############################################################################### +* text=auto -# Explicitly declare text files we want to always be normalized and converted -# to native line endings on checkout. -*.build text diff=xml -*.cs text diff=csharp -*.csproj text diff=xml -*.eml text -*.html text diff=html -*.mdp text diff=xml -*.mds text diff=xml -*.nunit text diff=xml -*.pem text -*.README text -*.sln text -*.tmpl text -*.txt text -*.xml text diff=xml +############################################################################### +# Make sh files under the build directory always have LF as line endings +############################################################################### +*.sh eol=lf -# Denote all files that are truly binary and should not be modified. -*.bin binary -*.cer binary -*.crl binary -*.crt binary -*.data binary -*.dll binary -*.dsa binary -*.jpg binary -*.jpeg binary -*.key binary -*.p12 binary -*.p7m binary -*.png binary -*.pri binary -*.pub binary -*.rsa binary -*.sec binary -*.sig binary +############################################################################### +# Set default behavior for command prompt diff. +# +# This is need for earlier builds of msysgit that does not have it on by +# default for csharp files. +# Note: This is only used by command line +############################################################################### +#*.cs diff=csharp + +############################################################################### +# Set the merge driver for project and solution files +# +# Merging from the command prompt will add diff markers to the files if there +# are conflicts (Merging from VS is not affected by the settings below, in VS +# the diff markers are never inserted). Diff markers may cause the following +# file extensions to fail to load in VS. An alternative would be to treat +# these files as binary and thus will always conflict and require user +# intervention with every merge. To do so, just uncomment the entries below +############################################################################### +#*.sln merge=binary +#*.csproj merge=binary +#*.vbproj merge=binary +#*.vcxproj merge=binary +#*.vcproj merge=binary +#*.dbproj merge=binary +#*.fsproj merge=binary +#*.lsproj merge=binary +#*.wixproj merge=binary +#*.modelproj merge=binary +#*.sqlproj merge=binary +#*.wwaproj merge=binary + +############################################################################### +# behavior for image files +# +# image files are treated as binary by default. +############################################################################### +#*.jpg binary +#*.png binary +#*.gif binary + +############################################################################### +# diff behavior for common document formats +# +# Convert binary document formats to text before diffing them. This feature +# is only available from the command line. Turn it on by uncommenting the +# entries below. +############################################################################### +#*.doc diff=astextplain +#*.DOC diff=astextplain +#*.docx diff=astextplain +#*.DOCX diff=astextplain +#*.dot diff=astextplain +#*.DOT diff=astextplain +#*.pdf diff=astextplain +#*.PDF diff=astextplain +#*.rtf diff=astextplain +#*.RTF diff=astextplain diff --git a/.gitignore b/.gitignore index bc7a62d4bf..69c463058e 100644 --- a/.gitignore +++ b/.gitignore @@ -1,25 +1,29 @@ -*.psess -*.suo -*.swp -*.user -*.userprefs -*.vsp - -*.nupkg - -Backup/ bin/ -dist/ -doc/ obj/ - -_Resharper.*/ -_Resharper*/ -*.ide/ -packages/ .vs/ - -*.nuget.props -*.nuget.targets -*.project.lock.json -project.lock.json +*.suo +*.user +_ReSharper.* +*.DS_Store +*.userprefs +*.pidb +*.vspx +*.psess +*.binlog +*.log +artifacts/ +StyleCop.Cache +node_modules/ +.nupkgs +.nuget +.r +.w +.deps +msbuild.ProjectImports.zip +.env +scripts/tmp/ +.dotnet/ +.tools/ +src/**/global.json +launchSettings.json +BenchmarkDotNet.Artifacts/ \ No newline at end of file diff --git a/BouncyCastle-PCL.sln b/BouncyCastle-PCL.sln deleted file mode 100644 index afd9396fa2..0000000000 --- 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 0b41d742d5..0000000000 --- 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/BouncyCastle.NetCoreSdk.sln b/BouncyCastle.NetCoreSdk.sln new file mode 100644 index 0000000000..3f910d1b83 --- /dev/null +++ b/BouncyCastle.NetCoreSdk.sln @@ -0,0 +1,53 @@ + +Microsoft Visual Studio Solution File, Format Version 12.00 +# Visual Studio Version 16 +VisualStudioVersion = 16.0.28315.86 +MinimumVisualStudioVersion = 10.0.40219.1 +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "Solution Items", "Solution Items", "{EFF137D0-0CF4-47BF-90C9-BE80ADBBBC0D}" + ProjectSection(SolutionItems) = preProject + .gitattributes = .gitattributes + .gitignore = .gitignore + Directory.Build.props = Directory.Build.props + Directory.Build.targets = Directory.Build.targets + License.html = License.html + README.md = README.md + version.props = version.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "src", "src", "{C354E36B-8B22-47F7-A656-C8EC0DB16FE9}" + ProjectSection(SolutionItems) = preProject + version.props = version.props + EndProjectSection +EndProject +Project("{2150E333-8FDC-42A3-9474-1A3956D46DE8}") = "test", "test", "{65EA6EB0-CAF6-4C0E-8FF6-3EA8B45E058B}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "BouncyCastle.NetCoreSdk", "src\BouncyCastle\BouncyCastle.NetCoreSdk.csproj", "{00E3F5DD-E331-4CE7-8DD8-01B6629988CE}" +EndProject +Project("{9A19103F-16F7-4668-BE54-9A1E7A4F7556}") = "Crypto.NetSdk.NUnitTest", "test\Crypto.NetSdk.NUnitTest\Crypto.NetSdk.NUnitTest.csproj", "{91034CD9-DC44-426F-8F1D-AABE33F76A6C}" +EndProject +Global + GlobalSection(SolutionConfigurationPlatforms) = preSolution + Debug|Any CPU = Debug|Any CPU + Release|Any CPU = Release|Any CPU + EndGlobalSection + GlobalSection(ProjectConfigurationPlatforms) = postSolution + {00E3F5DD-E331-4CE7-8DD8-01B6629988CE}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {00E3F5DD-E331-4CE7-8DD8-01B6629988CE}.Debug|Any CPU.Build.0 = Debug|Any CPU + {00E3F5DD-E331-4CE7-8DD8-01B6629988CE}.Release|Any CPU.ActiveCfg = Release|Any CPU + {00E3F5DD-E331-4CE7-8DD8-01B6629988CE}.Release|Any CPU.Build.0 = Release|Any CPU + {91034CD9-DC44-426F-8F1D-AABE33F76A6C}.Debug|Any CPU.ActiveCfg = Debug|Any CPU + {91034CD9-DC44-426F-8F1D-AABE33F76A6C}.Debug|Any CPU.Build.0 = Debug|Any CPU + {91034CD9-DC44-426F-8F1D-AABE33F76A6C}.Release|Any CPU.ActiveCfg = Release|Any CPU + {91034CD9-DC44-426F-8F1D-AABE33F76A6C}.Release|Any CPU.Build.0 = Release|Any CPU + EndGlobalSection + GlobalSection(SolutionProperties) = preSolution + HideSolutionNode = FALSE + EndGlobalSection + GlobalSection(NestedProjects) = preSolution + {00E3F5DD-E331-4CE7-8DD8-01B6629988CE} = {C354E36B-8B22-47F7-A656-C8EC0DB16FE9} + {91034CD9-DC44-426F-8F1D-AABE33F76A6C} = {65EA6EB0-CAF6-4C0E-8FF6-3EA8B45E058B} + EndGlobalSection + GlobalSection(ExtensibilityGlobals) = postSolution + SolutionGuid = {81EB9F1C-263C-40E6-8ABD-EA5B8D357706} + EndGlobalSection +EndGlobal diff --git a/BouncyCastle.sln b/BouncyCastle.sln deleted file mode 100644 index 588f3d8ca4..0000000000 --- a/BouncyCastle.sln +++ /dev/null @@ -1,26 +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}") = "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 - {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 - {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/Directory.Build.props b/Directory.Build.props new file mode 100644 index 0000000000..ea79a335cd --- /dev/null +++ b/Directory.Build.props @@ -0,0 +1,18 @@ + + + + + Bouncy Castle Cryptography API + The Legion of the Bouncy Castle Inc; Alex Paskhin + The Legion of the Bouncy Castle Inc + https://github.com/bcgit/bc-csharp + https://github.com/alexpaskhin/bc-csharp.git + Git + http://www.bouncycastle.org/licence.html + MIT + bouncycastle cryptography encryption security + Bouncy Castle Cryptography API + Copyright (C) 2000-2019 The Legion of the Bouncy Castle Inc + + + diff --git a/Directory.Build.targets b/Directory.Build.targets new file mode 100644 index 0000000000..668e3f1933 --- /dev/null +++ b/Directory.Build.targets @@ -0,0 +1,3 @@ + + + diff --git a/FxCop/CustomDictionary.xml b/FxCop/CustomDictionary.xml deleted file mode 100644 index 7f9080348c..0000000000 --- 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/crypto/License.html b/License.html similarity index 96% rename from crypto/License.html rename to License.html index 829aa6ba39..482f20a0f5 100644 --- a/crypto/License.html +++ b/License.html @@ -9,7 +9,7 @@

The Bouncy Castle Cryptographic C#® API

License:

The Bouncy Castle License
-Copyright (c) 2000-2018 The Legion of the Bouncy Castle Inc. +Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. (https://www.bouncycastle.org)
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 diff --git a/MimeKit.BouncyCastle.nuspec b/MimeKit.BouncyCastle.nuspec deleted file mode 100644 index c3e20c3307..0000000000 --- a/MimeKit.BouncyCastle.nuspec +++ /dev/null @@ -1,45 +0,0 @@ - - - - MimeKit.BouncyCastle - 1.7.90.1 - Bouncy Castle for MimeKit - Jeffrey Stedfast - jstedfast - https://github.com/jstedfast/bc-csharp - false - BouncyCastle 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 2, .NET 3.5, .NET 4.0, .NET 4.5, Xamarin.Android and Xamarin.iOS. - BouncyCastle is a portable cryptography framework. - en-US - bouncycastle, cryptography, encryption, security, net20, net35, net40, net45, xamarin, xamarin.android, xamarin.ios - - - - - - - - - - \ No newline at end of file diff --git a/Portable.BouncyCastle.nuspec b/Portable.BouncyCastle.nuspec deleted file mode 100644 index c58a23a80d..0000000000 --- a/Portable.BouncyCastle.nuspec +++ /dev/null @@ -1,109 +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/README.md b/README.md index 270d9cca50..e28f4ec4d4 100644 --- a/README.md +++ b/README.md @@ -1,4 +1,16 @@ -# The Bouncy Castle Crypto Package For C Sharp +# Inroduction + +The release build from repository https://github.com/AlexPaskhin/bc-csharp . It is the fork from https://github.com/bcgit/bc-csharp. + +It is the fulls scale software migration to the Net Core Sdk with full testing of the package. + + + +The project build with targets:net40;net45;net452;net472;netstandard2.0 + +Nuget package located: https://www.nuget.org/packages/BouncyCastle.NetCoreSdk + +## The Bouncy Castle Crypto Package For C Sharp The Bouncy Castle Crypto package is a C\# implementation of cryptographic algorithms and protocols, it was developed by the Legion of the Bouncy Castle, a registered Australian Charity, with a little help! The Legion, and the latest goings on with this package, can be found at [http://www.bouncycastle.org](http://www.bouncycastle.org). In addition to providing basic cryptography algorithms, the package also provides support for CMS, TSP, X.509 certificate generation and a variety of other standards such as OpenPGP. diff --git a/BouncyCastle.snk b/build/BouncyCastle.snk similarity index 100% rename from BouncyCastle.snk rename to build/BouncyCastle.snk diff --git a/crypto-test/App.ico b/crypto-test/App.ico deleted file mode 100644 index 3a5525fd79..0000000000 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 5a411b4826..0000000000 --- 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 9bb4cdbb9d..0000000000 --- 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 52472faf87..0000000000 --- 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 de668a83de..0000000000 --- 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 - 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 1f8800b2cd..0000000000 --- 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 367bd7ff95..0000000000 --- a/crypto/BouncyCastle.Android.csproj +++ /dev/null @@ -1,1595 +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.0.3 - - - 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 deleted file mode 100644 index 5dfdd35e5e..0000000000 --- a/crypto/BouncyCastle.csproj +++ /dev/null @@ -1,1589 +0,0 @@ - - - - Debug - AnyCPU - AnyCPU - 8.0.30703 - 2.0 - {4C235092-820C-4DEB-9074-D356FB797D8B} - Library - Org.BouncyCastle - BouncyCastle - v2.0 - - - true - full - false - bin\Debug\lib\net20\ - obj\Debug\lib\net20\ - DEBUG;TRACE;INCLUDE_IDEA; - prompt - 4 - false - - - true - bin\Release\lib\net20\ - obj\Release\lib\net20\ - TRACE;INCLUDE_IDEA; - doc\BouncyCastle.xml - prompt - 4 - false - 1591 - - - true - - - ..\BouncyCastle.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/crypto/BouncyCastle.iOS.csproj b/crypto/BouncyCastle.iOS.csproj deleted file mode 100644 index 3208fbce72..0000000000 --- a/crypto/BouncyCastle.iOS.csproj +++ /dev/null @@ -1,1590 +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 - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/crypto/Contributors.html b/crypto/Contributors.html deleted file mode 100644 index c43b5a864b..0000000000 --- a/crypto/Contributors.html +++ /dev/null @@ -1,149 +0,0 @@ - - - - - Contributors - - -

The Bouncy Castle Cryptographic C#® API

-

-

Donors

-

- The following people and organisations donated financially to help with the release of 1.8: -
 
- Andrew Grosser, Antonio Royo, dmitry.ribakov@gmail.com, PhreePhly, and encryptomatic.com. -

- -

Code Contributors:

-

The following people have contributed to the C# Bouncy Castle Cryptography - Package.

-

Thanks, may your castles never deflate!

- - - diff --git a/crypto/NBuild.build b/crypto/NBuild.build deleted file mode 100644 index 014cc57c6c..0000000000 --- a/crypto/NBuild.build +++ /dev/null @@ -1,247 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - Compile targets will be signed using keyfile ../BouncyCastle.snk - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crypto/crypto.Net45.csproj b/crypto/crypto.Net45.csproj deleted file mode 100644 index 14b3581f55..0000000000 --- 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 b455309800..0000000000 --- a/crypto/crypto.csproj +++ /dev/null @@ -1,13236 +0,0 @@ - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - diff --git a/crypto/crypto.dotnet.csproj b/crypto/crypto.dotnet.csproj deleted file mode 100644 index d9ae0db872..0000000000 --- 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 e800026129..0000000000 --- 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 1c37351774..0000000000 --- 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 4edf1139ef..0000000000 --- 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/AssemblyInfo.cs b/crypto/src/AssemblyInfo.cs deleted file mode 100644 index 2b92e07f3a..0000000000 --- a/crypto/src/AssemblyInfo.cs +++ /dev/null @@ -1,119 +0,0 @@ -using System; -using System.Reflection; -//using System.Security.Permissions; - -#if PORTABLE -using System.Linq; -#else -using System.Runtime.InteropServices; -#endif - -// -// 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("BouncyCastle.Crypto")] -[assembly: AssemblyDescription("Bouncy Castle Cryptography API")] -[assembly: AssemblyConfiguration("")] -[assembly: AssemblyCompany("The Legion of the Bouncy Castle Inc.")] -[assembly: AssemblyProduct("Bouncy Castle for .NET")] -[assembly: AssemblyCopyright("Copyright (C) 2000-2018")] -[assembly: AssemblyTrademark("")] -[assembly: AssemblyCulture("")] - -// -// 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 Revision and Build Numbers -// by using the '*' as shown below: - -[assembly: AssemblyVersion("1.8.4.0")] -[assembly: AssemblyFileVersion("1.8.18300.1")] -[assembly: AssemblyInformationalVersion("1.8.4")] - -// -// In order to sign your assembly you must specify a key to use. Refer to the -// Microsoft .NET Framework documentation for more information on assembly signing. -// -// Use the attributes below to control which key is used for signing. -// -// Notes: -// (*) If no key is specified, the assembly is not signed. -// (*) KeyName refers to a key that has been installed in the Crypto Service -// Provider (CSP) on your machine. KeyFile refers to a file which contains -// a key. -// (*) If the KeyFile and the KeyName values are both specified, the -// following processing occurs: -// (1) If the KeyName can be found in the CSP, that key is used. -// (2) If the KeyName does not exist and the KeyFile does exist, the key -// in the KeyFile is installed into the CSP and used. -// (*) In order to create a KeyFile, you can use the sn.exe (Strong Name) utility. -// When specifying the KeyFile, the location of the KeyFile should be -// relative to the project output directory which is -// %Project Directory%\obj\. For example, if your KeyFile is -// located in the project directory, you would specify the AssemblyKeyFile -// attribute as [assembly: AssemblyKeyFile("..\\..\\mykey.snk")] -// (*) Delay Signing is an advanced option - see the Microsoft .NET Framework -// documentation for more information on this. -// -[assembly: AssemblyDelaySign(false)] -#if STRONG_NAME -[assembly: AssemblyKeyFile(@"../BouncyCastle.snk")] -#endif - -[assembly: CLSCompliant(true)] -#if !PORTABLE -[assembly: ComVisible(false)] -#endif - -// Start with no permissions -//[assembly: PermissionSet(SecurityAction.RequestOptional, Unrestricted=false)] -//...and explicitly add those we need - -// see Org.BouncyCastle.Crypto.Encodings.Pkcs1Encoding.StrictLengthEnabledProperty -//[assembly: EnvironmentPermission(SecurityAction.RequestOptional, Read="Org.BouncyCastle.Pkcs1.Strict")] - -internal class AssemblyInfo -{ - private static string version = null; - - public static string Version - { - get - { - if (version == null) - { -#if PORTABLE -#if NEW_REFLECTION - var a = typeof(AssemblyInfo).GetTypeInfo().Assembly; - var c = a.GetCustomAttributes(typeof(AssemblyVersionAttribute)); -#else - var a = typeof(AssemblyInfo).Assembly; - var c = a.GetCustomAttributes(typeof(AssemblyVersionAttribute), false); -#endif - var v = (AssemblyVersionAttribute)c.FirstOrDefault(); - if (v != null) - { - version = v.Version; - } -#else - version = Assembly.GetExecutingAssembly().GetName().Version.ToString(); -#endif - - // if we're still here, then don't try again - if (version == null) - { - version = string.Empty; - } - } - - return version; - } - } -} diff --git a/crypto/test/UnitTests.csproj b/crypto/test/UnitTests.csproj deleted file mode 100644 index 2dd3547fa2..0000000000 --- a/crypto/test/UnitTests.csproj +++ /dev/null @@ -1,1320 +0,0 @@ - - - - Debug - AnyCPU - 9.0.21022 - 2.0 - {D4EB669D-7C88-48C0-A480-C5CC73A7369B} - Library - UnitTests - UnitTests - v2.0 - - - true - full - false - bin\Debug - DEBUG;SEPARATE_UNIT_TESTS - prompt - 4 - false - 219 - - - full - true - bin\Release - prompt - 4 - false - 219 - - - - - lib\nunit.framework.dll - - - lib\nunit.core.interfaces.dll - - - lib\nunit.core.dll - - - - - - {4C235092-820C-4DEB-9074-D356FB797D8B} - BouncyCastle - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - - \ No newline at end of file diff --git a/crypto/test/lib/nunit.core.dll b/crypto/test/lib/nunit.core.dll deleted file mode 100644 index 8d99c637db..0000000000 Binary files a/crypto/test/lib/nunit.core.dll and /dev/null differ diff --git a/crypto/test/lib/nunit.core.interfaces.dll b/crypto/test/lib/nunit.core.interfaces.dll deleted file mode 100644 index 70a76b21c0..0000000000 Binary files a/crypto/test/lib/nunit.core.interfaces.dll and /dev/null differ diff --git a/crypto/test/lib/nunit.framework.dll b/crypto/test/lib/nunit.framework.dll deleted file mode 100644 index ba484ba8c9..0000000000 Binary files a/crypto/test/lib/nunit.framework.dll and /dev/null differ diff --git a/crypto/test/src/util/test/SimpleTest.cs b/crypto/test/src/util/test/SimpleTest.cs deleted file mode 100644 index dd27205c86..0000000000 --- a/crypto/test/src/util/test/SimpleTest.cs +++ /dev/null @@ -1,233 +0,0 @@ -using System; -using System.Collections; -using System.IO; -using System.Reflection; -using System.Text; - -using Org.BouncyCastle.Utilities; - -namespace Org.BouncyCastle.Utilities.Test -{ - public abstract class SimpleTest - : ITest - { - public abstract string Name - { - get; - } - - private ITestResult Success() - { - return SimpleTestResult.Successful(this, "Okay"); - } - - internal void Fail( - string message) - { - throw new TestFailedException(SimpleTestResult.Failed(this, message)); - } - - internal void Fail( - string message, - Exception throwable) - { - throw new TestFailedException(SimpleTestResult.Failed(this, message, throwable)); - } - - internal void Fail( - string message, - object expected, - object found) - { - throw new TestFailedException(SimpleTestResult.Failed(this, message, expected, found)); - } - - internal void IsTrue(bool value) - { - if (!value) - throw new TestFailedException(SimpleTestResult.Failed(this, "no message")); - } - - internal void IsTrue(string message, bool value) - { - if (!value) - throw new TestFailedException(SimpleTestResult.Failed(this, message)); - } - - internal void IsEquals(object a, object b) - { - if (!a.Equals(b)) - throw new TestFailedException(SimpleTestResult.Failed(this, "no message")); - } - - internal void IsEquals(int a, int b) - { - if (a != b) - throw new TestFailedException(SimpleTestResult.Failed(this, "no message")); - } - - internal void IsEquals(string message, bool a, bool b) - { - if (a != b) - throw new TestFailedException(SimpleTestResult.Failed(this, message)); - } - - internal void IsEquals(string message, long a, long b) - { - if (a != b) - throw new TestFailedException(SimpleTestResult.Failed(this, message)); - } - - internal void IsEquals(string message, object a, object b) - { - if (a == null && b == null) - return; - - if (a == null) - throw new TestFailedException(SimpleTestResult.Failed(this, message)); - if (b == null) - throw new TestFailedException(SimpleTestResult.Failed(this, message)); - if (!a.Equals(b)) - throw new TestFailedException(SimpleTestResult.Failed(this, message)); - } - - internal bool AreEqual( - byte[] a, - byte[] b) - { - return Arrays.AreEqual(a, b); - } - - public virtual ITestResult Perform() - { - try - { - PerformTest(); - - return Success(); - } - catch (TestFailedException e) - { - return e.GetResult(); - } - catch (Exception e) - { - return SimpleTestResult.Failed(this, "Exception: " + e, e); - } - } - - internal static void RunTest( - ITest test) - { - RunTest(test, Console.Out); - } - - internal static void RunTest( - ITest test, - TextWriter outStream) - { - ITestResult result = test.Perform(); - - outStream.WriteLine(result.ToString()); - if (result.GetException() != null) - { - outStream.WriteLine(result.GetException().StackTrace); - } - } - - internal static Stream GetTestDataAsStream( - string name) - { - string fullName = GetFullName(name); - - return Assembly.GetExecutingAssembly().GetManifestResourceStream(fullName); - } - - internal static string[] GetTestDataEntries( - string prefix) - { - string fullPrefix = GetFullName(prefix); - - ArrayList result = new ArrayList(); - string[] fullNames = Assembly.GetExecutingAssembly().GetManifestResourceNames(); - foreach (string fullName in fullNames) - { - if (fullName.StartsWith(fullPrefix)) - { - string name = GetShortName(fullName); - result.Add(name); - } - } - return (string[])result.ToArray(typeof(String)); - } - - private static string GetFullName( - string name) - { -#if SEPARATE_UNIT_TESTS - return "UnitTests.data." + name; -#elif PORTABLE - return "crypto.tests." + name; -#else - return "crypto.test.data." + name; -#endif - } - - private static string GetShortName( - string fullName) - { -#if SEPARATE_UNIT_TESTS - return fullName.Substring("UnitTests.data.".Length); -#elif PORTABLE - return fullName.Substring("crypto.tests.".Length); -#else - return fullName.Substring("crypto.test.data.".Length); -#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(); - - public abstract void PerformTest(); - - public static DateTime MakeUtcDateTime(int year, int month, int day, int hour, int minute, int second) - { -#if PORTABLE - return new DateTime(year, month, day, hour, minute, second, DateTimeKind.Utc); -#else - return new DateTime(year, month, day, hour, minute, second); -#endif - } - - public static DateTime MakeUtcDateTime(int year, int month, int day, int hour, int minute, int second, int millisecond) - { -#if PORTABLE - return new DateTime(year, month, day, hour, minute, second, millisecond, DateTimeKind.Utc); -#else - return new DateTime(year, month, day, hour, minute, second, millisecond); -#endif - } - } -} diff --git a/crypto/testcfg.nunit b/crypto/testcfg.nunit deleted file mode 100644 index e4061da061..0000000000 --- a/crypto/testcfg.nunit +++ /dev/null @@ -1,6 +0,0 @@ - - - - - - diff --git a/csharp.sln b/csharp.sln deleted file mode 100644 index ce64a084a5..0000000000 --- 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 diff --git a/src/BouncyCastle/AssemblyInfo.Version.cs b/src/BouncyCastle/AssemblyInfo.Version.cs new file mode 100644 index 0000000000..8800b0e4d6 --- /dev/null +++ b/src/BouncyCastle/AssemblyInfo.Version.cs @@ -0,0 +1,28 @@ +using System; +using System.Reflection; + +[assembly: CLSCompliant(true)] + +internal class AssemblyInfo +{ + private static string version = null; + + public static string Version + { + get + { + if (version == null) + { + + version = Assembly.GetExecutingAssembly().GetName().Version.ToString(); + // if we're still here, then don't try again + if (version == null) + { + version = string.Empty; + } + } + + return version; + } + } +} diff --git a/src/BouncyCastle/BouncyCastle.NetCoreSdk.csproj b/src/BouncyCastle/BouncyCastle.NetCoreSdk.csproj new file mode 100644 index 0000000000..67fffe6d14 --- /dev/null +++ b/src/BouncyCastle/BouncyCastle.NetCoreSdk.csproj @@ -0,0 +1,32 @@ + + + net40;net45;net452;net472;netstandard2.0 + true + + + + true + ..\..\build\BouncyCastle.snk + 1701;1702;0618;0672 + + + + BouncyCastle.NetCoreSdk + "Microsoft.NET.Sdk" multi target version + BouncyCastle.Crypto + Org.BouncyCastle + false + $(NetCoreVersion) + $(NetCorePackageVersion) + + Library + + + + + + true + ../../.nupkgs + + + \ No newline at end of file diff --git a/src/BouncyCastle/Contributors.html b/src/BouncyCastle/Contributors.html new file mode 100644 index 0000000000..fb3f2502a9 --- /dev/null +++ b/src/BouncyCastle/Contributors.html @@ -0,0 +1,189 @@ + + + + + Contributors + + +

The Bouncy Castle Cryptographic C#® API

+

+

Donors

+

+ The following people and organisations donated financially to help with the release of 1.8: +
 
+ Andrew Grosser, Antonio Royo, dmitry.ribakov@gmail.com, PhreePhly, and encryptomatic.com. +

+ +

Code Contributors:

+

The following people have contributed to the C# Bouncy Castle Cryptography + Package.

+

Thanks, may your castles never deflate!

+ + + diff --git a/src/BouncyCastle/License.html b/src/BouncyCastle/License.html new file mode 100644 index 0000000000..482f20a0f5 --- /dev/null +++ b/src/BouncyCastle/License.html @@ -0,0 +1,39 @@ + + + + + License + + +

The Bouncy Castle Cryptographic C#® API

+

License:

+The Bouncy Castle License
+Copyright (c) 2000-2019 The Legion of the Bouncy Castle Inc. +(https://www.bouncycastle.org)
+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, including without limitation the rights to use, copy, modify, merge, +publish, distribute, sub license, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
+The above copyright notice and this permission notice shall be included +in all copies or substantial portions of the Software.
+THE SOFTWARE IS PROVIDED "AS IS", +WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED,
+INCLUDING BUT NOT LIMITED TO THE +WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR
+PURPOSE AND NONINFRINGEMENT. IN NO +EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
+LIABLE FOR ANY CLAIM, DAMAGES OR OTHER +LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR
+OTHERWISE, ARISING FROM, OUT OF OR IN +CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER
+DEALINGS IN THE SOFTWARE.
+
+ + + diff --git a/crypto/Readme.html b/src/BouncyCastle/Readme.html similarity index 100% rename from crypto/Readme.html rename to src/BouncyCastle/Readme.html diff --git a/crypto/src/asn1/ASN1Generator.cs b/src/BouncyCastle/asn1/ASN1Generator.cs similarity index 100% rename from crypto/src/asn1/ASN1Generator.cs rename to src/BouncyCastle/asn1/ASN1Generator.cs diff --git a/crypto/src/asn1/ASN1OctetStringParser.cs b/src/BouncyCastle/asn1/ASN1OctetStringParser.cs similarity index 100% rename from crypto/src/asn1/ASN1OctetStringParser.cs rename to src/BouncyCastle/asn1/ASN1OctetStringParser.cs diff --git a/crypto/src/asn1/ASN1SequenceParser.cs b/src/BouncyCastle/asn1/ASN1SequenceParser.cs similarity index 100% rename from crypto/src/asn1/ASN1SequenceParser.cs rename to src/BouncyCastle/asn1/ASN1SequenceParser.cs diff --git a/crypto/src/asn1/ASN1SetParser.cs b/src/BouncyCastle/asn1/ASN1SetParser.cs similarity index 100% rename from crypto/src/asn1/ASN1SetParser.cs rename to src/BouncyCastle/asn1/ASN1SetParser.cs diff --git a/crypto/src/asn1/ASN1StreamParser.cs b/src/BouncyCastle/asn1/ASN1StreamParser.cs similarity index 100% rename from crypto/src/asn1/ASN1StreamParser.cs rename to src/BouncyCastle/asn1/ASN1StreamParser.cs diff --git a/crypto/src/asn1/ASN1TaggedObjectParser.cs b/src/BouncyCastle/asn1/ASN1TaggedObjectParser.cs similarity index 100% rename from crypto/src/asn1/ASN1TaggedObjectParser.cs rename to src/BouncyCastle/asn1/ASN1TaggedObjectParser.cs diff --git a/crypto/src/asn1/Asn1Encodable.cs b/src/BouncyCastle/asn1/Asn1Encodable.cs similarity index 100% rename from crypto/src/asn1/Asn1Encodable.cs rename to src/BouncyCastle/asn1/Asn1Encodable.cs diff --git a/crypto/src/asn1/Asn1EncodableVector.cs b/src/BouncyCastle/asn1/Asn1EncodableVector.cs similarity index 100% rename from crypto/src/asn1/Asn1EncodableVector.cs rename to src/BouncyCastle/asn1/Asn1EncodableVector.cs diff --git a/crypto/src/asn1/Asn1Exception.cs b/src/BouncyCastle/asn1/Asn1Exception.cs similarity index 100% rename from crypto/src/asn1/Asn1Exception.cs rename to src/BouncyCastle/asn1/Asn1Exception.cs diff --git a/crypto/src/asn1/Asn1InputStream.cs b/src/BouncyCastle/asn1/Asn1InputStream.cs similarity index 100% rename from crypto/src/asn1/Asn1InputStream.cs rename to src/BouncyCastle/asn1/Asn1InputStream.cs diff --git a/crypto/src/asn1/Asn1Null.cs b/src/BouncyCastle/asn1/Asn1Null.cs similarity index 100% rename from crypto/src/asn1/Asn1Null.cs rename to src/BouncyCastle/asn1/Asn1Null.cs diff --git a/crypto/src/asn1/Asn1Object.cs b/src/BouncyCastle/asn1/Asn1Object.cs similarity index 100% rename from crypto/src/asn1/Asn1Object.cs rename to src/BouncyCastle/asn1/Asn1Object.cs diff --git a/crypto/src/asn1/Asn1OctetString.cs b/src/BouncyCastle/asn1/Asn1OctetString.cs similarity index 100% rename from crypto/src/asn1/Asn1OctetString.cs rename to src/BouncyCastle/asn1/Asn1OctetString.cs diff --git a/crypto/src/asn1/Asn1OutputStream.cs b/src/BouncyCastle/asn1/Asn1OutputStream.cs similarity index 100% rename from crypto/src/asn1/Asn1OutputStream.cs rename to src/BouncyCastle/asn1/Asn1OutputStream.cs diff --git a/crypto/src/asn1/Asn1ParsingException.cs b/src/BouncyCastle/asn1/Asn1ParsingException.cs similarity index 100% rename from crypto/src/asn1/Asn1ParsingException.cs rename to src/BouncyCastle/asn1/Asn1ParsingException.cs diff --git a/crypto/src/asn1/Asn1Sequence.cs b/src/BouncyCastle/asn1/Asn1Sequence.cs similarity index 100% rename from crypto/src/asn1/Asn1Sequence.cs rename to src/BouncyCastle/asn1/Asn1Sequence.cs diff --git a/crypto/src/asn1/Asn1Set.cs b/src/BouncyCastle/asn1/Asn1Set.cs similarity index 100% rename from crypto/src/asn1/Asn1Set.cs rename to src/BouncyCastle/asn1/Asn1Set.cs diff --git a/crypto/src/asn1/Asn1TaggedObject.cs b/src/BouncyCastle/asn1/Asn1TaggedObject.cs similarity index 100% rename from crypto/src/asn1/Asn1TaggedObject.cs rename to src/BouncyCastle/asn1/Asn1TaggedObject.cs diff --git a/crypto/src/asn1/Asn1Tags.cs b/src/BouncyCastle/asn1/Asn1Tags.cs similarity index 100% rename from crypto/src/asn1/Asn1Tags.cs rename to src/BouncyCastle/asn1/Asn1Tags.cs diff --git a/crypto/src/asn1/BERBitString.cs b/src/BouncyCastle/asn1/BERBitString.cs similarity index 100% rename from crypto/src/asn1/BERBitString.cs rename to src/BouncyCastle/asn1/BERBitString.cs diff --git a/crypto/src/asn1/BERGenerator.cs b/src/BouncyCastle/asn1/BERGenerator.cs similarity index 100% rename from crypto/src/asn1/BERGenerator.cs rename to src/BouncyCastle/asn1/BERGenerator.cs diff --git a/crypto/src/asn1/BEROctetStringGenerator.cs b/src/BouncyCastle/asn1/BEROctetStringGenerator.cs similarity index 100% rename from crypto/src/asn1/BEROctetStringGenerator.cs rename to src/BouncyCastle/asn1/BEROctetStringGenerator.cs diff --git a/crypto/src/asn1/BEROctetStringParser.cs b/src/BouncyCastle/asn1/BEROctetStringParser.cs similarity index 100% rename from crypto/src/asn1/BEROctetStringParser.cs rename to src/BouncyCastle/asn1/BEROctetStringParser.cs diff --git a/crypto/src/asn1/BERSequenceGenerator.cs b/src/BouncyCastle/asn1/BERSequenceGenerator.cs similarity index 100% rename from crypto/src/asn1/BERSequenceGenerator.cs rename to src/BouncyCastle/asn1/BERSequenceGenerator.cs diff --git a/crypto/src/asn1/BERSequenceParser.cs b/src/BouncyCastle/asn1/BERSequenceParser.cs similarity index 100% rename from crypto/src/asn1/BERSequenceParser.cs rename to src/BouncyCastle/asn1/BERSequenceParser.cs diff --git a/crypto/src/asn1/BERSetGenerator.cs b/src/BouncyCastle/asn1/BERSetGenerator.cs similarity index 100% rename from crypto/src/asn1/BERSetGenerator.cs rename to src/BouncyCastle/asn1/BERSetGenerator.cs diff --git a/crypto/src/asn1/BERSetParser.cs b/src/BouncyCastle/asn1/BERSetParser.cs similarity index 100% rename from crypto/src/asn1/BERSetParser.cs rename to src/BouncyCastle/asn1/BERSetParser.cs diff --git a/crypto/src/asn1/BERTaggedObjectParser.cs b/src/BouncyCastle/asn1/BERTaggedObjectParser.cs similarity index 100% rename from crypto/src/asn1/BERTaggedObjectParser.cs rename to src/BouncyCastle/asn1/BERTaggedObjectParser.cs diff --git a/crypto/src/asn1/BerApplicationSpecific.cs b/src/BouncyCastle/asn1/BerApplicationSpecific.cs similarity index 100% rename from crypto/src/asn1/BerApplicationSpecific.cs rename to src/BouncyCastle/asn1/BerApplicationSpecific.cs diff --git a/crypto/src/asn1/BerApplicationSpecificParser.cs b/src/BouncyCastle/asn1/BerApplicationSpecificParser.cs similarity index 100% rename from crypto/src/asn1/BerApplicationSpecificParser.cs rename to src/BouncyCastle/asn1/BerApplicationSpecificParser.cs diff --git a/crypto/src/asn1/BerNull.cs b/src/BouncyCastle/asn1/BerNull.cs similarity index 100% rename from crypto/src/asn1/BerNull.cs rename to src/BouncyCastle/asn1/BerNull.cs diff --git a/crypto/src/asn1/BerOctetString.cs b/src/BouncyCastle/asn1/BerOctetString.cs similarity index 100% rename from crypto/src/asn1/BerOctetString.cs rename to src/BouncyCastle/asn1/BerOctetString.cs diff --git a/crypto/src/asn1/BerOutputStream.cs b/src/BouncyCastle/asn1/BerOutputStream.cs similarity index 100% rename from crypto/src/asn1/BerOutputStream.cs rename to src/BouncyCastle/asn1/BerOutputStream.cs diff --git a/crypto/src/asn1/BerSequence.cs b/src/BouncyCastle/asn1/BerSequence.cs similarity index 100% rename from crypto/src/asn1/BerSequence.cs rename to src/BouncyCastle/asn1/BerSequence.cs diff --git a/crypto/src/asn1/BerSet.cs b/src/BouncyCastle/asn1/BerSet.cs similarity index 100% rename from crypto/src/asn1/BerSet.cs rename to src/BouncyCastle/asn1/BerSet.cs diff --git a/crypto/src/asn1/BerTaggedObject.cs b/src/BouncyCastle/asn1/BerTaggedObject.cs similarity index 100% rename from crypto/src/asn1/BerTaggedObject.cs rename to src/BouncyCastle/asn1/BerTaggedObject.cs diff --git a/crypto/src/asn1/ConstructedOctetStream.cs b/src/BouncyCastle/asn1/ConstructedOctetStream.cs similarity index 100% rename from crypto/src/asn1/ConstructedOctetStream.cs rename to src/BouncyCastle/asn1/ConstructedOctetStream.cs diff --git a/crypto/src/asn1/DERExternal.cs b/src/BouncyCastle/asn1/DERExternal.cs similarity index 100% rename from crypto/src/asn1/DERExternal.cs rename to src/BouncyCastle/asn1/DERExternal.cs diff --git a/crypto/src/asn1/DERExternalParser.cs b/src/BouncyCastle/asn1/DERExternalParser.cs similarity index 100% rename from crypto/src/asn1/DERExternalParser.cs rename to src/BouncyCastle/asn1/DERExternalParser.cs diff --git a/crypto/src/asn1/DERGenerator.cs b/src/BouncyCastle/asn1/DERGenerator.cs similarity index 100% rename from crypto/src/asn1/DERGenerator.cs rename to src/BouncyCastle/asn1/DERGenerator.cs diff --git a/crypto/src/asn1/DEROctetStringParser.cs b/src/BouncyCastle/asn1/DEROctetStringParser.cs similarity index 100% rename from crypto/src/asn1/DEROctetStringParser.cs rename to src/BouncyCastle/asn1/DEROctetStringParser.cs diff --git a/crypto/src/asn1/DERSequenceGenerator.cs b/src/BouncyCastle/asn1/DERSequenceGenerator.cs similarity index 100% rename from crypto/src/asn1/DERSequenceGenerator.cs rename to src/BouncyCastle/asn1/DERSequenceGenerator.cs diff --git a/crypto/src/asn1/DERSequenceParser.cs b/src/BouncyCastle/asn1/DERSequenceParser.cs similarity index 100% rename from crypto/src/asn1/DERSequenceParser.cs rename to src/BouncyCastle/asn1/DERSequenceParser.cs diff --git a/crypto/src/asn1/DERSetGenerator.cs b/src/BouncyCastle/asn1/DERSetGenerator.cs similarity index 100% rename from crypto/src/asn1/DERSetGenerator.cs rename to src/BouncyCastle/asn1/DERSetGenerator.cs diff --git a/crypto/src/asn1/DERSetParser.cs b/src/BouncyCastle/asn1/DERSetParser.cs similarity index 100% rename from crypto/src/asn1/DERSetParser.cs rename to src/BouncyCastle/asn1/DERSetParser.cs diff --git a/crypto/src/asn1/DefiniteLengthInputStream.cs b/src/BouncyCastle/asn1/DefiniteLengthInputStream.cs similarity index 100% rename from crypto/src/asn1/DefiniteLengthInputStream.cs rename to src/BouncyCastle/asn1/DefiniteLengthInputStream.cs diff --git a/crypto/src/asn1/DerApplicationSpecific.cs b/src/BouncyCastle/asn1/DerApplicationSpecific.cs similarity index 100% rename from crypto/src/asn1/DerApplicationSpecific.cs rename to src/BouncyCastle/asn1/DerApplicationSpecific.cs diff --git a/crypto/src/asn1/DerBMPString.cs b/src/BouncyCastle/asn1/DerBMPString.cs similarity index 100% rename from crypto/src/asn1/DerBMPString.cs rename to src/BouncyCastle/asn1/DerBMPString.cs diff --git a/crypto/src/asn1/DerBitString.cs b/src/BouncyCastle/asn1/DerBitString.cs similarity index 100% rename from crypto/src/asn1/DerBitString.cs rename to src/BouncyCastle/asn1/DerBitString.cs diff --git a/crypto/src/asn1/DerBoolean.cs b/src/BouncyCastle/asn1/DerBoolean.cs similarity index 100% rename from crypto/src/asn1/DerBoolean.cs rename to src/BouncyCastle/asn1/DerBoolean.cs diff --git a/crypto/src/asn1/DerEnumerated.cs b/src/BouncyCastle/asn1/DerEnumerated.cs similarity index 100% rename from crypto/src/asn1/DerEnumerated.cs rename to src/BouncyCastle/asn1/DerEnumerated.cs diff --git a/crypto/src/asn1/DerGeneralString.cs b/src/BouncyCastle/asn1/DerGeneralString.cs similarity index 100% rename from crypto/src/asn1/DerGeneralString.cs rename to src/BouncyCastle/asn1/DerGeneralString.cs diff --git a/crypto/src/asn1/DerGeneralizedTime.cs b/src/BouncyCastle/asn1/DerGeneralizedTime.cs similarity index 100% rename from crypto/src/asn1/DerGeneralizedTime.cs rename to src/BouncyCastle/asn1/DerGeneralizedTime.cs diff --git a/crypto/src/asn1/DerGraphicString.cs b/src/BouncyCastle/asn1/DerGraphicString.cs similarity index 100% rename from crypto/src/asn1/DerGraphicString.cs rename to src/BouncyCastle/asn1/DerGraphicString.cs diff --git a/crypto/src/asn1/DerIA5String.cs b/src/BouncyCastle/asn1/DerIA5String.cs similarity index 100% rename from crypto/src/asn1/DerIA5String.cs rename to src/BouncyCastle/asn1/DerIA5String.cs diff --git a/crypto/src/asn1/DerInteger.cs b/src/BouncyCastle/asn1/DerInteger.cs similarity index 100% rename from crypto/src/asn1/DerInteger.cs rename to src/BouncyCastle/asn1/DerInteger.cs diff --git a/crypto/src/asn1/DerNull.cs b/src/BouncyCastle/asn1/DerNull.cs similarity index 100% rename from crypto/src/asn1/DerNull.cs rename to src/BouncyCastle/asn1/DerNull.cs diff --git a/crypto/src/asn1/DerNumericString.cs b/src/BouncyCastle/asn1/DerNumericString.cs similarity index 100% rename from crypto/src/asn1/DerNumericString.cs rename to src/BouncyCastle/asn1/DerNumericString.cs diff --git a/crypto/src/asn1/DerObjectIdentifier.cs b/src/BouncyCastle/asn1/DerObjectIdentifier.cs similarity index 100% rename from crypto/src/asn1/DerObjectIdentifier.cs rename to src/BouncyCastle/asn1/DerObjectIdentifier.cs diff --git a/crypto/src/asn1/DerOctetString.cs b/src/BouncyCastle/asn1/DerOctetString.cs similarity index 100% rename from crypto/src/asn1/DerOctetString.cs rename to src/BouncyCastle/asn1/DerOctetString.cs diff --git a/crypto/src/asn1/DerOutputStream.cs b/src/BouncyCastle/asn1/DerOutputStream.cs similarity index 100% rename from crypto/src/asn1/DerOutputStream.cs rename to src/BouncyCastle/asn1/DerOutputStream.cs diff --git a/crypto/src/asn1/DerPrintableString.cs b/src/BouncyCastle/asn1/DerPrintableString.cs similarity index 100% rename from crypto/src/asn1/DerPrintableString.cs rename to src/BouncyCastle/asn1/DerPrintableString.cs diff --git a/crypto/src/asn1/DerSequence.cs b/src/BouncyCastle/asn1/DerSequence.cs similarity index 100% rename from crypto/src/asn1/DerSequence.cs rename to src/BouncyCastle/asn1/DerSequence.cs diff --git a/crypto/src/asn1/DerSet.cs b/src/BouncyCastle/asn1/DerSet.cs similarity index 100% rename from crypto/src/asn1/DerSet.cs rename to src/BouncyCastle/asn1/DerSet.cs diff --git a/crypto/src/asn1/DerStringBase.cs b/src/BouncyCastle/asn1/DerStringBase.cs similarity index 100% rename from crypto/src/asn1/DerStringBase.cs rename to src/BouncyCastle/asn1/DerStringBase.cs diff --git a/crypto/src/asn1/DerT61String.cs b/src/BouncyCastle/asn1/DerT61String.cs similarity index 100% rename from crypto/src/asn1/DerT61String.cs rename to src/BouncyCastle/asn1/DerT61String.cs diff --git a/crypto/src/asn1/DerTaggedObject.cs b/src/BouncyCastle/asn1/DerTaggedObject.cs similarity index 100% rename from crypto/src/asn1/DerTaggedObject.cs rename to src/BouncyCastle/asn1/DerTaggedObject.cs diff --git a/crypto/src/asn1/DerUTCTime.cs b/src/BouncyCastle/asn1/DerUTCTime.cs similarity index 100% rename from crypto/src/asn1/DerUTCTime.cs rename to src/BouncyCastle/asn1/DerUTCTime.cs diff --git a/crypto/src/asn1/DerUTF8String.cs b/src/BouncyCastle/asn1/DerUTF8String.cs similarity index 100% rename from crypto/src/asn1/DerUTF8String.cs rename to src/BouncyCastle/asn1/DerUTF8String.cs diff --git a/crypto/src/asn1/DerUniversalString.cs b/src/BouncyCastle/asn1/DerUniversalString.cs similarity index 100% rename from crypto/src/asn1/DerUniversalString.cs rename to src/BouncyCastle/asn1/DerUniversalString.cs diff --git a/crypto/src/asn1/DerVideotexString.cs b/src/BouncyCastle/asn1/DerVideotexString.cs similarity index 100% rename from crypto/src/asn1/DerVideotexString.cs rename to src/BouncyCastle/asn1/DerVideotexString.cs diff --git a/crypto/src/asn1/DerVisibleString.cs b/src/BouncyCastle/asn1/DerVisibleString.cs similarity index 100% rename from crypto/src/asn1/DerVisibleString.cs rename to src/BouncyCastle/asn1/DerVisibleString.cs diff --git a/crypto/src/asn1/IAsn1ApplicationSpecificParser.cs b/src/BouncyCastle/asn1/IAsn1ApplicationSpecificParser.cs similarity index 100% rename from crypto/src/asn1/IAsn1ApplicationSpecificParser.cs rename to src/BouncyCastle/asn1/IAsn1ApplicationSpecificParser.cs diff --git a/crypto/src/asn1/IAsn1Choice.cs b/src/BouncyCastle/asn1/IAsn1Choice.cs similarity index 100% rename from crypto/src/asn1/IAsn1Choice.cs rename to src/BouncyCastle/asn1/IAsn1Choice.cs diff --git a/crypto/src/asn1/IAsn1Convertible.cs b/src/BouncyCastle/asn1/IAsn1Convertible.cs similarity index 100% rename from crypto/src/asn1/IAsn1Convertible.cs rename to src/BouncyCastle/asn1/IAsn1Convertible.cs diff --git a/crypto/src/asn1/IAsn1String.cs b/src/BouncyCastle/asn1/IAsn1String.cs similarity index 100% rename from crypto/src/asn1/IAsn1String.cs rename to src/BouncyCastle/asn1/IAsn1String.cs diff --git a/crypto/src/asn1/IndefiniteLengthInputStream.cs b/src/BouncyCastle/asn1/IndefiniteLengthInputStream.cs similarity index 100% rename from crypto/src/asn1/IndefiniteLengthInputStream.cs rename to src/BouncyCastle/asn1/IndefiniteLengthInputStream.cs diff --git a/crypto/src/asn1/LazyASN1InputStream.cs b/src/BouncyCastle/asn1/LazyASN1InputStream.cs similarity index 100% rename from crypto/src/asn1/LazyASN1InputStream.cs rename to src/BouncyCastle/asn1/LazyASN1InputStream.cs diff --git a/crypto/src/asn1/LazyDERSequence.cs b/src/BouncyCastle/asn1/LazyDERSequence.cs similarity index 100% rename from crypto/src/asn1/LazyDERSequence.cs rename to src/BouncyCastle/asn1/LazyDERSequence.cs diff --git a/crypto/src/asn1/LazyDERSet.cs b/src/BouncyCastle/asn1/LazyDERSet.cs similarity index 100% rename from crypto/src/asn1/LazyDERSet.cs rename to src/BouncyCastle/asn1/LazyDERSet.cs diff --git a/crypto/src/asn1/LimitedInputStream.cs b/src/BouncyCastle/asn1/LimitedInputStream.cs similarity index 100% rename from crypto/src/asn1/LimitedInputStream.cs rename to src/BouncyCastle/asn1/LimitedInputStream.cs diff --git a/crypto/src/asn1/OidTokenizer.cs b/src/BouncyCastle/asn1/OidTokenizer.cs similarity index 100% rename from crypto/src/asn1/OidTokenizer.cs rename to src/BouncyCastle/asn1/OidTokenizer.cs diff --git a/crypto/src/asn1/anssi/ANSSINamedCurves.cs b/src/BouncyCastle/asn1/anssi/ANSSINamedCurves.cs similarity index 100% rename from crypto/src/asn1/anssi/ANSSINamedCurves.cs rename to src/BouncyCastle/asn1/anssi/ANSSINamedCurves.cs diff --git a/crypto/src/asn1/anssi/ANSSIObjectIdentifiers.cs b/src/BouncyCastle/asn1/anssi/ANSSIObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/anssi/ANSSIObjectIdentifiers.cs rename to src/BouncyCastle/asn1/anssi/ANSSIObjectIdentifiers.cs diff --git a/crypto/src/asn1/bc/BCObjectIdentifiers.cs b/src/BouncyCastle/asn1/bc/BCObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/bc/BCObjectIdentifiers.cs rename to src/BouncyCastle/asn1/bc/BCObjectIdentifiers.cs diff --git a/crypto/src/asn1/bsi/BsiObjectIdentifiers.cs b/src/BouncyCastle/asn1/bsi/BsiObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/bsi/BsiObjectIdentifiers.cs rename to src/BouncyCastle/asn1/bsi/BsiObjectIdentifiers.cs diff --git a/crypto/src/asn1/cmp/CAKeyUpdAnnContent.cs b/src/BouncyCastle/asn1/cmp/CAKeyUpdAnnContent.cs similarity index 100% rename from crypto/src/asn1/cmp/CAKeyUpdAnnContent.cs rename to src/BouncyCastle/asn1/cmp/CAKeyUpdAnnContent.cs diff --git a/crypto/src/asn1/cmp/CertConfirmContent.cs b/src/BouncyCastle/asn1/cmp/CertConfirmContent.cs similarity index 100% rename from crypto/src/asn1/cmp/CertConfirmContent.cs rename to src/BouncyCastle/asn1/cmp/CertConfirmContent.cs diff --git a/crypto/src/asn1/cmp/CertOrEncCert.cs b/src/BouncyCastle/asn1/cmp/CertOrEncCert.cs similarity index 100% rename from crypto/src/asn1/cmp/CertOrEncCert.cs rename to src/BouncyCastle/asn1/cmp/CertOrEncCert.cs diff --git a/crypto/src/asn1/cmp/CertRepMessage.cs b/src/BouncyCastle/asn1/cmp/CertRepMessage.cs similarity index 100% rename from crypto/src/asn1/cmp/CertRepMessage.cs rename to src/BouncyCastle/asn1/cmp/CertRepMessage.cs diff --git a/crypto/src/asn1/cmp/CertResponse.cs b/src/BouncyCastle/asn1/cmp/CertResponse.cs similarity index 100% rename from crypto/src/asn1/cmp/CertResponse.cs rename to src/BouncyCastle/asn1/cmp/CertResponse.cs diff --git a/crypto/src/asn1/cmp/CertStatus.cs b/src/BouncyCastle/asn1/cmp/CertStatus.cs similarity index 100% rename from crypto/src/asn1/cmp/CertStatus.cs rename to src/BouncyCastle/asn1/cmp/CertStatus.cs diff --git a/crypto/src/asn1/cmp/CertifiedKeyPair.cs b/src/BouncyCastle/asn1/cmp/CertifiedKeyPair.cs similarity index 100% rename from crypto/src/asn1/cmp/CertifiedKeyPair.cs rename to src/BouncyCastle/asn1/cmp/CertifiedKeyPair.cs diff --git a/crypto/src/asn1/cmp/Challenge.cs b/src/BouncyCastle/asn1/cmp/Challenge.cs similarity index 100% rename from crypto/src/asn1/cmp/Challenge.cs rename to src/BouncyCastle/asn1/cmp/Challenge.cs diff --git a/crypto/src/asn1/cmp/CmpCertificate.cs b/src/BouncyCastle/asn1/cmp/CmpCertificate.cs similarity index 100% rename from crypto/src/asn1/cmp/CmpCertificate.cs rename to src/BouncyCastle/asn1/cmp/CmpCertificate.cs diff --git a/crypto/src/asn1/cmp/CmpObjectIdentifiers.cs b/src/BouncyCastle/asn1/cmp/CmpObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/cmp/CmpObjectIdentifiers.cs rename to src/BouncyCastle/asn1/cmp/CmpObjectIdentifiers.cs diff --git a/crypto/src/asn1/cmp/CrlAnnContent.cs b/src/BouncyCastle/asn1/cmp/CrlAnnContent.cs similarity index 100% rename from crypto/src/asn1/cmp/CrlAnnContent.cs rename to src/BouncyCastle/asn1/cmp/CrlAnnContent.cs diff --git a/crypto/src/asn1/cmp/ErrorMsgContent.cs b/src/BouncyCastle/asn1/cmp/ErrorMsgContent.cs similarity index 100% rename from crypto/src/asn1/cmp/ErrorMsgContent.cs rename to src/BouncyCastle/asn1/cmp/ErrorMsgContent.cs diff --git a/crypto/src/asn1/cmp/GenMsgContent.cs b/src/BouncyCastle/asn1/cmp/GenMsgContent.cs similarity index 100% rename from crypto/src/asn1/cmp/GenMsgContent.cs rename to src/BouncyCastle/asn1/cmp/GenMsgContent.cs diff --git a/crypto/src/asn1/cmp/GenRepContent.cs b/src/BouncyCastle/asn1/cmp/GenRepContent.cs similarity index 100% rename from crypto/src/asn1/cmp/GenRepContent.cs rename to src/BouncyCastle/asn1/cmp/GenRepContent.cs diff --git a/crypto/src/asn1/cmp/InfoTypeAndValue.cs b/src/BouncyCastle/asn1/cmp/InfoTypeAndValue.cs similarity index 100% rename from crypto/src/asn1/cmp/InfoTypeAndValue.cs rename to src/BouncyCastle/asn1/cmp/InfoTypeAndValue.cs diff --git a/crypto/src/asn1/cmp/KeyRecRepContent.cs b/src/BouncyCastle/asn1/cmp/KeyRecRepContent.cs similarity index 100% rename from crypto/src/asn1/cmp/KeyRecRepContent.cs rename to src/BouncyCastle/asn1/cmp/KeyRecRepContent.cs diff --git a/crypto/src/asn1/cmp/OobCertHash.cs b/src/BouncyCastle/asn1/cmp/OobCertHash.cs similarity index 100% rename from crypto/src/asn1/cmp/OobCertHash.cs rename to src/BouncyCastle/asn1/cmp/OobCertHash.cs diff --git a/crypto/src/asn1/cmp/PKIBody.cs b/src/BouncyCastle/asn1/cmp/PKIBody.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIBody.cs rename to src/BouncyCastle/asn1/cmp/PKIBody.cs diff --git a/crypto/src/asn1/cmp/PKIConfirmContent.cs b/src/BouncyCastle/asn1/cmp/PKIConfirmContent.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIConfirmContent.cs rename to src/BouncyCastle/asn1/cmp/PKIConfirmContent.cs diff --git a/crypto/src/asn1/cmp/PKIFailureInfo.cs b/src/BouncyCastle/asn1/cmp/PKIFailureInfo.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIFailureInfo.cs rename to src/BouncyCastle/asn1/cmp/PKIFailureInfo.cs diff --git a/crypto/src/asn1/cmp/PKIFreeText.cs b/src/BouncyCastle/asn1/cmp/PKIFreeText.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIFreeText.cs rename to src/BouncyCastle/asn1/cmp/PKIFreeText.cs diff --git a/crypto/src/asn1/cmp/PKIHeader.cs b/src/BouncyCastle/asn1/cmp/PKIHeader.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIHeader.cs rename to src/BouncyCastle/asn1/cmp/PKIHeader.cs diff --git a/crypto/src/asn1/cmp/PKIHeaderBuilder.cs b/src/BouncyCastle/asn1/cmp/PKIHeaderBuilder.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIHeaderBuilder.cs rename to src/BouncyCastle/asn1/cmp/PKIHeaderBuilder.cs diff --git a/crypto/src/asn1/cmp/PKIMessage.cs b/src/BouncyCastle/asn1/cmp/PKIMessage.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIMessage.cs rename to src/BouncyCastle/asn1/cmp/PKIMessage.cs diff --git a/crypto/src/asn1/cmp/PKIMessages.cs b/src/BouncyCastle/asn1/cmp/PKIMessages.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIMessages.cs rename to src/BouncyCastle/asn1/cmp/PKIMessages.cs diff --git a/crypto/src/asn1/cmp/PKIStatus.cs b/src/BouncyCastle/asn1/cmp/PKIStatus.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIStatus.cs rename to src/BouncyCastle/asn1/cmp/PKIStatus.cs diff --git a/crypto/src/asn1/cmp/PKIStatusInfo.cs b/src/BouncyCastle/asn1/cmp/PKIStatusInfo.cs similarity index 100% rename from crypto/src/asn1/cmp/PKIStatusInfo.cs rename to src/BouncyCastle/asn1/cmp/PKIStatusInfo.cs diff --git a/crypto/src/asn1/cmp/PbmParameter.cs b/src/BouncyCastle/asn1/cmp/PbmParameter.cs similarity index 100% rename from crypto/src/asn1/cmp/PbmParameter.cs rename to src/BouncyCastle/asn1/cmp/PbmParameter.cs diff --git a/crypto/src/asn1/cmp/PollRepContent.cs b/src/BouncyCastle/asn1/cmp/PollRepContent.cs similarity index 100% rename from crypto/src/asn1/cmp/PollRepContent.cs rename to src/BouncyCastle/asn1/cmp/PollRepContent.cs diff --git a/crypto/src/asn1/cmp/PollReqContent.cs b/src/BouncyCastle/asn1/cmp/PollReqContent.cs similarity index 100% rename from crypto/src/asn1/cmp/PollReqContent.cs rename to src/BouncyCastle/asn1/cmp/PollReqContent.cs diff --git a/crypto/src/asn1/cmp/PopoDecKeyChallContent.cs b/src/BouncyCastle/asn1/cmp/PopoDecKeyChallContent.cs similarity index 100% rename from crypto/src/asn1/cmp/PopoDecKeyChallContent.cs rename to src/BouncyCastle/asn1/cmp/PopoDecKeyChallContent.cs diff --git a/crypto/src/asn1/cmp/PopoDecKeyRespContent.cs b/src/BouncyCastle/asn1/cmp/PopoDecKeyRespContent.cs similarity index 100% rename from crypto/src/asn1/cmp/PopoDecKeyRespContent.cs rename to src/BouncyCastle/asn1/cmp/PopoDecKeyRespContent.cs diff --git a/crypto/src/asn1/cmp/ProtectedPart.cs b/src/BouncyCastle/asn1/cmp/ProtectedPart.cs similarity index 100% rename from crypto/src/asn1/cmp/ProtectedPart.cs rename to src/BouncyCastle/asn1/cmp/ProtectedPart.cs diff --git a/crypto/src/asn1/cmp/RevAnnContent.cs b/src/BouncyCastle/asn1/cmp/RevAnnContent.cs similarity index 100% rename from crypto/src/asn1/cmp/RevAnnContent.cs rename to src/BouncyCastle/asn1/cmp/RevAnnContent.cs diff --git a/crypto/src/asn1/cmp/RevDetails.cs b/src/BouncyCastle/asn1/cmp/RevDetails.cs similarity index 100% rename from crypto/src/asn1/cmp/RevDetails.cs rename to src/BouncyCastle/asn1/cmp/RevDetails.cs diff --git a/crypto/src/asn1/cmp/RevRepContent.cs b/src/BouncyCastle/asn1/cmp/RevRepContent.cs similarity index 100% rename from crypto/src/asn1/cmp/RevRepContent.cs rename to src/BouncyCastle/asn1/cmp/RevRepContent.cs diff --git a/crypto/src/asn1/cmp/RevRepContentBuilder.cs b/src/BouncyCastle/asn1/cmp/RevRepContentBuilder.cs similarity index 100% rename from crypto/src/asn1/cmp/RevRepContentBuilder.cs rename to src/BouncyCastle/asn1/cmp/RevRepContentBuilder.cs diff --git a/crypto/src/asn1/cmp/RevReqContent.cs b/src/BouncyCastle/asn1/cmp/RevReqContent.cs similarity index 100% rename from crypto/src/asn1/cmp/RevReqContent.cs rename to src/BouncyCastle/asn1/cmp/RevReqContent.cs diff --git a/crypto/src/asn1/cms/Attribute.cs b/src/BouncyCastle/asn1/cms/Attribute.cs similarity index 100% rename from crypto/src/asn1/cms/Attribute.cs rename to src/BouncyCastle/asn1/cms/Attribute.cs diff --git a/crypto/src/asn1/cms/AttributeTable.cs b/src/BouncyCastle/asn1/cms/AttributeTable.cs similarity index 100% rename from crypto/src/asn1/cms/AttributeTable.cs rename to src/BouncyCastle/asn1/cms/AttributeTable.cs diff --git a/crypto/src/asn1/cms/Attributes.cs b/src/BouncyCastle/asn1/cms/Attributes.cs similarity index 100% rename from crypto/src/asn1/cms/Attributes.cs rename to src/BouncyCastle/asn1/cms/Attributes.cs diff --git a/crypto/src/asn1/cms/AuthEnvelopedData.cs b/src/BouncyCastle/asn1/cms/AuthEnvelopedData.cs similarity index 100% rename from crypto/src/asn1/cms/AuthEnvelopedData.cs rename to src/BouncyCastle/asn1/cms/AuthEnvelopedData.cs diff --git a/crypto/src/asn1/cms/AuthEnvelopedDataParser.cs b/src/BouncyCastle/asn1/cms/AuthEnvelopedDataParser.cs similarity index 100% rename from crypto/src/asn1/cms/AuthEnvelopedDataParser.cs rename to src/BouncyCastle/asn1/cms/AuthEnvelopedDataParser.cs diff --git a/crypto/src/asn1/cms/AuthenticatedData.cs b/src/BouncyCastle/asn1/cms/AuthenticatedData.cs similarity index 100% rename from crypto/src/asn1/cms/AuthenticatedData.cs rename to src/BouncyCastle/asn1/cms/AuthenticatedData.cs diff --git a/crypto/src/asn1/cms/AuthenticatedDataParser.cs b/src/BouncyCastle/asn1/cms/AuthenticatedDataParser.cs similarity index 100% rename from crypto/src/asn1/cms/AuthenticatedDataParser.cs rename to src/BouncyCastle/asn1/cms/AuthenticatedDataParser.cs diff --git a/crypto/src/asn1/cms/CMSAttributes.cs b/src/BouncyCastle/asn1/cms/CMSAttributes.cs similarity index 100% rename from crypto/src/asn1/cms/CMSAttributes.cs rename to src/BouncyCastle/asn1/cms/CMSAttributes.cs diff --git a/crypto/src/asn1/cms/CMSObjectIdentifiers.cs b/src/BouncyCastle/asn1/cms/CMSObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/cms/CMSObjectIdentifiers.cs rename to src/BouncyCastle/asn1/cms/CMSObjectIdentifiers.cs diff --git a/crypto/src/asn1/cms/CompressedData.cs b/src/BouncyCastle/asn1/cms/CompressedData.cs similarity index 100% rename from crypto/src/asn1/cms/CompressedData.cs rename to src/BouncyCastle/asn1/cms/CompressedData.cs diff --git a/crypto/src/asn1/cms/CompressedDataParser.cs b/src/BouncyCastle/asn1/cms/CompressedDataParser.cs similarity index 100% rename from crypto/src/asn1/cms/CompressedDataParser.cs rename to src/BouncyCastle/asn1/cms/CompressedDataParser.cs diff --git a/crypto/src/asn1/cms/ContentInfo.cs b/src/BouncyCastle/asn1/cms/ContentInfo.cs similarity index 100% rename from crypto/src/asn1/cms/ContentInfo.cs rename to src/BouncyCastle/asn1/cms/ContentInfo.cs diff --git a/crypto/src/asn1/cms/ContentInfoParser.cs b/src/BouncyCastle/asn1/cms/ContentInfoParser.cs similarity index 100% rename from crypto/src/asn1/cms/ContentInfoParser.cs rename to src/BouncyCastle/asn1/cms/ContentInfoParser.cs diff --git a/crypto/src/asn1/cms/EncryptedContentInfo.cs b/src/BouncyCastle/asn1/cms/EncryptedContentInfo.cs similarity index 100% rename from crypto/src/asn1/cms/EncryptedContentInfo.cs rename to src/BouncyCastle/asn1/cms/EncryptedContentInfo.cs diff --git a/crypto/src/asn1/cms/EncryptedContentInfoParser.cs b/src/BouncyCastle/asn1/cms/EncryptedContentInfoParser.cs similarity index 100% rename from crypto/src/asn1/cms/EncryptedContentInfoParser.cs rename to src/BouncyCastle/asn1/cms/EncryptedContentInfoParser.cs diff --git a/crypto/src/asn1/cms/EncryptedData.cs b/src/BouncyCastle/asn1/cms/EncryptedData.cs similarity index 100% rename from crypto/src/asn1/cms/EncryptedData.cs rename to src/BouncyCastle/asn1/cms/EncryptedData.cs diff --git a/crypto/src/asn1/cms/EnvelopedData.cs b/src/BouncyCastle/asn1/cms/EnvelopedData.cs similarity index 100% rename from crypto/src/asn1/cms/EnvelopedData.cs rename to src/BouncyCastle/asn1/cms/EnvelopedData.cs diff --git a/crypto/src/asn1/cms/EnvelopedDataParser.cs b/src/BouncyCastle/asn1/cms/EnvelopedDataParser.cs similarity index 100% rename from crypto/src/asn1/cms/EnvelopedDataParser.cs rename to src/BouncyCastle/asn1/cms/EnvelopedDataParser.cs diff --git a/crypto/src/asn1/cms/Evidence.cs b/src/BouncyCastle/asn1/cms/Evidence.cs similarity index 100% rename from crypto/src/asn1/cms/Evidence.cs rename to src/BouncyCastle/asn1/cms/Evidence.cs diff --git a/crypto/src/asn1/cms/IssuerAndSerialNumber.cs b/src/BouncyCastle/asn1/cms/IssuerAndSerialNumber.cs similarity index 100% rename from crypto/src/asn1/cms/IssuerAndSerialNumber.cs rename to src/BouncyCastle/asn1/cms/IssuerAndSerialNumber.cs diff --git a/crypto/src/asn1/cms/KEKIdentifier.cs b/src/BouncyCastle/asn1/cms/KEKIdentifier.cs similarity index 100% rename from crypto/src/asn1/cms/KEKIdentifier.cs rename to src/BouncyCastle/asn1/cms/KEKIdentifier.cs diff --git a/crypto/src/asn1/cms/KEKRecipientInfo.cs b/src/BouncyCastle/asn1/cms/KEKRecipientInfo.cs similarity index 100% rename from crypto/src/asn1/cms/KEKRecipientInfo.cs rename to src/BouncyCastle/asn1/cms/KEKRecipientInfo.cs diff --git a/crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs b/src/BouncyCastle/asn1/cms/KeyAgreeRecipientIdentifier.cs similarity index 100% rename from crypto/src/asn1/cms/KeyAgreeRecipientIdentifier.cs rename to src/BouncyCastle/asn1/cms/KeyAgreeRecipientIdentifier.cs diff --git a/crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs b/src/BouncyCastle/asn1/cms/KeyAgreeRecipientInfo.cs similarity index 100% rename from crypto/src/asn1/cms/KeyAgreeRecipientInfo.cs rename to src/BouncyCastle/asn1/cms/KeyAgreeRecipientInfo.cs diff --git a/crypto/src/asn1/cms/KeyTransRecipientInfo.cs b/src/BouncyCastle/asn1/cms/KeyTransRecipientInfo.cs similarity index 100% rename from crypto/src/asn1/cms/KeyTransRecipientInfo.cs rename to src/BouncyCastle/asn1/cms/KeyTransRecipientInfo.cs diff --git a/crypto/src/asn1/cms/MetaData.cs b/src/BouncyCastle/asn1/cms/MetaData.cs similarity index 100% rename from crypto/src/asn1/cms/MetaData.cs rename to src/BouncyCastle/asn1/cms/MetaData.cs diff --git a/crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs b/src/BouncyCastle/asn1/cms/OriginatorIdentifierOrKey.cs similarity index 100% rename from crypto/src/asn1/cms/OriginatorIdentifierOrKey.cs rename to src/BouncyCastle/asn1/cms/OriginatorIdentifierOrKey.cs diff --git a/crypto/src/asn1/cms/OriginatorInfo.cs b/src/BouncyCastle/asn1/cms/OriginatorInfo.cs similarity index 100% rename from crypto/src/asn1/cms/OriginatorInfo.cs rename to src/BouncyCastle/asn1/cms/OriginatorInfo.cs diff --git a/crypto/src/asn1/cms/OriginatorPublicKey.cs b/src/BouncyCastle/asn1/cms/OriginatorPublicKey.cs similarity index 100% rename from crypto/src/asn1/cms/OriginatorPublicKey.cs rename to src/BouncyCastle/asn1/cms/OriginatorPublicKey.cs diff --git a/crypto/src/asn1/cms/OtherKeyAttribute.cs b/src/BouncyCastle/asn1/cms/OtherKeyAttribute.cs similarity index 100% rename from crypto/src/asn1/cms/OtherKeyAttribute.cs rename to src/BouncyCastle/asn1/cms/OtherKeyAttribute.cs diff --git a/crypto/src/asn1/cms/OtherRecipientInfo.cs b/src/BouncyCastle/asn1/cms/OtherRecipientInfo.cs similarity index 100% rename from crypto/src/asn1/cms/OtherRecipientInfo.cs rename to src/BouncyCastle/asn1/cms/OtherRecipientInfo.cs diff --git a/crypto/src/asn1/cms/OtherRevocationInfoFormat.cs b/src/BouncyCastle/asn1/cms/OtherRevocationInfoFormat.cs similarity index 100% rename from crypto/src/asn1/cms/OtherRevocationInfoFormat.cs rename to src/BouncyCastle/asn1/cms/OtherRevocationInfoFormat.cs diff --git a/crypto/src/asn1/cms/PasswordRecipientInfo.cs b/src/BouncyCastle/asn1/cms/PasswordRecipientInfo.cs similarity index 100% rename from crypto/src/asn1/cms/PasswordRecipientInfo.cs rename to src/BouncyCastle/asn1/cms/PasswordRecipientInfo.cs diff --git a/crypto/src/asn1/cms/RecipientEncryptedKey.cs b/src/BouncyCastle/asn1/cms/RecipientEncryptedKey.cs similarity index 100% rename from crypto/src/asn1/cms/RecipientEncryptedKey.cs rename to src/BouncyCastle/asn1/cms/RecipientEncryptedKey.cs diff --git a/crypto/src/asn1/cms/RecipientIdentifier.cs b/src/BouncyCastle/asn1/cms/RecipientIdentifier.cs similarity index 100% rename from crypto/src/asn1/cms/RecipientIdentifier.cs rename to src/BouncyCastle/asn1/cms/RecipientIdentifier.cs diff --git a/crypto/src/asn1/cms/RecipientInfo.cs b/src/BouncyCastle/asn1/cms/RecipientInfo.cs similarity index 100% rename from crypto/src/asn1/cms/RecipientInfo.cs rename to src/BouncyCastle/asn1/cms/RecipientInfo.cs diff --git a/crypto/src/asn1/cms/RecipientKeyIdentifier.cs b/src/BouncyCastle/asn1/cms/RecipientKeyIdentifier.cs similarity index 100% rename from crypto/src/asn1/cms/RecipientKeyIdentifier.cs rename to src/BouncyCastle/asn1/cms/RecipientKeyIdentifier.cs diff --git a/crypto/src/asn1/cms/SCVPReqRes.cs b/src/BouncyCastle/asn1/cms/SCVPReqRes.cs similarity index 100% rename from crypto/src/asn1/cms/SCVPReqRes.cs rename to src/BouncyCastle/asn1/cms/SCVPReqRes.cs diff --git a/crypto/src/asn1/cms/SignedData.cs b/src/BouncyCastle/asn1/cms/SignedData.cs similarity index 100% rename from crypto/src/asn1/cms/SignedData.cs rename to src/BouncyCastle/asn1/cms/SignedData.cs diff --git a/crypto/src/asn1/cms/SignedDataParser.cs b/src/BouncyCastle/asn1/cms/SignedDataParser.cs similarity index 100% rename from crypto/src/asn1/cms/SignedDataParser.cs rename to src/BouncyCastle/asn1/cms/SignedDataParser.cs diff --git a/crypto/src/asn1/cms/SignerIdentifier.cs b/src/BouncyCastle/asn1/cms/SignerIdentifier.cs similarity index 100% rename from crypto/src/asn1/cms/SignerIdentifier.cs rename to src/BouncyCastle/asn1/cms/SignerIdentifier.cs diff --git a/crypto/src/asn1/cms/SignerInfo.cs b/src/BouncyCastle/asn1/cms/SignerInfo.cs similarity index 100% rename from crypto/src/asn1/cms/SignerInfo.cs rename to src/BouncyCastle/asn1/cms/SignerInfo.cs diff --git a/crypto/src/asn1/cms/Time.cs b/src/BouncyCastle/asn1/cms/Time.cs similarity index 100% rename from crypto/src/asn1/cms/Time.cs rename to src/BouncyCastle/asn1/cms/Time.cs diff --git a/crypto/src/asn1/cms/TimeStampAndCRL.cs b/src/BouncyCastle/asn1/cms/TimeStampAndCRL.cs similarity index 100% rename from crypto/src/asn1/cms/TimeStampAndCRL.cs rename to src/BouncyCastle/asn1/cms/TimeStampAndCRL.cs diff --git a/crypto/src/asn1/cms/TimeStampTokenEvidence.cs b/src/BouncyCastle/asn1/cms/TimeStampTokenEvidence.cs similarity index 100% rename from crypto/src/asn1/cms/TimeStampTokenEvidence.cs rename to src/BouncyCastle/asn1/cms/TimeStampTokenEvidence.cs diff --git a/crypto/src/asn1/cms/TimeStampedData.cs b/src/BouncyCastle/asn1/cms/TimeStampedData.cs similarity index 100% rename from crypto/src/asn1/cms/TimeStampedData.cs rename to src/BouncyCastle/asn1/cms/TimeStampedData.cs diff --git a/crypto/src/asn1/cms/TimeStampedDataParser.cs b/src/BouncyCastle/asn1/cms/TimeStampedDataParser.cs similarity index 100% rename from crypto/src/asn1/cms/TimeStampedDataParser.cs rename to src/BouncyCastle/asn1/cms/TimeStampedDataParser.cs diff --git a/crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs b/src/BouncyCastle/asn1/cms/ecc/MQVuserKeyingMaterial.cs similarity index 100% rename from crypto/src/asn1/cms/ecc/MQVuserKeyingMaterial.cs rename to src/BouncyCastle/asn1/cms/ecc/MQVuserKeyingMaterial.cs diff --git a/crypto/src/asn1/crmf/AttributeTypeAndValue.cs b/src/BouncyCastle/asn1/crmf/AttributeTypeAndValue.cs similarity index 100% rename from crypto/src/asn1/crmf/AttributeTypeAndValue.cs rename to src/BouncyCastle/asn1/crmf/AttributeTypeAndValue.cs diff --git a/crypto/src/asn1/crmf/CertId.cs b/src/BouncyCastle/asn1/crmf/CertId.cs similarity index 100% rename from crypto/src/asn1/crmf/CertId.cs rename to src/BouncyCastle/asn1/crmf/CertId.cs diff --git a/crypto/src/asn1/crmf/CertReqMessages.cs b/src/BouncyCastle/asn1/crmf/CertReqMessages.cs similarity index 100% rename from crypto/src/asn1/crmf/CertReqMessages.cs rename to src/BouncyCastle/asn1/crmf/CertReqMessages.cs diff --git a/crypto/src/asn1/crmf/CertReqMsg.cs b/src/BouncyCastle/asn1/crmf/CertReqMsg.cs similarity index 100% rename from crypto/src/asn1/crmf/CertReqMsg.cs rename to src/BouncyCastle/asn1/crmf/CertReqMsg.cs diff --git a/crypto/src/asn1/crmf/CertRequest.cs b/src/BouncyCastle/asn1/crmf/CertRequest.cs similarity index 100% rename from crypto/src/asn1/crmf/CertRequest.cs rename to src/BouncyCastle/asn1/crmf/CertRequest.cs diff --git a/crypto/src/asn1/crmf/CertTemplate.cs b/src/BouncyCastle/asn1/crmf/CertTemplate.cs similarity index 100% rename from crypto/src/asn1/crmf/CertTemplate.cs rename to src/BouncyCastle/asn1/crmf/CertTemplate.cs diff --git a/crypto/src/asn1/crmf/CertTemplateBuilder.cs b/src/BouncyCastle/asn1/crmf/CertTemplateBuilder.cs similarity index 100% rename from crypto/src/asn1/crmf/CertTemplateBuilder.cs rename to src/BouncyCastle/asn1/crmf/CertTemplateBuilder.cs diff --git a/crypto/src/asn1/crmf/Controls.cs b/src/BouncyCastle/asn1/crmf/Controls.cs similarity index 100% rename from crypto/src/asn1/crmf/Controls.cs rename to src/BouncyCastle/asn1/crmf/Controls.cs diff --git a/crypto/src/asn1/crmf/CrmfObjectIdentifiers.cs b/src/BouncyCastle/asn1/crmf/CrmfObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/crmf/CrmfObjectIdentifiers.cs rename to src/BouncyCastle/asn1/crmf/CrmfObjectIdentifiers.cs diff --git a/crypto/src/asn1/crmf/EncKeyWithID.cs b/src/BouncyCastle/asn1/crmf/EncKeyWithID.cs similarity index 100% rename from crypto/src/asn1/crmf/EncKeyWithID.cs rename to src/BouncyCastle/asn1/crmf/EncKeyWithID.cs diff --git a/crypto/src/asn1/crmf/EncryptedKey.cs b/src/BouncyCastle/asn1/crmf/EncryptedKey.cs similarity index 100% rename from crypto/src/asn1/crmf/EncryptedKey.cs rename to src/BouncyCastle/asn1/crmf/EncryptedKey.cs diff --git a/crypto/src/asn1/crmf/EncryptedValue.cs b/src/BouncyCastle/asn1/crmf/EncryptedValue.cs similarity index 100% rename from crypto/src/asn1/crmf/EncryptedValue.cs rename to src/BouncyCastle/asn1/crmf/EncryptedValue.cs diff --git a/crypto/src/asn1/crmf/OptionalValidity.cs b/src/BouncyCastle/asn1/crmf/OptionalValidity.cs similarity index 100% rename from crypto/src/asn1/crmf/OptionalValidity.cs rename to src/BouncyCastle/asn1/crmf/OptionalValidity.cs diff --git a/crypto/src/asn1/crmf/PKIArchiveOptions.cs b/src/BouncyCastle/asn1/crmf/PKIArchiveOptions.cs similarity index 100% rename from crypto/src/asn1/crmf/PKIArchiveOptions.cs rename to src/BouncyCastle/asn1/crmf/PKIArchiveOptions.cs diff --git a/crypto/src/asn1/crmf/PKIPublicationInfo.cs b/src/BouncyCastle/asn1/crmf/PKIPublicationInfo.cs similarity index 100% rename from crypto/src/asn1/crmf/PKIPublicationInfo.cs rename to src/BouncyCastle/asn1/crmf/PKIPublicationInfo.cs diff --git a/crypto/src/asn1/crmf/PKMacValue.cs b/src/BouncyCastle/asn1/crmf/PKMacValue.cs similarity index 100% rename from crypto/src/asn1/crmf/PKMacValue.cs rename to src/BouncyCastle/asn1/crmf/PKMacValue.cs diff --git a/crypto/src/asn1/crmf/PopoPrivKey.cs b/src/BouncyCastle/asn1/crmf/PopoPrivKey.cs similarity index 100% rename from crypto/src/asn1/crmf/PopoPrivKey.cs rename to src/BouncyCastle/asn1/crmf/PopoPrivKey.cs diff --git a/crypto/src/asn1/crmf/PopoSigningKey.cs b/src/BouncyCastle/asn1/crmf/PopoSigningKey.cs similarity index 100% rename from crypto/src/asn1/crmf/PopoSigningKey.cs rename to src/BouncyCastle/asn1/crmf/PopoSigningKey.cs diff --git a/crypto/src/asn1/crmf/PopoSigningKeyInput.cs b/src/BouncyCastle/asn1/crmf/PopoSigningKeyInput.cs similarity index 100% rename from crypto/src/asn1/crmf/PopoSigningKeyInput.cs rename to src/BouncyCastle/asn1/crmf/PopoSigningKeyInput.cs diff --git a/crypto/src/asn1/crmf/ProofOfPossession.cs b/src/BouncyCastle/asn1/crmf/ProofOfPossession.cs similarity index 100% rename from crypto/src/asn1/crmf/ProofOfPossession.cs rename to src/BouncyCastle/asn1/crmf/ProofOfPossession.cs diff --git a/crypto/src/asn1/crmf/SinglePubInfo.cs b/src/BouncyCastle/asn1/crmf/SinglePubInfo.cs similarity index 100% rename from crypto/src/asn1/crmf/SinglePubInfo.cs rename to src/BouncyCastle/asn1/crmf/SinglePubInfo.cs diff --git a/crypto/src/asn1/crmf/SubsequentMessage.cs b/src/BouncyCastle/asn1/crmf/SubsequentMessage.cs similarity index 100% rename from crypto/src/asn1/crmf/SubsequentMessage.cs rename to src/BouncyCastle/asn1/crmf/SubsequentMessage.cs diff --git a/crypto/src/asn1/cryptopro/CryptoProObjectIdentifiers.cs b/src/BouncyCastle/asn1/cryptopro/CryptoProObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/cryptopro/CryptoProObjectIdentifiers.cs rename to src/BouncyCastle/asn1/cryptopro/CryptoProObjectIdentifiers.cs diff --git a/crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs b/src/BouncyCastle/asn1/cryptopro/ECGOST3410NamedCurves.cs similarity index 100% rename from crypto/src/asn1/cryptopro/ECGOST3410NamedCurves.cs rename to src/BouncyCastle/asn1/cryptopro/ECGOST3410NamedCurves.cs diff --git a/crypto/src/asn1/cryptopro/ECGOST3410ParamSetParameters.cs b/src/BouncyCastle/asn1/cryptopro/ECGOST3410ParamSetParameters.cs similarity index 100% rename from crypto/src/asn1/cryptopro/ECGOST3410ParamSetParameters.cs rename to src/BouncyCastle/asn1/cryptopro/ECGOST3410ParamSetParameters.cs diff --git a/crypto/src/asn1/cryptopro/GOST28147Parameters.cs b/src/BouncyCastle/asn1/cryptopro/GOST28147Parameters.cs similarity index 100% rename from crypto/src/asn1/cryptopro/GOST28147Parameters.cs rename to src/BouncyCastle/asn1/cryptopro/GOST28147Parameters.cs diff --git a/crypto/src/asn1/cryptopro/GOST3410NamedParameters.cs b/src/BouncyCastle/asn1/cryptopro/GOST3410NamedParameters.cs similarity index 100% rename from crypto/src/asn1/cryptopro/GOST3410NamedParameters.cs rename to src/BouncyCastle/asn1/cryptopro/GOST3410NamedParameters.cs diff --git a/crypto/src/asn1/cryptopro/GOST3410ParamSetParameters.cs b/src/BouncyCastle/asn1/cryptopro/GOST3410ParamSetParameters.cs similarity index 100% rename from crypto/src/asn1/cryptopro/GOST3410ParamSetParameters.cs rename to src/BouncyCastle/asn1/cryptopro/GOST3410ParamSetParameters.cs diff --git a/crypto/src/asn1/cryptopro/GOST3410PublicKeyAlgParameters.cs b/src/BouncyCastle/asn1/cryptopro/GOST3410PublicKeyAlgParameters.cs similarity index 100% rename from crypto/src/asn1/cryptopro/GOST3410PublicKeyAlgParameters.cs rename to src/BouncyCastle/asn1/cryptopro/GOST3410PublicKeyAlgParameters.cs diff --git a/crypto/src/asn1/eac/EACObjectIdentifiers.cs b/src/BouncyCastle/asn1/eac/EACObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/eac/EACObjectIdentifiers.cs rename to src/BouncyCastle/asn1/eac/EACObjectIdentifiers.cs diff --git a/crypto/src/asn1/edec/EdECObjectIdentifiers.cs b/src/BouncyCastle/asn1/edec/EdECObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/edec/EdECObjectIdentifiers.cs rename to src/BouncyCastle/asn1/edec/EdECObjectIdentifiers.cs diff --git a/crypto/src/asn1/esf/CertificateValues.cs b/src/BouncyCastle/asn1/esf/CertificateValues.cs similarity index 100% rename from crypto/src/asn1/esf/CertificateValues.cs rename to src/BouncyCastle/asn1/esf/CertificateValues.cs diff --git a/crypto/src/asn1/esf/CommitmentTypeIdentifier.cs b/src/BouncyCastle/asn1/esf/CommitmentTypeIdentifier.cs similarity index 100% rename from crypto/src/asn1/esf/CommitmentTypeIdentifier.cs rename to src/BouncyCastle/asn1/esf/CommitmentTypeIdentifier.cs diff --git a/crypto/src/asn1/esf/CommitmentTypeIndication.cs b/src/BouncyCastle/asn1/esf/CommitmentTypeIndication.cs similarity index 100% rename from crypto/src/asn1/esf/CommitmentTypeIndication.cs rename to src/BouncyCastle/asn1/esf/CommitmentTypeIndication.cs diff --git a/crypto/src/asn1/esf/CommitmentTypeQualifier.cs b/src/BouncyCastle/asn1/esf/CommitmentTypeQualifier.cs similarity index 100% rename from crypto/src/asn1/esf/CommitmentTypeQualifier.cs rename to src/BouncyCastle/asn1/esf/CommitmentTypeQualifier.cs diff --git a/crypto/src/asn1/esf/CompleteCertificateRefs.cs b/src/BouncyCastle/asn1/esf/CompleteCertificateRefs.cs similarity index 100% rename from crypto/src/asn1/esf/CompleteCertificateRefs.cs rename to src/BouncyCastle/asn1/esf/CompleteCertificateRefs.cs diff --git a/crypto/src/asn1/esf/CompleteRevocationRefs.cs b/src/BouncyCastle/asn1/esf/CompleteRevocationRefs.cs similarity index 100% rename from crypto/src/asn1/esf/CompleteRevocationRefs.cs rename to src/BouncyCastle/asn1/esf/CompleteRevocationRefs.cs diff --git a/crypto/src/asn1/esf/CrlIdentifier.cs b/src/BouncyCastle/asn1/esf/CrlIdentifier.cs similarity index 100% rename from crypto/src/asn1/esf/CrlIdentifier.cs rename to src/BouncyCastle/asn1/esf/CrlIdentifier.cs diff --git a/crypto/src/asn1/esf/CrlListID.cs b/src/BouncyCastle/asn1/esf/CrlListID.cs similarity index 100% rename from crypto/src/asn1/esf/CrlListID.cs rename to src/BouncyCastle/asn1/esf/CrlListID.cs diff --git a/crypto/src/asn1/esf/CrlOcspRef.cs b/src/BouncyCastle/asn1/esf/CrlOcspRef.cs similarity index 100% rename from crypto/src/asn1/esf/CrlOcspRef.cs rename to src/BouncyCastle/asn1/esf/CrlOcspRef.cs diff --git a/crypto/src/asn1/esf/CrlValidatedID.cs b/src/BouncyCastle/asn1/esf/CrlValidatedID.cs similarity index 100% rename from crypto/src/asn1/esf/CrlValidatedID.cs rename to src/BouncyCastle/asn1/esf/CrlValidatedID.cs diff --git a/crypto/src/asn1/esf/ESFAttributes.cs b/src/BouncyCastle/asn1/esf/ESFAttributes.cs similarity index 100% rename from crypto/src/asn1/esf/ESFAttributes.cs rename to src/BouncyCastle/asn1/esf/ESFAttributes.cs diff --git a/crypto/src/asn1/esf/OcspIdentifier.cs b/src/BouncyCastle/asn1/esf/OcspIdentifier.cs similarity index 100% rename from crypto/src/asn1/esf/OcspIdentifier.cs rename to src/BouncyCastle/asn1/esf/OcspIdentifier.cs diff --git a/crypto/src/asn1/esf/OcspListID.cs b/src/BouncyCastle/asn1/esf/OcspListID.cs similarity index 100% rename from crypto/src/asn1/esf/OcspListID.cs rename to src/BouncyCastle/asn1/esf/OcspListID.cs diff --git a/crypto/src/asn1/esf/OcspResponsesID.cs b/src/BouncyCastle/asn1/esf/OcspResponsesID.cs similarity index 100% rename from crypto/src/asn1/esf/OcspResponsesID.cs rename to src/BouncyCastle/asn1/esf/OcspResponsesID.cs diff --git a/crypto/src/asn1/esf/OtherCertID.cs b/src/BouncyCastle/asn1/esf/OtherCertID.cs similarity index 100% rename from crypto/src/asn1/esf/OtherCertID.cs rename to src/BouncyCastle/asn1/esf/OtherCertID.cs diff --git a/crypto/src/asn1/esf/OtherHash.cs b/src/BouncyCastle/asn1/esf/OtherHash.cs similarity index 100% rename from crypto/src/asn1/esf/OtherHash.cs rename to src/BouncyCastle/asn1/esf/OtherHash.cs diff --git a/crypto/src/asn1/esf/OtherHashAlgAndValue.cs b/src/BouncyCastle/asn1/esf/OtherHashAlgAndValue.cs similarity index 100% rename from crypto/src/asn1/esf/OtherHashAlgAndValue.cs rename to src/BouncyCastle/asn1/esf/OtherHashAlgAndValue.cs diff --git a/crypto/src/asn1/esf/OtherRevRefs.cs b/src/BouncyCastle/asn1/esf/OtherRevRefs.cs similarity index 100% rename from crypto/src/asn1/esf/OtherRevRefs.cs rename to src/BouncyCastle/asn1/esf/OtherRevRefs.cs diff --git a/crypto/src/asn1/esf/OtherRevVals.cs b/src/BouncyCastle/asn1/esf/OtherRevVals.cs similarity index 100% rename from crypto/src/asn1/esf/OtherRevVals.cs rename to src/BouncyCastle/asn1/esf/OtherRevVals.cs diff --git a/crypto/src/asn1/esf/OtherSigningCertificate.cs b/src/BouncyCastle/asn1/esf/OtherSigningCertificate.cs similarity index 100% rename from crypto/src/asn1/esf/OtherSigningCertificate.cs rename to src/BouncyCastle/asn1/esf/OtherSigningCertificate.cs diff --git a/crypto/src/asn1/esf/RevocationValues.cs b/src/BouncyCastle/asn1/esf/RevocationValues.cs similarity index 100% rename from crypto/src/asn1/esf/RevocationValues.cs rename to src/BouncyCastle/asn1/esf/RevocationValues.cs diff --git a/crypto/src/asn1/esf/SigPolicyQualifierInfo.cs b/src/BouncyCastle/asn1/esf/SigPolicyQualifierInfo.cs similarity index 100% rename from crypto/src/asn1/esf/SigPolicyQualifierInfo.cs rename to src/BouncyCastle/asn1/esf/SigPolicyQualifierInfo.cs diff --git a/crypto/src/asn1/esf/SignaturePolicyId.cs b/src/BouncyCastle/asn1/esf/SignaturePolicyId.cs similarity index 100% rename from crypto/src/asn1/esf/SignaturePolicyId.cs rename to src/BouncyCastle/asn1/esf/SignaturePolicyId.cs diff --git a/crypto/src/asn1/esf/SignaturePolicyIdentifier.cs b/src/BouncyCastle/asn1/esf/SignaturePolicyIdentifier.cs similarity index 100% rename from crypto/src/asn1/esf/SignaturePolicyIdentifier.cs rename to src/BouncyCastle/asn1/esf/SignaturePolicyIdentifier.cs diff --git a/crypto/src/asn1/esf/SignerAttribute.cs b/src/BouncyCastle/asn1/esf/SignerAttribute.cs similarity index 100% rename from crypto/src/asn1/esf/SignerAttribute.cs rename to src/BouncyCastle/asn1/esf/SignerAttribute.cs diff --git a/crypto/src/asn1/esf/SignerLocation.cs b/src/BouncyCastle/asn1/esf/SignerLocation.cs similarity index 100% rename from crypto/src/asn1/esf/SignerLocation.cs rename to src/BouncyCastle/asn1/esf/SignerLocation.cs diff --git a/crypto/src/asn1/ess/ContentHints.cs b/src/BouncyCastle/asn1/ess/ContentHints.cs similarity index 100% rename from crypto/src/asn1/ess/ContentHints.cs rename to src/BouncyCastle/asn1/ess/ContentHints.cs diff --git a/crypto/src/asn1/ess/ContentIdentifier.cs b/src/BouncyCastle/asn1/ess/ContentIdentifier.cs similarity index 100% rename from crypto/src/asn1/ess/ContentIdentifier.cs rename to src/BouncyCastle/asn1/ess/ContentIdentifier.cs diff --git a/crypto/src/asn1/ess/ESSCertID.cs b/src/BouncyCastle/asn1/ess/ESSCertID.cs similarity index 100% rename from crypto/src/asn1/ess/ESSCertID.cs rename to src/BouncyCastle/asn1/ess/ESSCertID.cs diff --git a/crypto/src/asn1/ess/ESSCertIDv2.cs b/src/BouncyCastle/asn1/ess/ESSCertIDv2.cs similarity index 100% rename from crypto/src/asn1/ess/ESSCertIDv2.cs rename to src/BouncyCastle/asn1/ess/ESSCertIDv2.cs diff --git a/crypto/src/asn1/ess/OtherCertID.cs b/src/BouncyCastle/asn1/ess/OtherCertID.cs similarity index 100% rename from crypto/src/asn1/ess/OtherCertID.cs rename to src/BouncyCastle/asn1/ess/OtherCertID.cs diff --git a/crypto/src/asn1/ess/OtherSigningCertificate.cs b/src/BouncyCastle/asn1/ess/OtherSigningCertificate.cs similarity index 100% rename from crypto/src/asn1/ess/OtherSigningCertificate.cs rename to src/BouncyCastle/asn1/ess/OtherSigningCertificate.cs diff --git a/crypto/src/asn1/ess/SigningCertificate.cs b/src/BouncyCastle/asn1/ess/SigningCertificate.cs similarity index 100% rename from crypto/src/asn1/ess/SigningCertificate.cs rename to src/BouncyCastle/asn1/ess/SigningCertificate.cs diff --git a/crypto/src/asn1/ess/SigningCertificateV2.cs b/src/BouncyCastle/asn1/ess/SigningCertificateV2.cs similarity index 100% rename from crypto/src/asn1/ess/SigningCertificateV2.cs rename to src/BouncyCastle/asn1/ess/SigningCertificateV2.cs diff --git a/crypto/src/asn1/gm/GMNamedCurves.cs b/src/BouncyCastle/asn1/gm/GMNamedCurves.cs similarity index 100% rename from crypto/src/asn1/gm/GMNamedCurves.cs rename to src/BouncyCastle/asn1/gm/GMNamedCurves.cs diff --git a/crypto/src/asn1/gm/GMObjectIdentifiers.cs b/src/BouncyCastle/asn1/gm/GMObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/gm/GMObjectIdentifiers.cs rename to src/BouncyCastle/asn1/gm/GMObjectIdentifiers.cs diff --git a/crypto/src/asn1/gnu/GNUObjectIdentifiers.cs b/src/BouncyCastle/asn1/gnu/GNUObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/gnu/GNUObjectIdentifiers.cs rename to src/BouncyCastle/asn1/gnu/GNUObjectIdentifiers.cs diff --git a/crypto/src/asn1/iana/IANAObjectIdentifiers.cs b/src/BouncyCastle/asn1/iana/IANAObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/iana/IANAObjectIdentifiers.cs rename to src/BouncyCastle/asn1/iana/IANAObjectIdentifiers.cs diff --git a/crypto/src/asn1/icao/CscaMasterList.cs b/src/BouncyCastle/asn1/icao/CscaMasterList.cs similarity index 100% rename from crypto/src/asn1/icao/CscaMasterList.cs rename to src/BouncyCastle/asn1/icao/CscaMasterList.cs diff --git a/crypto/src/asn1/icao/DataGroupHash.cs b/src/BouncyCastle/asn1/icao/DataGroupHash.cs similarity index 100% rename from crypto/src/asn1/icao/DataGroupHash.cs rename to src/BouncyCastle/asn1/icao/DataGroupHash.cs diff --git a/crypto/src/asn1/icao/ICAOObjectIdentifiers.cs b/src/BouncyCastle/asn1/icao/ICAOObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/icao/ICAOObjectIdentifiers.cs rename to src/BouncyCastle/asn1/icao/ICAOObjectIdentifiers.cs diff --git a/crypto/src/asn1/icao/LDSSecurityObject.cs b/src/BouncyCastle/asn1/icao/LDSSecurityObject.cs similarity index 100% rename from crypto/src/asn1/icao/LDSSecurityObject.cs rename to src/BouncyCastle/asn1/icao/LDSSecurityObject.cs diff --git a/crypto/src/asn1/icao/LDSVersionInfo.cs b/src/BouncyCastle/asn1/icao/LDSVersionInfo.cs similarity index 100% rename from crypto/src/asn1/icao/LDSVersionInfo.cs rename to src/BouncyCastle/asn1/icao/LDSVersionInfo.cs diff --git a/crypto/src/asn1/isismtt/ISISMTTObjectIdentifiers.cs b/src/BouncyCastle/asn1/isismtt/ISISMTTObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/isismtt/ISISMTTObjectIdentifiers.cs rename to src/BouncyCastle/asn1/isismtt/ISISMTTObjectIdentifiers.cs diff --git a/crypto/src/asn1/isismtt/ocsp/CertHash.cs b/src/BouncyCastle/asn1/isismtt/ocsp/CertHash.cs similarity index 100% rename from crypto/src/asn1/isismtt/ocsp/CertHash.cs rename to src/BouncyCastle/asn1/isismtt/ocsp/CertHash.cs diff --git a/crypto/src/asn1/isismtt/ocsp/RequestedCertificate.cs b/src/BouncyCastle/asn1/isismtt/ocsp/RequestedCertificate.cs similarity index 100% rename from crypto/src/asn1/isismtt/ocsp/RequestedCertificate.cs rename to src/BouncyCastle/asn1/isismtt/ocsp/RequestedCertificate.cs diff --git a/crypto/src/asn1/isismtt/x509/AdditionalInformationSyntax.cs b/src/BouncyCastle/asn1/isismtt/x509/AdditionalInformationSyntax.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/AdditionalInformationSyntax.cs rename to src/BouncyCastle/asn1/isismtt/x509/AdditionalInformationSyntax.cs diff --git a/crypto/src/asn1/isismtt/x509/AdmissionSyntax.cs b/src/BouncyCastle/asn1/isismtt/x509/AdmissionSyntax.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/AdmissionSyntax.cs rename to src/BouncyCastle/asn1/isismtt/x509/AdmissionSyntax.cs diff --git a/crypto/src/asn1/isismtt/x509/Admissions.cs b/src/BouncyCastle/asn1/isismtt/x509/Admissions.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/Admissions.cs rename to src/BouncyCastle/asn1/isismtt/x509/Admissions.cs diff --git a/crypto/src/asn1/isismtt/x509/DeclarationOfMajority.cs b/src/BouncyCastle/asn1/isismtt/x509/DeclarationOfMajority.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/DeclarationOfMajority.cs rename to src/BouncyCastle/asn1/isismtt/x509/DeclarationOfMajority.cs diff --git a/crypto/src/asn1/isismtt/x509/MonetaryLimit.cs b/src/BouncyCastle/asn1/isismtt/x509/MonetaryLimit.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/MonetaryLimit.cs rename to src/BouncyCastle/asn1/isismtt/x509/MonetaryLimit.cs diff --git a/crypto/src/asn1/isismtt/x509/NamingAuthority.cs b/src/BouncyCastle/asn1/isismtt/x509/NamingAuthority.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/NamingAuthority.cs rename to src/BouncyCastle/asn1/isismtt/x509/NamingAuthority.cs diff --git a/crypto/src/asn1/isismtt/x509/ProcurationSyntax.cs b/src/BouncyCastle/asn1/isismtt/x509/ProcurationSyntax.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/ProcurationSyntax.cs rename to src/BouncyCastle/asn1/isismtt/x509/ProcurationSyntax.cs diff --git a/crypto/src/asn1/isismtt/x509/ProfessionInfo.cs b/src/BouncyCastle/asn1/isismtt/x509/ProfessionInfo.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/ProfessionInfo.cs rename to src/BouncyCastle/asn1/isismtt/x509/ProfessionInfo.cs diff --git a/crypto/src/asn1/isismtt/x509/Restriction.cs b/src/BouncyCastle/asn1/isismtt/x509/Restriction.cs similarity index 100% rename from crypto/src/asn1/isismtt/x509/Restriction.cs rename to src/BouncyCastle/asn1/isismtt/x509/Restriction.cs diff --git a/crypto/src/asn1/kisa/KISAObjectIdentifiers.cs b/src/BouncyCastle/asn1/kisa/KISAObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/kisa/KISAObjectIdentifiers.cs rename to src/BouncyCastle/asn1/kisa/KISAObjectIdentifiers.cs diff --git a/crypto/src/asn1/microsoft/MicrosoftObjectIdentifiers.cs b/src/BouncyCastle/asn1/microsoft/MicrosoftObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/microsoft/MicrosoftObjectIdentifiers.cs rename to src/BouncyCastle/asn1/microsoft/MicrosoftObjectIdentifiers.cs diff --git a/crypto/src/asn1/misc/CAST5CBCParameters.cs b/src/BouncyCastle/asn1/misc/CAST5CBCParameters.cs similarity index 100% rename from crypto/src/asn1/misc/CAST5CBCParameters.cs rename to src/BouncyCastle/asn1/misc/CAST5CBCParameters.cs diff --git a/crypto/src/asn1/misc/IDEACBCPar.cs b/src/BouncyCastle/asn1/misc/IDEACBCPar.cs similarity index 100% rename from crypto/src/asn1/misc/IDEACBCPar.cs rename to src/BouncyCastle/asn1/misc/IDEACBCPar.cs diff --git a/crypto/src/asn1/misc/MiscObjectIdentifiers.cs b/src/BouncyCastle/asn1/misc/MiscObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/misc/MiscObjectIdentifiers.cs rename to src/BouncyCastle/asn1/misc/MiscObjectIdentifiers.cs diff --git a/crypto/src/asn1/misc/NetscapeCertType.cs b/src/BouncyCastle/asn1/misc/NetscapeCertType.cs similarity index 100% rename from crypto/src/asn1/misc/NetscapeCertType.cs rename to src/BouncyCastle/asn1/misc/NetscapeCertType.cs diff --git a/crypto/src/asn1/misc/NetscapeRevocationURL.cs b/src/BouncyCastle/asn1/misc/NetscapeRevocationURL.cs similarity index 100% rename from crypto/src/asn1/misc/NetscapeRevocationURL.cs rename to src/BouncyCastle/asn1/misc/NetscapeRevocationURL.cs diff --git a/crypto/src/asn1/misc/VerisignCzagExtension.cs b/src/BouncyCastle/asn1/misc/VerisignCzagExtension.cs similarity index 100% rename from crypto/src/asn1/misc/VerisignCzagExtension.cs rename to src/BouncyCastle/asn1/misc/VerisignCzagExtension.cs diff --git a/crypto/src/asn1/mozilla/PublicKeyAndChallenge.cs b/src/BouncyCastle/asn1/mozilla/PublicKeyAndChallenge.cs similarity index 100% rename from crypto/src/asn1/mozilla/PublicKeyAndChallenge.cs rename to src/BouncyCastle/asn1/mozilla/PublicKeyAndChallenge.cs diff --git a/crypto/src/asn1/nist/NISTNamedCurves.cs b/src/BouncyCastle/asn1/nist/NISTNamedCurves.cs similarity index 100% rename from crypto/src/asn1/nist/NISTNamedCurves.cs rename to src/BouncyCastle/asn1/nist/NISTNamedCurves.cs diff --git a/crypto/src/asn1/nist/NISTObjectIdentifiers.cs b/src/BouncyCastle/asn1/nist/NISTObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/nist/NISTObjectIdentifiers.cs rename to src/BouncyCastle/asn1/nist/NISTObjectIdentifiers.cs diff --git a/crypto/src/asn1/ntt/NTTObjectIdentifiers.cs b/src/BouncyCastle/asn1/ntt/NTTObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/ntt/NTTObjectIdentifiers.cs rename to src/BouncyCastle/asn1/ntt/NTTObjectIdentifiers.cs diff --git a/crypto/src/asn1/ocsp/BasicOCSPResponse.cs b/src/BouncyCastle/asn1/ocsp/BasicOCSPResponse.cs similarity index 100% rename from crypto/src/asn1/ocsp/BasicOCSPResponse.cs rename to src/BouncyCastle/asn1/ocsp/BasicOCSPResponse.cs diff --git a/crypto/src/asn1/ocsp/CertID.cs b/src/BouncyCastle/asn1/ocsp/CertID.cs similarity index 100% rename from crypto/src/asn1/ocsp/CertID.cs rename to src/BouncyCastle/asn1/ocsp/CertID.cs diff --git a/crypto/src/asn1/ocsp/CertStatus.cs b/src/BouncyCastle/asn1/ocsp/CertStatus.cs similarity index 100% rename from crypto/src/asn1/ocsp/CertStatus.cs rename to src/BouncyCastle/asn1/ocsp/CertStatus.cs diff --git a/crypto/src/asn1/ocsp/CrlID.cs b/src/BouncyCastle/asn1/ocsp/CrlID.cs similarity index 100% rename from crypto/src/asn1/ocsp/CrlID.cs rename to src/BouncyCastle/asn1/ocsp/CrlID.cs diff --git a/crypto/src/asn1/ocsp/OCSPObjectIdentifiers.cs b/src/BouncyCastle/asn1/ocsp/OCSPObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/ocsp/OCSPObjectIdentifiers.cs rename to src/BouncyCastle/asn1/ocsp/OCSPObjectIdentifiers.cs diff --git a/crypto/src/asn1/ocsp/OCSPRequest.cs b/src/BouncyCastle/asn1/ocsp/OCSPRequest.cs similarity index 100% rename from crypto/src/asn1/ocsp/OCSPRequest.cs rename to src/BouncyCastle/asn1/ocsp/OCSPRequest.cs diff --git a/crypto/src/asn1/ocsp/OCSPResponse.cs b/src/BouncyCastle/asn1/ocsp/OCSPResponse.cs similarity index 100% rename from crypto/src/asn1/ocsp/OCSPResponse.cs rename to src/BouncyCastle/asn1/ocsp/OCSPResponse.cs diff --git a/crypto/src/asn1/ocsp/OCSPResponseStatus.cs b/src/BouncyCastle/asn1/ocsp/OCSPResponseStatus.cs similarity index 100% rename from crypto/src/asn1/ocsp/OCSPResponseStatus.cs rename to src/BouncyCastle/asn1/ocsp/OCSPResponseStatus.cs diff --git a/crypto/src/asn1/ocsp/Request.cs b/src/BouncyCastle/asn1/ocsp/Request.cs similarity index 100% rename from crypto/src/asn1/ocsp/Request.cs rename to src/BouncyCastle/asn1/ocsp/Request.cs diff --git a/crypto/src/asn1/ocsp/ResponderID.cs b/src/BouncyCastle/asn1/ocsp/ResponderID.cs similarity index 100% rename from crypto/src/asn1/ocsp/ResponderID.cs rename to src/BouncyCastle/asn1/ocsp/ResponderID.cs diff --git a/crypto/src/asn1/ocsp/ResponseBytes.cs b/src/BouncyCastle/asn1/ocsp/ResponseBytes.cs similarity index 100% rename from crypto/src/asn1/ocsp/ResponseBytes.cs rename to src/BouncyCastle/asn1/ocsp/ResponseBytes.cs diff --git a/crypto/src/asn1/ocsp/ResponseData.cs b/src/BouncyCastle/asn1/ocsp/ResponseData.cs similarity index 100% rename from crypto/src/asn1/ocsp/ResponseData.cs rename to src/BouncyCastle/asn1/ocsp/ResponseData.cs diff --git a/crypto/src/asn1/ocsp/RevokedInfo.cs b/src/BouncyCastle/asn1/ocsp/RevokedInfo.cs similarity index 100% rename from crypto/src/asn1/ocsp/RevokedInfo.cs rename to src/BouncyCastle/asn1/ocsp/RevokedInfo.cs diff --git a/crypto/src/asn1/ocsp/ServiceLocator.cs b/src/BouncyCastle/asn1/ocsp/ServiceLocator.cs similarity index 100% rename from crypto/src/asn1/ocsp/ServiceLocator.cs rename to src/BouncyCastle/asn1/ocsp/ServiceLocator.cs diff --git a/crypto/src/asn1/ocsp/Signature.cs b/src/BouncyCastle/asn1/ocsp/Signature.cs similarity index 100% rename from crypto/src/asn1/ocsp/Signature.cs rename to src/BouncyCastle/asn1/ocsp/Signature.cs diff --git a/crypto/src/asn1/ocsp/SingleResponse.cs b/src/BouncyCastle/asn1/ocsp/SingleResponse.cs similarity index 100% rename from crypto/src/asn1/ocsp/SingleResponse.cs rename to src/BouncyCastle/asn1/ocsp/SingleResponse.cs diff --git a/crypto/src/asn1/ocsp/TBSRequest.cs b/src/BouncyCastle/asn1/ocsp/TBSRequest.cs similarity index 100% rename from crypto/src/asn1/ocsp/TBSRequest.cs rename to src/BouncyCastle/asn1/ocsp/TBSRequest.cs diff --git a/crypto/src/asn1/oiw/ElGamalParameter.cs b/src/BouncyCastle/asn1/oiw/ElGamalParameter.cs similarity index 100% rename from crypto/src/asn1/oiw/ElGamalParameter.cs rename to src/BouncyCastle/asn1/oiw/ElGamalParameter.cs diff --git a/crypto/src/asn1/oiw/OIWObjectIdentifiers.cs b/src/BouncyCastle/asn1/oiw/OIWObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/oiw/OIWObjectIdentifiers.cs rename to src/BouncyCastle/asn1/oiw/OIWObjectIdentifiers.cs diff --git a/crypto/src/asn1/pkcs/Attribute.cs b/src/BouncyCastle/asn1/pkcs/Attribute.cs similarity index 100% rename from crypto/src/asn1/pkcs/Attribute.cs rename to src/BouncyCastle/asn1/pkcs/Attribute.cs diff --git a/crypto/src/asn1/pkcs/AuthenticatedSafe.cs b/src/BouncyCastle/asn1/pkcs/AuthenticatedSafe.cs similarity index 100% rename from crypto/src/asn1/pkcs/AuthenticatedSafe.cs rename to src/BouncyCastle/asn1/pkcs/AuthenticatedSafe.cs diff --git a/crypto/src/asn1/pkcs/CertBag.cs b/src/BouncyCastle/asn1/pkcs/CertBag.cs similarity index 100% rename from crypto/src/asn1/pkcs/CertBag.cs rename to src/BouncyCastle/asn1/pkcs/CertBag.cs diff --git a/crypto/src/asn1/pkcs/CertificationRequest.cs b/src/BouncyCastle/asn1/pkcs/CertificationRequest.cs similarity index 100% rename from crypto/src/asn1/pkcs/CertificationRequest.cs rename to src/BouncyCastle/asn1/pkcs/CertificationRequest.cs diff --git a/crypto/src/asn1/pkcs/CertificationRequestInfo.cs b/src/BouncyCastle/asn1/pkcs/CertificationRequestInfo.cs similarity index 100% rename from crypto/src/asn1/pkcs/CertificationRequestInfo.cs rename to src/BouncyCastle/asn1/pkcs/CertificationRequestInfo.cs diff --git a/crypto/src/asn1/pkcs/ContentInfo.cs b/src/BouncyCastle/asn1/pkcs/ContentInfo.cs similarity index 100% rename from crypto/src/asn1/pkcs/ContentInfo.cs rename to src/BouncyCastle/asn1/pkcs/ContentInfo.cs diff --git a/crypto/src/asn1/pkcs/DHParameter.cs b/src/BouncyCastle/asn1/pkcs/DHParameter.cs similarity index 100% rename from crypto/src/asn1/pkcs/DHParameter.cs rename to src/BouncyCastle/asn1/pkcs/DHParameter.cs diff --git a/crypto/src/asn1/pkcs/EncryptedData.cs b/src/BouncyCastle/asn1/pkcs/EncryptedData.cs similarity index 100% rename from crypto/src/asn1/pkcs/EncryptedData.cs rename to src/BouncyCastle/asn1/pkcs/EncryptedData.cs diff --git a/crypto/src/asn1/pkcs/EncryptedPrivateKeyInfo.cs b/src/BouncyCastle/asn1/pkcs/EncryptedPrivateKeyInfo.cs similarity index 100% rename from crypto/src/asn1/pkcs/EncryptedPrivateKeyInfo.cs rename to src/BouncyCastle/asn1/pkcs/EncryptedPrivateKeyInfo.cs diff --git a/crypto/src/asn1/pkcs/EncryptionScheme.cs b/src/BouncyCastle/asn1/pkcs/EncryptionScheme.cs similarity index 100% rename from crypto/src/asn1/pkcs/EncryptionScheme.cs rename to src/BouncyCastle/asn1/pkcs/EncryptionScheme.cs diff --git a/crypto/src/asn1/pkcs/IssuerAndSerialNumber.cs b/src/BouncyCastle/asn1/pkcs/IssuerAndSerialNumber.cs similarity index 100% rename from crypto/src/asn1/pkcs/IssuerAndSerialNumber.cs rename to src/BouncyCastle/asn1/pkcs/IssuerAndSerialNumber.cs diff --git a/crypto/src/asn1/pkcs/KeyDerivationFunc.cs b/src/BouncyCastle/asn1/pkcs/KeyDerivationFunc.cs similarity index 100% rename from crypto/src/asn1/pkcs/KeyDerivationFunc.cs rename to src/BouncyCastle/asn1/pkcs/KeyDerivationFunc.cs diff --git a/crypto/src/asn1/pkcs/MacData.cs b/src/BouncyCastle/asn1/pkcs/MacData.cs similarity index 100% rename from crypto/src/asn1/pkcs/MacData.cs rename to src/BouncyCastle/asn1/pkcs/MacData.cs diff --git a/crypto/src/asn1/pkcs/PBEParameter.cs b/src/BouncyCastle/asn1/pkcs/PBEParameter.cs similarity index 100% rename from crypto/src/asn1/pkcs/PBEParameter.cs rename to src/BouncyCastle/asn1/pkcs/PBEParameter.cs diff --git a/crypto/src/asn1/pkcs/PBES2Parameters.cs b/src/BouncyCastle/asn1/pkcs/PBES2Parameters.cs similarity index 100% rename from crypto/src/asn1/pkcs/PBES2Parameters.cs rename to src/BouncyCastle/asn1/pkcs/PBES2Parameters.cs diff --git a/crypto/src/asn1/pkcs/PBKDF2Params.cs b/src/BouncyCastle/asn1/pkcs/PBKDF2Params.cs similarity index 100% rename from crypto/src/asn1/pkcs/PBKDF2Params.cs rename to src/BouncyCastle/asn1/pkcs/PBKDF2Params.cs diff --git a/crypto/src/asn1/pkcs/PKCS12PBEParams.cs b/src/BouncyCastle/asn1/pkcs/PKCS12PBEParams.cs similarity index 100% rename from crypto/src/asn1/pkcs/PKCS12PBEParams.cs rename to src/BouncyCastle/asn1/pkcs/PKCS12PBEParams.cs diff --git a/crypto/src/asn1/pkcs/PKCSObjectIdentifiers.cs b/src/BouncyCastle/asn1/pkcs/PKCSObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/pkcs/PKCSObjectIdentifiers.cs rename to src/BouncyCastle/asn1/pkcs/PKCSObjectIdentifiers.cs diff --git a/crypto/src/asn1/pkcs/Pfx.cs b/src/BouncyCastle/asn1/pkcs/Pfx.cs similarity index 100% rename from crypto/src/asn1/pkcs/Pfx.cs rename to src/BouncyCastle/asn1/pkcs/Pfx.cs diff --git a/crypto/src/asn1/pkcs/PrivateKeyInfo.cs b/src/BouncyCastle/asn1/pkcs/PrivateKeyInfo.cs similarity index 100% rename from crypto/src/asn1/pkcs/PrivateKeyInfo.cs rename to src/BouncyCastle/asn1/pkcs/PrivateKeyInfo.cs diff --git a/crypto/src/asn1/pkcs/RC2CBCParameter.cs b/src/BouncyCastle/asn1/pkcs/RC2CBCParameter.cs similarity index 100% rename from crypto/src/asn1/pkcs/RC2CBCParameter.cs rename to src/BouncyCastle/asn1/pkcs/RC2CBCParameter.cs diff --git a/crypto/src/asn1/pkcs/RSAESOAEPparams.cs b/src/BouncyCastle/asn1/pkcs/RSAESOAEPparams.cs similarity index 100% rename from crypto/src/asn1/pkcs/RSAESOAEPparams.cs rename to src/BouncyCastle/asn1/pkcs/RSAESOAEPparams.cs diff --git a/crypto/src/asn1/pkcs/RSAPrivateKeyStructure.cs b/src/BouncyCastle/asn1/pkcs/RSAPrivateKeyStructure.cs similarity index 100% rename from crypto/src/asn1/pkcs/RSAPrivateKeyStructure.cs rename to src/BouncyCastle/asn1/pkcs/RSAPrivateKeyStructure.cs diff --git a/crypto/src/asn1/pkcs/RSASSAPSSparams.cs b/src/BouncyCastle/asn1/pkcs/RSASSAPSSparams.cs similarity index 100% rename from crypto/src/asn1/pkcs/RSASSAPSSparams.cs rename to src/BouncyCastle/asn1/pkcs/RSASSAPSSparams.cs diff --git a/crypto/src/asn1/pkcs/SafeBag.cs b/src/BouncyCastle/asn1/pkcs/SafeBag.cs similarity index 100% rename from crypto/src/asn1/pkcs/SafeBag.cs rename to src/BouncyCastle/asn1/pkcs/SafeBag.cs diff --git a/crypto/src/asn1/pkcs/SignedData.cs b/src/BouncyCastle/asn1/pkcs/SignedData.cs similarity index 100% rename from crypto/src/asn1/pkcs/SignedData.cs rename to src/BouncyCastle/asn1/pkcs/SignedData.cs diff --git a/crypto/src/asn1/pkcs/SignerInfo.cs b/src/BouncyCastle/asn1/pkcs/SignerInfo.cs similarity index 100% rename from crypto/src/asn1/pkcs/SignerInfo.cs rename to src/BouncyCastle/asn1/pkcs/SignerInfo.cs diff --git a/crypto/src/asn1/rosstandart/RosstandartObjectIdentifiers.cs b/src/BouncyCastle/asn1/rosstandart/RosstandartObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/rosstandart/RosstandartObjectIdentifiers.cs rename to src/BouncyCastle/asn1/rosstandart/RosstandartObjectIdentifiers.cs diff --git a/crypto/src/asn1/sec/ECPrivateKeyStructure.cs b/src/BouncyCastle/asn1/sec/ECPrivateKeyStructure.cs similarity index 100% rename from crypto/src/asn1/sec/ECPrivateKeyStructure.cs rename to src/BouncyCastle/asn1/sec/ECPrivateKeyStructure.cs diff --git a/crypto/src/asn1/sec/SECNamedCurves.cs b/src/BouncyCastle/asn1/sec/SECNamedCurves.cs similarity index 100% rename from crypto/src/asn1/sec/SECNamedCurves.cs rename to src/BouncyCastle/asn1/sec/SECNamedCurves.cs diff --git a/crypto/src/asn1/sec/SECObjectIdentifiers.cs b/src/BouncyCastle/asn1/sec/SECObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/sec/SECObjectIdentifiers.cs rename to src/BouncyCastle/asn1/sec/SECObjectIdentifiers.cs diff --git a/crypto/src/asn1/smime/SMIMEAttributes.cs b/src/BouncyCastle/asn1/smime/SMIMEAttributes.cs similarity index 100% rename from crypto/src/asn1/smime/SMIMEAttributes.cs rename to src/BouncyCastle/asn1/smime/SMIMEAttributes.cs diff --git a/crypto/src/asn1/smime/SMIMECapabilities.cs b/src/BouncyCastle/asn1/smime/SMIMECapabilities.cs similarity index 100% rename from crypto/src/asn1/smime/SMIMECapabilities.cs rename to src/BouncyCastle/asn1/smime/SMIMECapabilities.cs diff --git a/crypto/src/asn1/smime/SMIMECapabilitiesAttribute.cs b/src/BouncyCastle/asn1/smime/SMIMECapabilitiesAttribute.cs similarity index 100% rename from crypto/src/asn1/smime/SMIMECapabilitiesAttribute.cs rename to src/BouncyCastle/asn1/smime/SMIMECapabilitiesAttribute.cs diff --git a/crypto/src/asn1/smime/SMIMECapability.cs b/src/BouncyCastle/asn1/smime/SMIMECapability.cs similarity index 100% rename from crypto/src/asn1/smime/SMIMECapability.cs rename to src/BouncyCastle/asn1/smime/SMIMECapability.cs diff --git a/crypto/src/asn1/smime/SMIMECapabilityVector.cs b/src/BouncyCastle/asn1/smime/SMIMECapabilityVector.cs similarity index 100% rename from crypto/src/asn1/smime/SMIMECapabilityVector.cs rename to src/BouncyCastle/asn1/smime/SMIMECapabilityVector.cs diff --git a/crypto/src/asn1/smime/SMIMEEncryptionKeyPreferenceAttribute.cs b/src/BouncyCastle/asn1/smime/SMIMEEncryptionKeyPreferenceAttribute.cs similarity index 100% rename from crypto/src/asn1/smime/SMIMEEncryptionKeyPreferenceAttribute.cs rename to src/BouncyCastle/asn1/smime/SMIMEEncryptionKeyPreferenceAttribute.cs diff --git a/crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs b/src/BouncyCastle/asn1/teletrust/TeleTrusTNamedCurves.cs similarity index 100% rename from crypto/src/asn1/teletrust/TeleTrusTNamedCurves.cs rename to src/BouncyCastle/asn1/teletrust/TeleTrusTNamedCurves.cs diff --git a/crypto/src/asn1/teletrust/TeleTrusTObjectIdentifiers.cs b/src/BouncyCastle/asn1/teletrust/TeleTrusTObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/teletrust/TeleTrusTObjectIdentifiers.cs rename to src/BouncyCastle/asn1/teletrust/TeleTrusTObjectIdentifiers.cs diff --git a/crypto/src/asn1/tsp/Accuracy.cs b/src/BouncyCastle/asn1/tsp/Accuracy.cs similarity index 100% rename from crypto/src/asn1/tsp/Accuracy.cs rename to src/BouncyCastle/asn1/tsp/Accuracy.cs diff --git a/crypto/src/asn1/tsp/MessageImprint.cs b/src/BouncyCastle/asn1/tsp/MessageImprint.cs similarity index 100% rename from crypto/src/asn1/tsp/MessageImprint.cs rename to src/BouncyCastle/asn1/tsp/MessageImprint.cs diff --git a/crypto/src/asn1/tsp/TSTInfo.cs b/src/BouncyCastle/asn1/tsp/TSTInfo.cs similarity index 100% rename from crypto/src/asn1/tsp/TSTInfo.cs rename to src/BouncyCastle/asn1/tsp/TSTInfo.cs diff --git a/crypto/src/asn1/tsp/TimeStampReq.cs b/src/BouncyCastle/asn1/tsp/TimeStampReq.cs similarity index 100% rename from crypto/src/asn1/tsp/TimeStampReq.cs rename to src/BouncyCastle/asn1/tsp/TimeStampReq.cs diff --git a/crypto/src/asn1/tsp/TimeStampResp.cs b/src/BouncyCastle/asn1/tsp/TimeStampResp.cs similarity index 100% rename from crypto/src/asn1/tsp/TimeStampResp.cs rename to src/BouncyCastle/asn1/tsp/TimeStampResp.cs diff --git a/crypto/src/asn1/ua/UAObjectIdentifiers.cs b/src/BouncyCastle/asn1/ua/UAObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/ua/UAObjectIdentifiers.cs rename to src/BouncyCastle/asn1/ua/UAObjectIdentifiers.cs diff --git a/crypto/src/asn1/util/Asn1Dump.cs b/src/BouncyCastle/asn1/util/Asn1Dump.cs similarity index 100% rename from crypto/src/asn1/util/Asn1Dump.cs rename to src/BouncyCastle/asn1/util/Asn1Dump.cs diff --git a/crypto/src/asn1/util/Dump.cs b/src/BouncyCastle/asn1/util/Dump.cs similarity index 100% rename from crypto/src/asn1/util/Dump.cs rename to src/BouncyCastle/asn1/util/Dump.cs diff --git a/crypto/src/asn1/util/FilterStream.cs b/src/BouncyCastle/asn1/util/FilterStream.cs similarity index 100% rename from crypto/src/asn1/util/FilterStream.cs rename to src/BouncyCastle/asn1/util/FilterStream.cs diff --git a/crypto/src/asn1/x500/DirectoryString.cs b/src/BouncyCastle/asn1/x500/DirectoryString.cs similarity index 100% rename from crypto/src/asn1/x500/DirectoryString.cs rename to src/BouncyCastle/asn1/x500/DirectoryString.cs diff --git a/crypto/src/asn1/x509/AccessDescription.cs b/src/BouncyCastle/asn1/x509/AccessDescription.cs similarity index 100% rename from crypto/src/asn1/x509/AccessDescription.cs rename to src/BouncyCastle/asn1/x509/AccessDescription.cs diff --git a/crypto/src/asn1/x509/AlgorithmIdentifier.cs b/src/BouncyCastle/asn1/x509/AlgorithmIdentifier.cs similarity index 100% rename from crypto/src/asn1/x509/AlgorithmIdentifier.cs rename to src/BouncyCastle/asn1/x509/AlgorithmIdentifier.cs diff --git a/crypto/src/asn1/x509/AttCertIssuer.cs b/src/BouncyCastle/asn1/x509/AttCertIssuer.cs similarity index 100% rename from crypto/src/asn1/x509/AttCertIssuer.cs rename to src/BouncyCastle/asn1/x509/AttCertIssuer.cs diff --git a/crypto/src/asn1/x509/AttCertValidityPeriod.cs b/src/BouncyCastle/asn1/x509/AttCertValidityPeriod.cs similarity index 100% rename from crypto/src/asn1/x509/AttCertValidityPeriod.cs rename to src/BouncyCastle/asn1/x509/AttCertValidityPeriod.cs diff --git a/crypto/src/asn1/x509/Attribute.cs b/src/BouncyCastle/asn1/x509/Attribute.cs similarity index 100% rename from crypto/src/asn1/x509/Attribute.cs rename to src/BouncyCastle/asn1/x509/Attribute.cs diff --git a/crypto/src/asn1/x509/AttributeCertificate.cs b/src/BouncyCastle/asn1/x509/AttributeCertificate.cs similarity index 100% rename from crypto/src/asn1/x509/AttributeCertificate.cs rename to src/BouncyCastle/asn1/x509/AttributeCertificate.cs diff --git a/crypto/src/asn1/x509/AttributeCertificateInfo.cs b/src/BouncyCastle/asn1/x509/AttributeCertificateInfo.cs similarity index 100% rename from crypto/src/asn1/x509/AttributeCertificateInfo.cs rename to src/BouncyCastle/asn1/x509/AttributeCertificateInfo.cs diff --git a/crypto/src/asn1/x509/AttributeTable.cs b/src/BouncyCastle/asn1/x509/AttributeTable.cs similarity index 100% rename from crypto/src/asn1/x509/AttributeTable.cs rename to src/BouncyCastle/asn1/x509/AttributeTable.cs diff --git a/crypto/src/asn1/x509/AuthorityInformationAccess.cs b/src/BouncyCastle/asn1/x509/AuthorityInformationAccess.cs similarity index 100% rename from crypto/src/asn1/x509/AuthorityInformationAccess.cs rename to src/BouncyCastle/asn1/x509/AuthorityInformationAccess.cs diff --git a/crypto/src/asn1/x509/AuthorityKeyIdentifier.cs b/src/BouncyCastle/asn1/x509/AuthorityKeyIdentifier.cs similarity index 100% rename from crypto/src/asn1/x509/AuthorityKeyIdentifier.cs rename to src/BouncyCastle/asn1/x509/AuthorityKeyIdentifier.cs diff --git a/crypto/src/asn1/x509/BasicConstraints.cs b/src/BouncyCastle/asn1/x509/BasicConstraints.cs similarity index 100% rename from crypto/src/asn1/x509/BasicConstraints.cs rename to src/BouncyCastle/asn1/x509/BasicConstraints.cs diff --git a/crypto/src/asn1/x509/CRLDistPoint.cs b/src/BouncyCastle/asn1/x509/CRLDistPoint.cs similarity index 100% rename from crypto/src/asn1/x509/CRLDistPoint.cs rename to src/BouncyCastle/asn1/x509/CRLDistPoint.cs diff --git a/crypto/src/asn1/x509/CRLNumber.cs b/src/BouncyCastle/asn1/x509/CRLNumber.cs similarity index 100% rename from crypto/src/asn1/x509/CRLNumber.cs rename to src/BouncyCastle/asn1/x509/CRLNumber.cs diff --git a/crypto/src/asn1/x509/CRLReason.cs b/src/BouncyCastle/asn1/x509/CRLReason.cs similarity index 100% rename from crypto/src/asn1/x509/CRLReason.cs rename to src/BouncyCastle/asn1/x509/CRLReason.cs diff --git a/crypto/src/asn1/x509/CertPolicyId.cs b/src/BouncyCastle/asn1/x509/CertPolicyId.cs similarity index 100% rename from crypto/src/asn1/x509/CertPolicyId.cs rename to src/BouncyCastle/asn1/x509/CertPolicyId.cs diff --git a/crypto/src/asn1/x509/CertificateList.cs b/src/BouncyCastle/asn1/x509/CertificateList.cs similarity index 100% rename from crypto/src/asn1/x509/CertificateList.cs rename to src/BouncyCastle/asn1/x509/CertificateList.cs diff --git a/crypto/src/asn1/x509/CertificatePair.cs b/src/BouncyCastle/asn1/x509/CertificatePair.cs similarity index 100% rename from crypto/src/asn1/x509/CertificatePair.cs rename to src/BouncyCastle/asn1/x509/CertificatePair.cs diff --git a/crypto/src/asn1/x509/CertificatePolicies.cs b/src/BouncyCastle/asn1/x509/CertificatePolicies.cs similarity index 100% rename from crypto/src/asn1/x509/CertificatePolicies.cs rename to src/BouncyCastle/asn1/x509/CertificatePolicies.cs diff --git a/crypto/src/asn1/x509/DSAParameter.cs b/src/BouncyCastle/asn1/x509/DSAParameter.cs similarity index 100% rename from crypto/src/asn1/x509/DSAParameter.cs rename to src/BouncyCastle/asn1/x509/DSAParameter.cs diff --git a/crypto/src/asn1/x509/DigestInfo.cs b/src/BouncyCastle/asn1/x509/DigestInfo.cs similarity index 100% rename from crypto/src/asn1/x509/DigestInfo.cs rename to src/BouncyCastle/asn1/x509/DigestInfo.cs diff --git a/crypto/src/asn1/x509/DisplayText.cs b/src/BouncyCastle/asn1/x509/DisplayText.cs similarity index 100% rename from crypto/src/asn1/x509/DisplayText.cs rename to src/BouncyCastle/asn1/x509/DisplayText.cs diff --git a/crypto/src/asn1/x509/DistributionPoint.cs b/src/BouncyCastle/asn1/x509/DistributionPoint.cs similarity index 100% rename from crypto/src/asn1/x509/DistributionPoint.cs rename to src/BouncyCastle/asn1/x509/DistributionPoint.cs diff --git a/crypto/src/asn1/x509/DistributionPointName.cs b/src/BouncyCastle/asn1/x509/DistributionPointName.cs similarity index 100% rename from crypto/src/asn1/x509/DistributionPointName.cs rename to src/BouncyCastle/asn1/x509/DistributionPointName.cs diff --git a/crypto/src/asn1/x509/ExtendedKeyUsage.cs b/src/BouncyCastle/asn1/x509/ExtendedKeyUsage.cs similarity index 100% rename from crypto/src/asn1/x509/ExtendedKeyUsage.cs rename to src/BouncyCastle/asn1/x509/ExtendedKeyUsage.cs diff --git a/crypto/src/asn1/x509/GeneralName.cs b/src/BouncyCastle/asn1/x509/GeneralName.cs similarity index 100% rename from crypto/src/asn1/x509/GeneralName.cs rename to src/BouncyCastle/asn1/x509/GeneralName.cs diff --git a/crypto/src/asn1/x509/GeneralNames.cs b/src/BouncyCastle/asn1/x509/GeneralNames.cs similarity index 100% rename from crypto/src/asn1/x509/GeneralNames.cs rename to src/BouncyCastle/asn1/x509/GeneralNames.cs diff --git a/crypto/src/asn1/x509/GeneralSubtree.cs b/src/BouncyCastle/asn1/x509/GeneralSubtree.cs similarity index 100% rename from crypto/src/asn1/x509/GeneralSubtree.cs rename to src/BouncyCastle/asn1/x509/GeneralSubtree.cs diff --git a/crypto/src/asn1/x509/Holder.cs b/src/BouncyCastle/asn1/x509/Holder.cs similarity index 100% rename from crypto/src/asn1/x509/Holder.cs rename to src/BouncyCastle/asn1/x509/Holder.cs diff --git a/crypto/src/asn1/x509/IetfAttrSyntax.cs b/src/BouncyCastle/asn1/x509/IetfAttrSyntax.cs similarity index 100% rename from crypto/src/asn1/x509/IetfAttrSyntax.cs rename to src/BouncyCastle/asn1/x509/IetfAttrSyntax.cs diff --git a/crypto/src/asn1/x509/IssuerSerial.cs b/src/BouncyCastle/asn1/x509/IssuerSerial.cs similarity index 100% rename from crypto/src/asn1/x509/IssuerSerial.cs rename to src/BouncyCastle/asn1/x509/IssuerSerial.cs diff --git a/crypto/src/asn1/x509/IssuingDistributionPoint.cs b/src/BouncyCastle/asn1/x509/IssuingDistributionPoint.cs similarity index 100% rename from crypto/src/asn1/x509/IssuingDistributionPoint.cs rename to src/BouncyCastle/asn1/x509/IssuingDistributionPoint.cs diff --git a/crypto/src/asn1/x509/KeyPurposeId.cs b/src/BouncyCastle/asn1/x509/KeyPurposeId.cs similarity index 100% rename from crypto/src/asn1/x509/KeyPurposeId.cs rename to src/BouncyCastle/asn1/x509/KeyPurposeId.cs diff --git a/crypto/src/asn1/x509/KeyUsage.cs b/src/BouncyCastle/asn1/x509/KeyUsage.cs similarity index 100% rename from crypto/src/asn1/x509/KeyUsage.cs rename to src/BouncyCastle/asn1/x509/KeyUsage.cs diff --git a/crypto/src/asn1/x509/NameConstraints.cs b/src/BouncyCastle/asn1/x509/NameConstraints.cs similarity index 100% rename from crypto/src/asn1/x509/NameConstraints.cs rename to src/BouncyCastle/asn1/x509/NameConstraints.cs diff --git a/crypto/src/asn1/x509/NoticeReference.cs b/src/BouncyCastle/asn1/x509/NoticeReference.cs similarity index 100% rename from crypto/src/asn1/x509/NoticeReference.cs rename to src/BouncyCastle/asn1/x509/NoticeReference.cs diff --git a/crypto/src/asn1/x509/ObjectDigestInfo.cs b/src/BouncyCastle/asn1/x509/ObjectDigestInfo.cs similarity index 100% rename from crypto/src/asn1/x509/ObjectDigestInfo.cs rename to src/BouncyCastle/asn1/x509/ObjectDigestInfo.cs diff --git a/crypto/src/asn1/x509/PolicyInformation.cs b/src/BouncyCastle/asn1/x509/PolicyInformation.cs similarity index 100% rename from crypto/src/asn1/x509/PolicyInformation.cs rename to src/BouncyCastle/asn1/x509/PolicyInformation.cs diff --git a/crypto/src/asn1/x509/PolicyMappings.cs b/src/BouncyCastle/asn1/x509/PolicyMappings.cs similarity index 100% rename from crypto/src/asn1/x509/PolicyMappings.cs rename to src/BouncyCastle/asn1/x509/PolicyMappings.cs diff --git a/crypto/src/asn1/x509/PolicyQualifierId.cs b/src/BouncyCastle/asn1/x509/PolicyQualifierId.cs similarity index 100% rename from crypto/src/asn1/x509/PolicyQualifierId.cs rename to src/BouncyCastle/asn1/x509/PolicyQualifierId.cs diff --git a/crypto/src/asn1/x509/PolicyQualifierInfo.cs b/src/BouncyCastle/asn1/x509/PolicyQualifierInfo.cs similarity index 100% rename from crypto/src/asn1/x509/PolicyQualifierInfo.cs rename to src/BouncyCastle/asn1/x509/PolicyQualifierInfo.cs diff --git a/crypto/src/asn1/x509/PrivateKeyUsagePeriod.cs b/src/BouncyCastle/asn1/x509/PrivateKeyUsagePeriod.cs similarity index 100% rename from crypto/src/asn1/x509/PrivateKeyUsagePeriod.cs rename to src/BouncyCastle/asn1/x509/PrivateKeyUsagePeriod.cs diff --git a/crypto/src/asn1/x509/RSAPublicKeyStructure.cs b/src/BouncyCastle/asn1/x509/RSAPublicKeyStructure.cs similarity index 100% rename from crypto/src/asn1/x509/RSAPublicKeyStructure.cs rename to src/BouncyCastle/asn1/x509/RSAPublicKeyStructure.cs diff --git a/crypto/src/asn1/x509/ReasonFlags.cs b/src/BouncyCastle/asn1/x509/ReasonFlags.cs similarity index 100% rename from crypto/src/asn1/x509/ReasonFlags.cs rename to src/BouncyCastle/asn1/x509/ReasonFlags.cs diff --git a/crypto/src/asn1/x509/RoleSyntax.cs b/src/BouncyCastle/asn1/x509/RoleSyntax.cs similarity index 100% rename from crypto/src/asn1/x509/RoleSyntax.cs rename to src/BouncyCastle/asn1/x509/RoleSyntax.cs diff --git a/crypto/src/asn1/x509/SubjectDirectoryAttributes.cs b/src/BouncyCastle/asn1/x509/SubjectDirectoryAttributes.cs similarity index 100% rename from crypto/src/asn1/x509/SubjectDirectoryAttributes.cs rename to src/BouncyCastle/asn1/x509/SubjectDirectoryAttributes.cs diff --git a/crypto/src/asn1/x509/SubjectKeyIdentifier.cs b/src/BouncyCastle/asn1/x509/SubjectKeyIdentifier.cs similarity index 100% rename from crypto/src/asn1/x509/SubjectKeyIdentifier.cs rename to src/BouncyCastle/asn1/x509/SubjectKeyIdentifier.cs diff --git a/crypto/src/asn1/x509/SubjectPublicKeyInfo.cs b/src/BouncyCastle/asn1/x509/SubjectPublicKeyInfo.cs similarity index 100% rename from crypto/src/asn1/x509/SubjectPublicKeyInfo.cs rename to src/BouncyCastle/asn1/x509/SubjectPublicKeyInfo.cs diff --git a/crypto/src/asn1/x509/TBSCertList.cs b/src/BouncyCastle/asn1/x509/TBSCertList.cs similarity index 100% rename from crypto/src/asn1/x509/TBSCertList.cs rename to src/BouncyCastle/asn1/x509/TBSCertList.cs diff --git a/crypto/src/asn1/x509/TBSCertificateStructure.cs b/src/BouncyCastle/asn1/x509/TBSCertificateStructure.cs similarity index 100% rename from crypto/src/asn1/x509/TBSCertificateStructure.cs rename to src/BouncyCastle/asn1/x509/TBSCertificateStructure.cs diff --git a/crypto/src/asn1/x509/Target.cs b/src/BouncyCastle/asn1/x509/Target.cs similarity index 100% rename from crypto/src/asn1/x509/Target.cs rename to src/BouncyCastle/asn1/x509/Target.cs diff --git a/crypto/src/asn1/x509/TargetInformation.cs b/src/BouncyCastle/asn1/x509/TargetInformation.cs similarity index 100% rename from crypto/src/asn1/x509/TargetInformation.cs rename to src/BouncyCastle/asn1/x509/TargetInformation.cs diff --git a/crypto/src/asn1/x509/Targets.cs b/src/BouncyCastle/asn1/x509/Targets.cs similarity index 100% rename from crypto/src/asn1/x509/Targets.cs rename to src/BouncyCastle/asn1/x509/Targets.cs diff --git a/crypto/src/asn1/x509/Time.cs b/src/BouncyCastle/asn1/x509/Time.cs similarity index 100% rename from crypto/src/asn1/x509/Time.cs rename to src/BouncyCastle/asn1/x509/Time.cs diff --git a/crypto/src/asn1/x509/UserNotice.cs b/src/BouncyCastle/asn1/x509/UserNotice.cs similarity index 100% rename from crypto/src/asn1/x509/UserNotice.cs rename to src/BouncyCastle/asn1/x509/UserNotice.cs diff --git a/crypto/src/asn1/x509/V1TBSCertificateGenerator.cs b/src/BouncyCastle/asn1/x509/V1TBSCertificateGenerator.cs similarity index 100% rename from crypto/src/asn1/x509/V1TBSCertificateGenerator.cs rename to src/BouncyCastle/asn1/x509/V1TBSCertificateGenerator.cs diff --git a/crypto/src/asn1/x509/V2AttributeCertificateInfoGenerator.cs b/src/BouncyCastle/asn1/x509/V2AttributeCertificateInfoGenerator.cs similarity index 100% rename from crypto/src/asn1/x509/V2AttributeCertificateInfoGenerator.cs rename to src/BouncyCastle/asn1/x509/V2AttributeCertificateInfoGenerator.cs diff --git a/crypto/src/asn1/x509/V2Form.cs b/src/BouncyCastle/asn1/x509/V2Form.cs similarity index 100% rename from crypto/src/asn1/x509/V2Form.cs rename to src/BouncyCastle/asn1/x509/V2Form.cs diff --git a/crypto/src/asn1/x509/V2TBSCertListGenerator.cs b/src/BouncyCastle/asn1/x509/V2TBSCertListGenerator.cs similarity index 100% rename from crypto/src/asn1/x509/V2TBSCertListGenerator.cs rename to src/BouncyCastle/asn1/x509/V2TBSCertListGenerator.cs diff --git a/crypto/src/asn1/x509/V3TBSCertificateGenerator.cs b/src/BouncyCastle/asn1/x509/V3TBSCertificateGenerator.cs similarity index 100% rename from crypto/src/asn1/x509/V3TBSCertificateGenerator.cs rename to src/BouncyCastle/asn1/x509/V3TBSCertificateGenerator.cs diff --git a/crypto/src/asn1/x509/X509Attributes.cs b/src/BouncyCastle/asn1/x509/X509Attributes.cs similarity index 100% rename from crypto/src/asn1/x509/X509Attributes.cs rename to src/BouncyCastle/asn1/x509/X509Attributes.cs diff --git a/crypto/src/asn1/x509/X509CertificateStructure.cs b/src/BouncyCastle/asn1/x509/X509CertificateStructure.cs similarity index 100% rename from crypto/src/asn1/x509/X509CertificateStructure.cs rename to src/BouncyCastle/asn1/x509/X509CertificateStructure.cs diff --git a/crypto/src/asn1/x509/X509DefaultEntryConverter.cs b/src/BouncyCastle/asn1/x509/X509DefaultEntryConverter.cs similarity index 100% rename from crypto/src/asn1/x509/X509DefaultEntryConverter.cs rename to src/BouncyCastle/asn1/x509/X509DefaultEntryConverter.cs diff --git a/crypto/src/asn1/x509/X509Extension.cs b/src/BouncyCastle/asn1/x509/X509Extension.cs similarity index 100% rename from crypto/src/asn1/x509/X509Extension.cs rename to src/BouncyCastle/asn1/x509/X509Extension.cs diff --git a/crypto/src/asn1/x509/X509Extensions.cs b/src/BouncyCastle/asn1/x509/X509Extensions.cs similarity index 100% rename from crypto/src/asn1/x509/X509Extensions.cs rename to src/BouncyCastle/asn1/x509/X509Extensions.cs diff --git a/crypto/src/asn1/x509/X509ExtensionsGenerator.cs b/src/BouncyCastle/asn1/x509/X509ExtensionsGenerator.cs similarity index 100% rename from crypto/src/asn1/x509/X509ExtensionsGenerator.cs rename to src/BouncyCastle/asn1/x509/X509ExtensionsGenerator.cs diff --git a/crypto/src/asn1/x509/X509Name.cs b/src/BouncyCastle/asn1/x509/X509Name.cs similarity index 100% rename from crypto/src/asn1/x509/X509Name.cs rename to src/BouncyCastle/asn1/x509/X509Name.cs diff --git a/crypto/src/asn1/x509/X509NameEntryConverter.cs b/src/BouncyCastle/asn1/x509/X509NameEntryConverter.cs similarity index 100% rename from crypto/src/asn1/x509/X509NameEntryConverter.cs rename to src/BouncyCastle/asn1/x509/X509NameEntryConverter.cs diff --git a/crypto/src/asn1/x509/X509NameTokenizer.cs b/src/BouncyCastle/asn1/x509/X509NameTokenizer.cs similarity index 100% rename from crypto/src/asn1/x509/X509NameTokenizer.cs rename to src/BouncyCastle/asn1/x509/X509NameTokenizer.cs diff --git a/crypto/src/asn1/x509/X509ObjectIdentifiers.cs b/src/BouncyCastle/asn1/x509/X509ObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/x509/X509ObjectIdentifiers.cs rename to src/BouncyCastle/asn1/x509/X509ObjectIdentifiers.cs diff --git a/crypto/src/asn1/x509/qualified/BiometricData.cs b/src/BouncyCastle/asn1/x509/qualified/BiometricData.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/BiometricData.cs rename to src/BouncyCastle/asn1/x509/qualified/BiometricData.cs diff --git a/crypto/src/asn1/x509/qualified/ETSIQCObjectIdentifiers.cs b/src/BouncyCastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/ETSIQCObjectIdentifiers.cs rename to src/BouncyCastle/asn1/x509/qualified/ETSIQCObjectIdentifiers.cs diff --git a/crypto/src/asn1/x509/qualified/Iso4217CurrencyCode.cs b/src/BouncyCastle/asn1/x509/qualified/Iso4217CurrencyCode.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/Iso4217CurrencyCode.cs rename to src/BouncyCastle/asn1/x509/qualified/Iso4217CurrencyCode.cs diff --git a/crypto/src/asn1/x509/qualified/MonetaryValue.cs b/src/BouncyCastle/asn1/x509/qualified/MonetaryValue.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/MonetaryValue.cs rename to src/BouncyCastle/asn1/x509/qualified/MonetaryValue.cs diff --git a/crypto/src/asn1/x509/qualified/QCStatement.cs b/src/BouncyCastle/asn1/x509/qualified/QCStatement.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/QCStatement.cs rename to src/BouncyCastle/asn1/x509/qualified/QCStatement.cs diff --git a/crypto/src/asn1/x509/qualified/RFC3739QCObjectIdentifiers.cs b/src/BouncyCastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/RFC3739QCObjectIdentifiers.cs rename to src/BouncyCastle/asn1/x509/qualified/RFC3739QCObjectIdentifiers.cs diff --git a/crypto/src/asn1/x509/qualified/SemanticsInformation.cs b/src/BouncyCastle/asn1/x509/qualified/SemanticsInformation.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/SemanticsInformation.cs rename to src/BouncyCastle/asn1/x509/qualified/SemanticsInformation.cs diff --git a/crypto/src/asn1/x509/qualified/TypeOfBiometricData.cs b/src/BouncyCastle/asn1/x509/qualified/TypeOfBiometricData.cs similarity index 100% rename from crypto/src/asn1/x509/qualified/TypeOfBiometricData.cs rename to src/BouncyCastle/asn1/x509/qualified/TypeOfBiometricData.cs diff --git a/crypto/src/asn1/x509/sigi/NameOrPseudonym.cs b/src/BouncyCastle/asn1/x509/sigi/NameOrPseudonym.cs similarity index 100% rename from crypto/src/asn1/x509/sigi/NameOrPseudonym.cs rename to src/BouncyCastle/asn1/x509/sigi/NameOrPseudonym.cs diff --git a/crypto/src/asn1/x509/sigi/PersonalData.cs b/src/BouncyCastle/asn1/x509/sigi/PersonalData.cs similarity index 100% rename from crypto/src/asn1/x509/sigi/PersonalData.cs rename to src/BouncyCastle/asn1/x509/sigi/PersonalData.cs diff --git a/crypto/src/asn1/x509/sigi/SigIObjectIdentifiers.cs b/src/BouncyCastle/asn1/x509/sigi/SigIObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/x509/sigi/SigIObjectIdentifiers.cs rename to src/BouncyCastle/asn1/x509/sigi/SigIObjectIdentifiers.cs diff --git a/crypto/src/asn1/x9/DHDomainParameters.cs b/src/BouncyCastle/asn1/x9/DHDomainParameters.cs similarity index 100% rename from crypto/src/asn1/x9/DHDomainParameters.cs rename to src/BouncyCastle/asn1/x9/DHDomainParameters.cs diff --git a/crypto/src/asn1/x9/DHPublicKey.cs b/src/BouncyCastle/asn1/x9/DHPublicKey.cs similarity index 100% rename from crypto/src/asn1/x9/DHPublicKey.cs rename to src/BouncyCastle/asn1/x9/DHPublicKey.cs diff --git a/crypto/src/asn1/x9/DHValidationParms.cs b/src/BouncyCastle/asn1/x9/DHValidationParms.cs similarity index 100% rename from crypto/src/asn1/x9/DHValidationParms.cs rename to src/BouncyCastle/asn1/x9/DHValidationParms.cs diff --git a/crypto/src/asn1/x9/ECNamedCurveTable.cs b/src/BouncyCastle/asn1/x9/ECNamedCurveTable.cs similarity index 100% rename from crypto/src/asn1/x9/ECNamedCurveTable.cs rename to src/BouncyCastle/asn1/x9/ECNamedCurveTable.cs diff --git a/crypto/src/asn1/x9/KeySpecificInfo.cs b/src/BouncyCastle/asn1/x9/KeySpecificInfo.cs similarity index 100% rename from crypto/src/asn1/x9/KeySpecificInfo.cs rename to src/BouncyCastle/asn1/x9/KeySpecificInfo.cs diff --git a/crypto/src/asn1/x9/OtherInfo.cs b/src/BouncyCastle/asn1/x9/OtherInfo.cs similarity index 100% rename from crypto/src/asn1/x9/OtherInfo.cs rename to src/BouncyCastle/asn1/x9/OtherInfo.cs diff --git a/crypto/src/asn1/x9/X962NamedCurves.cs b/src/BouncyCastle/asn1/x9/X962NamedCurves.cs similarity index 100% rename from crypto/src/asn1/x9/X962NamedCurves.cs rename to src/BouncyCastle/asn1/x9/X962NamedCurves.cs diff --git a/crypto/src/asn1/x9/X962Parameters.cs b/src/BouncyCastle/asn1/x9/X962Parameters.cs similarity index 100% rename from crypto/src/asn1/x9/X962Parameters.cs rename to src/BouncyCastle/asn1/x9/X962Parameters.cs diff --git a/crypto/src/asn1/x9/X9Curve.cs b/src/BouncyCastle/asn1/x9/X9Curve.cs similarity index 100% rename from crypto/src/asn1/x9/X9Curve.cs rename to src/BouncyCastle/asn1/x9/X9Curve.cs diff --git a/crypto/src/asn1/x9/X9ECParameters.cs b/src/BouncyCastle/asn1/x9/X9ECParameters.cs similarity index 100% rename from crypto/src/asn1/x9/X9ECParameters.cs rename to src/BouncyCastle/asn1/x9/X9ECParameters.cs diff --git a/crypto/src/asn1/x9/X9ECParametersHolder.cs b/src/BouncyCastle/asn1/x9/X9ECParametersHolder.cs similarity index 100% rename from crypto/src/asn1/x9/X9ECParametersHolder.cs rename to src/BouncyCastle/asn1/x9/X9ECParametersHolder.cs diff --git a/crypto/src/asn1/x9/X9ECPoint.cs b/src/BouncyCastle/asn1/x9/X9ECPoint.cs similarity index 100% rename from crypto/src/asn1/x9/X9ECPoint.cs rename to src/BouncyCastle/asn1/x9/X9ECPoint.cs diff --git a/crypto/src/asn1/x9/X9FieldElement.cs b/src/BouncyCastle/asn1/x9/X9FieldElement.cs similarity index 100% rename from crypto/src/asn1/x9/X9FieldElement.cs rename to src/BouncyCastle/asn1/x9/X9FieldElement.cs diff --git a/crypto/src/asn1/x9/X9FieldID.cs b/src/BouncyCastle/asn1/x9/X9FieldID.cs similarity index 100% rename from crypto/src/asn1/x9/X9FieldID.cs rename to src/BouncyCastle/asn1/x9/X9FieldID.cs diff --git a/crypto/src/asn1/x9/X9IntegerConverter.cs b/src/BouncyCastle/asn1/x9/X9IntegerConverter.cs similarity index 100% rename from crypto/src/asn1/x9/X9IntegerConverter.cs rename to src/BouncyCastle/asn1/x9/X9IntegerConverter.cs diff --git a/crypto/src/asn1/x9/X9ObjectIdentifiers.cs b/src/BouncyCastle/asn1/x9/X9ObjectIdentifiers.cs similarity index 100% rename from crypto/src/asn1/x9/X9ObjectIdentifiers.cs rename to src/BouncyCastle/asn1/x9/X9ObjectIdentifiers.cs diff --git a/crypto/src/bcpg/ArmoredInputStream.cs b/src/BouncyCastle/bcpg/ArmoredInputStream.cs similarity index 100% rename from crypto/src/bcpg/ArmoredInputStream.cs rename to src/BouncyCastle/bcpg/ArmoredInputStream.cs diff --git a/crypto/src/bcpg/ArmoredOutputStream.cs b/src/BouncyCastle/bcpg/ArmoredOutputStream.cs similarity index 100% rename from crypto/src/bcpg/ArmoredOutputStream.cs rename to src/BouncyCastle/bcpg/ArmoredOutputStream.cs diff --git a/crypto/src/bcpg/BcpgInputStream.cs b/src/BouncyCastle/bcpg/BcpgInputStream.cs similarity index 100% rename from crypto/src/bcpg/BcpgInputStream.cs rename to src/BouncyCastle/bcpg/BcpgInputStream.cs diff --git a/crypto/src/bcpg/BcpgObject.cs b/src/BouncyCastle/bcpg/BcpgObject.cs similarity index 100% rename from crypto/src/bcpg/BcpgObject.cs rename to src/BouncyCastle/bcpg/BcpgObject.cs diff --git a/crypto/src/bcpg/BcpgOutputStream.cs b/src/BouncyCastle/bcpg/BcpgOutputStream.cs similarity index 100% rename from crypto/src/bcpg/BcpgOutputStream.cs rename to src/BouncyCastle/bcpg/BcpgOutputStream.cs diff --git a/crypto/src/bcpg/CompressedDataPacket.cs b/src/BouncyCastle/bcpg/CompressedDataPacket.cs similarity index 100% rename from crypto/src/bcpg/CompressedDataPacket.cs rename to src/BouncyCastle/bcpg/CompressedDataPacket.cs diff --git a/crypto/src/bcpg/CompressionAlgorithmTags.cs b/src/BouncyCastle/bcpg/CompressionAlgorithmTags.cs similarity index 100% rename from crypto/src/bcpg/CompressionAlgorithmTags.cs rename to src/BouncyCastle/bcpg/CompressionAlgorithmTags.cs diff --git a/crypto/src/bcpg/ContainedPacket.cs b/src/BouncyCastle/bcpg/ContainedPacket.cs similarity index 100% rename from crypto/src/bcpg/ContainedPacket.cs rename to src/BouncyCastle/bcpg/ContainedPacket.cs diff --git a/crypto/src/bcpg/Crc24.cs b/src/BouncyCastle/bcpg/Crc24.cs similarity index 100% rename from crypto/src/bcpg/Crc24.cs rename to src/BouncyCastle/bcpg/Crc24.cs diff --git a/crypto/src/bcpg/DsaPublicBcpgKey.cs b/src/BouncyCastle/bcpg/DsaPublicBcpgKey.cs similarity index 100% rename from crypto/src/bcpg/DsaPublicBcpgKey.cs rename to src/BouncyCastle/bcpg/DsaPublicBcpgKey.cs diff --git a/crypto/src/bcpg/DsaSecretBcpgKey.cs b/src/BouncyCastle/bcpg/DsaSecretBcpgKey.cs similarity index 100% rename from crypto/src/bcpg/DsaSecretBcpgKey.cs rename to src/BouncyCastle/bcpg/DsaSecretBcpgKey.cs diff --git a/crypto/src/bcpg/ECDHPublicBCPGKey.cs b/src/BouncyCastle/bcpg/ECDHPublicBCPGKey.cs similarity index 100% rename from crypto/src/bcpg/ECDHPublicBCPGKey.cs rename to src/BouncyCastle/bcpg/ECDHPublicBCPGKey.cs diff --git a/crypto/src/bcpg/ECDsaPublicBCPGKey.cs b/src/BouncyCastle/bcpg/ECDsaPublicBCPGKey.cs similarity index 100% rename from crypto/src/bcpg/ECDsaPublicBCPGKey.cs rename to src/BouncyCastle/bcpg/ECDsaPublicBCPGKey.cs diff --git a/crypto/src/bcpg/ECPublicBCPGKey.cs b/src/BouncyCastle/bcpg/ECPublicBCPGKey.cs similarity index 100% rename from crypto/src/bcpg/ECPublicBCPGKey.cs rename to src/BouncyCastle/bcpg/ECPublicBCPGKey.cs diff --git a/crypto/src/bcpg/ECSecretBCPGKey.cs b/src/BouncyCastle/bcpg/ECSecretBCPGKey.cs similarity index 100% rename from crypto/src/bcpg/ECSecretBCPGKey.cs rename to src/BouncyCastle/bcpg/ECSecretBCPGKey.cs diff --git a/crypto/src/bcpg/ElGamalPublicBcpgKey.cs b/src/BouncyCastle/bcpg/ElGamalPublicBcpgKey.cs similarity index 100% rename from crypto/src/bcpg/ElGamalPublicBcpgKey.cs rename to src/BouncyCastle/bcpg/ElGamalPublicBcpgKey.cs diff --git a/crypto/src/bcpg/ElGamalSecretBcpgKey.cs b/src/BouncyCastle/bcpg/ElGamalSecretBcpgKey.cs similarity index 100% rename from crypto/src/bcpg/ElGamalSecretBcpgKey.cs rename to src/BouncyCastle/bcpg/ElGamalSecretBcpgKey.cs diff --git a/crypto/src/bcpg/ExperimentalPacket.cs b/src/BouncyCastle/bcpg/ExperimentalPacket.cs similarity index 100% rename from crypto/src/bcpg/ExperimentalPacket.cs rename to src/BouncyCastle/bcpg/ExperimentalPacket.cs diff --git a/crypto/src/bcpg/HashAlgorithmTags.cs b/src/BouncyCastle/bcpg/HashAlgorithmTags.cs similarity index 100% rename from crypto/src/bcpg/HashAlgorithmTags.cs rename to src/BouncyCastle/bcpg/HashAlgorithmTags.cs diff --git a/crypto/src/bcpg/IBcpgKey.cs b/src/BouncyCastle/bcpg/IBcpgKey.cs similarity index 100% rename from crypto/src/bcpg/IBcpgKey.cs rename to src/BouncyCastle/bcpg/IBcpgKey.cs diff --git a/crypto/src/bcpg/InputStreamPacket.cs b/src/BouncyCastle/bcpg/InputStreamPacket.cs similarity index 100% rename from crypto/src/bcpg/InputStreamPacket.cs rename to src/BouncyCastle/bcpg/InputStreamPacket.cs diff --git a/crypto/src/bcpg/LiteralDataPacket.cs b/src/BouncyCastle/bcpg/LiteralDataPacket.cs similarity index 100% rename from crypto/src/bcpg/LiteralDataPacket.cs rename to src/BouncyCastle/bcpg/LiteralDataPacket.cs diff --git a/crypto/src/bcpg/MPInteger.cs b/src/BouncyCastle/bcpg/MPInteger.cs similarity index 100% rename from crypto/src/bcpg/MPInteger.cs rename to src/BouncyCastle/bcpg/MPInteger.cs diff --git a/crypto/src/bcpg/MarkerPacket.cs b/src/BouncyCastle/bcpg/MarkerPacket.cs similarity index 100% rename from crypto/src/bcpg/MarkerPacket.cs rename to src/BouncyCastle/bcpg/MarkerPacket.cs diff --git a/crypto/src/bcpg/ModDetectionCodePacket.cs b/src/BouncyCastle/bcpg/ModDetectionCodePacket.cs similarity index 100% rename from crypto/src/bcpg/ModDetectionCodePacket.cs rename to src/BouncyCastle/bcpg/ModDetectionCodePacket.cs diff --git a/crypto/src/bcpg/OnePassSignaturePacket.cs b/src/BouncyCastle/bcpg/OnePassSignaturePacket.cs similarity index 100% rename from crypto/src/bcpg/OnePassSignaturePacket.cs rename to src/BouncyCastle/bcpg/OnePassSignaturePacket.cs diff --git a/crypto/src/bcpg/OutputStreamPacket.cs b/src/BouncyCastle/bcpg/OutputStreamPacket.cs similarity index 100% rename from crypto/src/bcpg/OutputStreamPacket.cs rename to src/BouncyCastle/bcpg/OutputStreamPacket.cs diff --git a/crypto/src/bcpg/Packet.cs b/src/BouncyCastle/bcpg/Packet.cs similarity index 100% rename from crypto/src/bcpg/Packet.cs rename to src/BouncyCastle/bcpg/Packet.cs diff --git a/crypto/src/bcpg/PacketTags.cs b/src/BouncyCastle/bcpg/PacketTags.cs similarity index 100% rename from crypto/src/bcpg/PacketTags.cs rename to src/BouncyCastle/bcpg/PacketTags.cs diff --git a/crypto/src/bcpg/PublicKeyAlgorithmTags.cs b/src/BouncyCastle/bcpg/PublicKeyAlgorithmTags.cs similarity index 100% rename from crypto/src/bcpg/PublicKeyAlgorithmTags.cs rename to src/BouncyCastle/bcpg/PublicKeyAlgorithmTags.cs diff --git a/crypto/src/bcpg/PublicKeyEncSessionPacket.cs b/src/BouncyCastle/bcpg/PublicKeyEncSessionPacket.cs similarity index 100% rename from crypto/src/bcpg/PublicKeyEncSessionPacket.cs rename to src/BouncyCastle/bcpg/PublicKeyEncSessionPacket.cs diff --git a/crypto/src/bcpg/PublicKeyPacket.cs b/src/BouncyCastle/bcpg/PublicKeyPacket.cs similarity index 100% rename from crypto/src/bcpg/PublicKeyPacket.cs rename to src/BouncyCastle/bcpg/PublicKeyPacket.cs diff --git a/crypto/src/bcpg/PublicSubkeyPacket.cs b/src/BouncyCastle/bcpg/PublicSubkeyPacket.cs similarity index 100% rename from crypto/src/bcpg/PublicSubkeyPacket.cs rename to src/BouncyCastle/bcpg/PublicSubkeyPacket.cs diff --git a/crypto/src/bcpg/RsaPublicBcpgKey.cs b/src/BouncyCastle/bcpg/RsaPublicBcpgKey.cs similarity index 100% rename from crypto/src/bcpg/RsaPublicBcpgKey.cs rename to src/BouncyCastle/bcpg/RsaPublicBcpgKey.cs diff --git a/crypto/src/bcpg/RsaSecretBcpgKey.cs b/src/BouncyCastle/bcpg/RsaSecretBcpgKey.cs similarity index 100% rename from crypto/src/bcpg/RsaSecretBcpgKey.cs rename to src/BouncyCastle/bcpg/RsaSecretBcpgKey.cs diff --git a/crypto/src/bcpg/S2k.cs b/src/BouncyCastle/bcpg/S2k.cs similarity index 100% rename from crypto/src/bcpg/S2k.cs rename to src/BouncyCastle/bcpg/S2k.cs diff --git a/crypto/src/bcpg/SecretKeyPacket.cs b/src/BouncyCastle/bcpg/SecretKeyPacket.cs similarity index 100% rename from crypto/src/bcpg/SecretKeyPacket.cs rename to src/BouncyCastle/bcpg/SecretKeyPacket.cs diff --git a/crypto/src/bcpg/SecretSubkeyPacket.cs b/src/BouncyCastle/bcpg/SecretSubkeyPacket.cs similarity index 100% rename from crypto/src/bcpg/SecretSubkeyPacket.cs rename to src/BouncyCastle/bcpg/SecretSubkeyPacket.cs diff --git a/crypto/src/bcpg/SignaturePacket.cs b/src/BouncyCastle/bcpg/SignaturePacket.cs similarity index 100% rename from crypto/src/bcpg/SignaturePacket.cs rename to src/BouncyCastle/bcpg/SignaturePacket.cs diff --git a/crypto/src/bcpg/SignatureSubpacket.cs b/src/BouncyCastle/bcpg/SignatureSubpacket.cs similarity index 100% rename from crypto/src/bcpg/SignatureSubpacket.cs rename to src/BouncyCastle/bcpg/SignatureSubpacket.cs diff --git a/crypto/src/bcpg/SignatureSubpacketTags.cs b/src/BouncyCastle/bcpg/SignatureSubpacketTags.cs similarity index 100% rename from crypto/src/bcpg/SignatureSubpacketTags.cs rename to src/BouncyCastle/bcpg/SignatureSubpacketTags.cs diff --git a/crypto/src/bcpg/SignatureSubpacketsReader.cs b/src/BouncyCastle/bcpg/SignatureSubpacketsReader.cs similarity index 100% rename from crypto/src/bcpg/SignatureSubpacketsReader.cs rename to src/BouncyCastle/bcpg/SignatureSubpacketsReader.cs diff --git a/crypto/src/bcpg/SymmetricEncDataPacket.cs b/src/BouncyCastle/bcpg/SymmetricEncDataPacket.cs similarity index 100% rename from crypto/src/bcpg/SymmetricEncDataPacket.cs rename to src/BouncyCastle/bcpg/SymmetricEncDataPacket.cs diff --git a/crypto/src/bcpg/SymmetricEncIntegrityPacket.cs b/src/BouncyCastle/bcpg/SymmetricEncIntegrityPacket.cs similarity index 100% rename from crypto/src/bcpg/SymmetricEncIntegrityPacket.cs rename to src/BouncyCastle/bcpg/SymmetricEncIntegrityPacket.cs diff --git a/crypto/src/bcpg/SymmetricKeyAlgorithmTags.cs b/src/BouncyCastle/bcpg/SymmetricKeyAlgorithmTags.cs similarity index 100% rename from crypto/src/bcpg/SymmetricKeyAlgorithmTags.cs rename to src/BouncyCastle/bcpg/SymmetricKeyAlgorithmTags.cs diff --git a/crypto/src/bcpg/SymmetricKeyEncSessionPacket.cs b/src/BouncyCastle/bcpg/SymmetricKeyEncSessionPacket.cs similarity index 100% rename from crypto/src/bcpg/SymmetricKeyEncSessionPacket.cs rename to src/BouncyCastle/bcpg/SymmetricKeyEncSessionPacket.cs diff --git a/crypto/src/bcpg/TrustPacket.cs b/src/BouncyCastle/bcpg/TrustPacket.cs similarity index 100% rename from crypto/src/bcpg/TrustPacket.cs rename to src/BouncyCastle/bcpg/TrustPacket.cs diff --git a/crypto/src/bcpg/UserAttributePacket.cs b/src/BouncyCastle/bcpg/UserAttributePacket.cs similarity index 100% rename from crypto/src/bcpg/UserAttributePacket.cs rename to src/BouncyCastle/bcpg/UserAttributePacket.cs diff --git a/crypto/src/bcpg/UserAttributeSubpacket.cs b/src/BouncyCastle/bcpg/UserAttributeSubpacket.cs similarity index 100% rename from crypto/src/bcpg/UserAttributeSubpacket.cs rename to src/BouncyCastle/bcpg/UserAttributeSubpacket.cs diff --git a/crypto/src/bcpg/UserAttributeSubpacketTags.cs b/src/BouncyCastle/bcpg/UserAttributeSubpacketTags.cs similarity index 100% rename from crypto/src/bcpg/UserAttributeSubpacketTags.cs rename to src/BouncyCastle/bcpg/UserAttributeSubpacketTags.cs diff --git a/crypto/src/bcpg/UserAttributeSubpacketsReader.cs b/src/BouncyCastle/bcpg/UserAttributeSubpacketsReader.cs similarity index 100% rename from crypto/src/bcpg/UserAttributeSubpacketsReader.cs rename to src/BouncyCastle/bcpg/UserAttributeSubpacketsReader.cs diff --git a/crypto/src/bcpg/UserIdPacket.cs b/src/BouncyCastle/bcpg/UserIdPacket.cs similarity index 100% rename from crypto/src/bcpg/UserIdPacket.cs rename to src/BouncyCastle/bcpg/UserIdPacket.cs diff --git a/crypto/src/bcpg/attr/ImageAttrib.cs b/src/BouncyCastle/bcpg/attr/ImageAttrib.cs similarity index 100% rename from crypto/src/bcpg/attr/ImageAttrib.cs rename to src/BouncyCastle/bcpg/attr/ImageAttrib.cs diff --git a/crypto/src/bcpg/sig/EmbeddedSignature.cs b/src/BouncyCastle/bcpg/sig/EmbeddedSignature.cs similarity index 100% rename from crypto/src/bcpg/sig/EmbeddedSignature.cs rename to src/BouncyCastle/bcpg/sig/EmbeddedSignature.cs diff --git a/crypto/src/bcpg/sig/Exportable.cs b/src/BouncyCastle/bcpg/sig/Exportable.cs similarity index 100% rename from crypto/src/bcpg/sig/Exportable.cs rename to src/BouncyCastle/bcpg/sig/Exportable.cs diff --git a/crypto/src/bcpg/sig/Features.cs b/src/BouncyCastle/bcpg/sig/Features.cs similarity index 100% rename from crypto/src/bcpg/sig/Features.cs rename to src/BouncyCastle/bcpg/sig/Features.cs diff --git a/crypto/src/bcpg/sig/IssuerKeyId.cs b/src/BouncyCastle/bcpg/sig/IssuerKeyId.cs similarity index 100% rename from crypto/src/bcpg/sig/IssuerKeyId.cs rename to src/BouncyCastle/bcpg/sig/IssuerKeyId.cs diff --git a/crypto/src/bcpg/sig/KeyExpirationTime.cs b/src/BouncyCastle/bcpg/sig/KeyExpirationTime.cs similarity index 100% rename from crypto/src/bcpg/sig/KeyExpirationTime.cs rename to src/BouncyCastle/bcpg/sig/KeyExpirationTime.cs diff --git a/crypto/src/bcpg/sig/KeyFlags.cs b/src/BouncyCastle/bcpg/sig/KeyFlags.cs similarity index 100% rename from crypto/src/bcpg/sig/KeyFlags.cs rename to src/BouncyCastle/bcpg/sig/KeyFlags.cs diff --git a/crypto/src/bcpg/sig/NotationData.cs b/src/BouncyCastle/bcpg/sig/NotationData.cs similarity index 100% rename from crypto/src/bcpg/sig/NotationData.cs rename to src/BouncyCastle/bcpg/sig/NotationData.cs diff --git a/crypto/src/bcpg/sig/PreferredAlgorithms.cs b/src/BouncyCastle/bcpg/sig/PreferredAlgorithms.cs similarity index 100% rename from crypto/src/bcpg/sig/PreferredAlgorithms.cs rename to src/BouncyCastle/bcpg/sig/PreferredAlgorithms.cs diff --git a/crypto/src/bcpg/sig/PrimaryUserId.cs b/src/BouncyCastle/bcpg/sig/PrimaryUserId.cs similarity index 100% rename from crypto/src/bcpg/sig/PrimaryUserId.cs rename to src/BouncyCastle/bcpg/sig/PrimaryUserId.cs diff --git a/crypto/src/bcpg/sig/Revocable.cs b/src/BouncyCastle/bcpg/sig/Revocable.cs similarity index 100% rename from crypto/src/bcpg/sig/Revocable.cs rename to src/BouncyCastle/bcpg/sig/Revocable.cs diff --git a/crypto/src/bcpg/sig/RevocationKey.cs b/src/BouncyCastle/bcpg/sig/RevocationKey.cs similarity index 100% rename from crypto/src/bcpg/sig/RevocationKey.cs rename to src/BouncyCastle/bcpg/sig/RevocationKey.cs diff --git a/crypto/src/bcpg/sig/RevocationKeyTags.cs b/src/BouncyCastle/bcpg/sig/RevocationKeyTags.cs similarity index 100% rename from crypto/src/bcpg/sig/RevocationKeyTags.cs rename to src/BouncyCastle/bcpg/sig/RevocationKeyTags.cs diff --git a/crypto/src/bcpg/sig/RevocationReason.cs b/src/BouncyCastle/bcpg/sig/RevocationReason.cs similarity index 100% rename from crypto/src/bcpg/sig/RevocationReason.cs rename to src/BouncyCastle/bcpg/sig/RevocationReason.cs diff --git a/crypto/src/bcpg/sig/RevocationReasonTags.cs b/src/BouncyCastle/bcpg/sig/RevocationReasonTags.cs similarity index 100% rename from crypto/src/bcpg/sig/RevocationReasonTags.cs rename to src/BouncyCastle/bcpg/sig/RevocationReasonTags.cs diff --git a/crypto/src/bcpg/sig/SignatureCreationTime.cs b/src/BouncyCastle/bcpg/sig/SignatureCreationTime.cs similarity index 100% rename from crypto/src/bcpg/sig/SignatureCreationTime.cs rename to src/BouncyCastle/bcpg/sig/SignatureCreationTime.cs diff --git a/crypto/src/bcpg/sig/SignatureExpirationTime.cs b/src/BouncyCastle/bcpg/sig/SignatureExpirationTime.cs similarity index 100% rename from crypto/src/bcpg/sig/SignatureExpirationTime.cs rename to src/BouncyCastle/bcpg/sig/SignatureExpirationTime.cs diff --git a/crypto/src/bcpg/sig/SignerUserId.cs b/src/BouncyCastle/bcpg/sig/SignerUserId.cs similarity index 100% rename from crypto/src/bcpg/sig/SignerUserId.cs rename to src/BouncyCastle/bcpg/sig/SignerUserId.cs diff --git a/crypto/src/bcpg/sig/TrustSignature.cs b/src/BouncyCastle/bcpg/sig/TrustSignature.cs similarity index 100% rename from crypto/src/bcpg/sig/TrustSignature.cs rename to src/BouncyCastle/bcpg/sig/TrustSignature.cs diff --git a/crypto/bzip2/src/BZip2Constants.cs b/src/BouncyCastle/bzip2/src/BZip2Constants.cs similarity index 100% rename from crypto/bzip2/src/BZip2Constants.cs rename to src/BouncyCastle/bzip2/src/BZip2Constants.cs diff --git a/crypto/bzip2/src/CBZip2InputStream.cs b/src/BouncyCastle/bzip2/src/CBZip2InputStream.cs similarity index 100% rename from crypto/bzip2/src/CBZip2InputStream.cs rename to src/BouncyCastle/bzip2/src/CBZip2InputStream.cs diff --git a/crypto/bzip2/src/CBZip2OutputStream.cs b/src/BouncyCastle/bzip2/src/CBZip2OutputStream.cs similarity index 100% rename from crypto/bzip2/src/CBZip2OutputStream.cs rename to src/BouncyCastle/bzip2/src/CBZip2OutputStream.cs diff --git a/crypto/bzip2/src/CRC.cs b/src/BouncyCastle/bzip2/src/CRC.cs similarity index 100% rename from crypto/bzip2/src/CRC.cs rename to src/BouncyCastle/bzip2/src/CRC.cs diff --git a/crypto/checklist.txt b/src/BouncyCastle/checklist.txt similarity index 100% rename from crypto/checklist.txt rename to src/BouncyCastle/checklist.txt diff --git a/crypto/src/cms/BaseDigestCalculator.cs b/src/BouncyCastle/cms/BaseDigestCalculator.cs similarity index 100% rename from crypto/src/cms/BaseDigestCalculator.cs rename to src/BouncyCastle/cms/BaseDigestCalculator.cs diff --git a/crypto/src/cms/CMSAttributeTableGenerationException.cs b/src/BouncyCastle/cms/CMSAttributeTableGenerationException.cs similarity index 100% rename from crypto/src/cms/CMSAttributeTableGenerationException.cs rename to src/BouncyCastle/cms/CMSAttributeTableGenerationException.cs diff --git a/crypto/src/cms/CMSAttributeTableGenerator.cs b/src/BouncyCastle/cms/CMSAttributeTableGenerator.cs similarity index 100% rename from crypto/src/cms/CMSAttributeTableGenerator.cs rename to src/BouncyCastle/cms/CMSAttributeTableGenerator.cs diff --git a/crypto/src/cms/CMSAuthEnvelopedData.cs b/src/BouncyCastle/cms/CMSAuthEnvelopedData.cs similarity index 100% rename from crypto/src/cms/CMSAuthEnvelopedData.cs rename to src/BouncyCastle/cms/CMSAuthEnvelopedData.cs diff --git a/crypto/src/cms/CMSAuthEnvelopedGenerator.cs b/src/BouncyCastle/cms/CMSAuthEnvelopedGenerator.cs similarity index 100% rename from crypto/src/cms/CMSAuthEnvelopedGenerator.cs rename to src/BouncyCastle/cms/CMSAuthEnvelopedGenerator.cs diff --git a/crypto/src/cms/CMSAuthenticatedData.cs b/src/BouncyCastle/cms/CMSAuthenticatedData.cs similarity index 100% rename from crypto/src/cms/CMSAuthenticatedData.cs rename to src/BouncyCastle/cms/CMSAuthenticatedData.cs diff --git a/crypto/src/cms/CMSAuthenticatedDataGenerator.cs b/src/BouncyCastle/cms/CMSAuthenticatedDataGenerator.cs similarity index 100% rename from crypto/src/cms/CMSAuthenticatedDataGenerator.cs rename to src/BouncyCastle/cms/CMSAuthenticatedDataGenerator.cs diff --git a/crypto/src/cms/CMSAuthenticatedDataParser.cs b/src/BouncyCastle/cms/CMSAuthenticatedDataParser.cs similarity index 100% rename from crypto/src/cms/CMSAuthenticatedDataParser.cs rename to src/BouncyCastle/cms/CMSAuthenticatedDataParser.cs diff --git a/crypto/src/cms/CMSAuthenticatedDataStreamGenerator.cs b/src/BouncyCastle/cms/CMSAuthenticatedDataStreamGenerator.cs similarity index 100% rename from crypto/src/cms/CMSAuthenticatedDataStreamGenerator.cs rename to src/BouncyCastle/cms/CMSAuthenticatedDataStreamGenerator.cs diff --git a/crypto/src/cms/CMSAuthenticatedGenerator.cs b/src/BouncyCastle/cms/CMSAuthenticatedGenerator.cs similarity index 100% rename from crypto/src/cms/CMSAuthenticatedGenerator.cs rename to src/BouncyCastle/cms/CMSAuthenticatedGenerator.cs diff --git a/crypto/src/cms/CMSCompressedData.cs b/src/BouncyCastle/cms/CMSCompressedData.cs similarity index 100% rename from crypto/src/cms/CMSCompressedData.cs rename to src/BouncyCastle/cms/CMSCompressedData.cs diff --git a/crypto/src/cms/CMSCompressedDataGenerator.cs b/src/BouncyCastle/cms/CMSCompressedDataGenerator.cs similarity index 100% rename from crypto/src/cms/CMSCompressedDataGenerator.cs rename to src/BouncyCastle/cms/CMSCompressedDataGenerator.cs diff --git a/crypto/src/cms/CMSCompressedDataParser.cs b/src/BouncyCastle/cms/CMSCompressedDataParser.cs similarity index 100% rename from crypto/src/cms/CMSCompressedDataParser.cs rename to src/BouncyCastle/cms/CMSCompressedDataParser.cs diff --git a/crypto/src/cms/CMSCompressedDataStreamGenerator.cs b/src/BouncyCastle/cms/CMSCompressedDataStreamGenerator.cs similarity index 100% rename from crypto/src/cms/CMSCompressedDataStreamGenerator.cs rename to src/BouncyCastle/cms/CMSCompressedDataStreamGenerator.cs diff --git a/crypto/src/cms/CMSContentInfoParser.cs b/src/BouncyCastle/cms/CMSContentInfoParser.cs similarity index 100% rename from crypto/src/cms/CMSContentInfoParser.cs rename to src/BouncyCastle/cms/CMSContentInfoParser.cs diff --git a/crypto/src/cms/CMSEnvelopedData.cs b/src/BouncyCastle/cms/CMSEnvelopedData.cs similarity index 100% rename from crypto/src/cms/CMSEnvelopedData.cs rename to src/BouncyCastle/cms/CMSEnvelopedData.cs diff --git a/crypto/src/cms/CMSEnvelopedDataGenerator.cs b/src/BouncyCastle/cms/CMSEnvelopedDataGenerator.cs similarity index 100% rename from crypto/src/cms/CMSEnvelopedDataGenerator.cs rename to src/BouncyCastle/cms/CMSEnvelopedDataGenerator.cs diff --git a/crypto/src/cms/CMSEnvelopedDataParser.cs b/src/BouncyCastle/cms/CMSEnvelopedDataParser.cs similarity index 100% rename from crypto/src/cms/CMSEnvelopedDataParser.cs rename to src/BouncyCastle/cms/CMSEnvelopedDataParser.cs diff --git a/crypto/src/cms/CMSEnvelopedDataStreamGenerator.cs b/src/BouncyCastle/cms/CMSEnvelopedDataStreamGenerator.cs similarity index 100% rename from crypto/src/cms/CMSEnvelopedDataStreamGenerator.cs rename to src/BouncyCastle/cms/CMSEnvelopedDataStreamGenerator.cs diff --git a/crypto/src/cms/CMSEnvelopedGenerator.cs b/src/BouncyCastle/cms/CMSEnvelopedGenerator.cs similarity index 100% rename from crypto/src/cms/CMSEnvelopedGenerator.cs rename to src/BouncyCastle/cms/CMSEnvelopedGenerator.cs diff --git a/crypto/src/cms/CMSEnvelopedHelper.cs b/src/BouncyCastle/cms/CMSEnvelopedHelper.cs similarity index 100% rename from crypto/src/cms/CMSEnvelopedHelper.cs rename to src/BouncyCastle/cms/CMSEnvelopedHelper.cs diff --git a/crypto/src/cms/CMSException.cs b/src/BouncyCastle/cms/CMSException.cs similarity index 100% rename from crypto/src/cms/CMSException.cs rename to src/BouncyCastle/cms/CMSException.cs diff --git a/crypto/src/cms/CMSPBEKey.cs b/src/BouncyCastle/cms/CMSPBEKey.cs similarity index 100% rename from crypto/src/cms/CMSPBEKey.cs rename to src/BouncyCastle/cms/CMSPBEKey.cs diff --git a/crypto/src/cms/CMSProcessable.cs b/src/BouncyCastle/cms/CMSProcessable.cs similarity index 100% rename from crypto/src/cms/CMSProcessable.cs rename to src/BouncyCastle/cms/CMSProcessable.cs diff --git a/crypto/src/cms/CMSProcessableByteArray.cs b/src/BouncyCastle/cms/CMSProcessableByteArray.cs similarity index 100% rename from crypto/src/cms/CMSProcessableByteArray.cs rename to src/BouncyCastle/cms/CMSProcessableByteArray.cs diff --git a/crypto/src/cms/CMSProcessableFile.cs b/src/BouncyCastle/cms/CMSProcessableFile.cs similarity index 100% rename from crypto/src/cms/CMSProcessableFile.cs rename to src/BouncyCastle/cms/CMSProcessableFile.cs diff --git a/crypto/src/cms/CMSProcessableInputStream.cs b/src/BouncyCastle/cms/CMSProcessableInputStream.cs similarity index 100% rename from crypto/src/cms/CMSProcessableInputStream.cs rename to src/BouncyCastle/cms/CMSProcessableInputStream.cs diff --git a/crypto/src/cms/CMSReadable.cs b/src/BouncyCastle/cms/CMSReadable.cs similarity index 100% rename from crypto/src/cms/CMSReadable.cs rename to src/BouncyCastle/cms/CMSReadable.cs diff --git a/crypto/src/cms/CMSSecureReadable.cs b/src/BouncyCastle/cms/CMSSecureReadable.cs similarity index 100% rename from crypto/src/cms/CMSSecureReadable.cs rename to src/BouncyCastle/cms/CMSSecureReadable.cs diff --git a/crypto/src/cms/CMSSignedData.cs b/src/BouncyCastle/cms/CMSSignedData.cs similarity index 100% rename from crypto/src/cms/CMSSignedData.cs rename to src/BouncyCastle/cms/CMSSignedData.cs diff --git a/crypto/src/cms/CMSSignedDataGenerator.cs b/src/BouncyCastle/cms/CMSSignedDataGenerator.cs similarity index 100% rename from crypto/src/cms/CMSSignedDataGenerator.cs rename to src/BouncyCastle/cms/CMSSignedDataGenerator.cs diff --git a/crypto/src/cms/CMSSignedDataParser.cs b/src/BouncyCastle/cms/CMSSignedDataParser.cs similarity index 100% rename from crypto/src/cms/CMSSignedDataParser.cs rename to src/BouncyCastle/cms/CMSSignedDataParser.cs diff --git a/crypto/src/cms/CMSSignedDataStreamGenerator.cs b/src/BouncyCastle/cms/CMSSignedDataStreamGenerator.cs similarity index 100% rename from crypto/src/cms/CMSSignedDataStreamGenerator.cs rename to src/BouncyCastle/cms/CMSSignedDataStreamGenerator.cs diff --git a/crypto/src/cms/CMSSignedGenerator.cs b/src/BouncyCastle/cms/CMSSignedGenerator.cs similarity index 100% rename from crypto/src/cms/CMSSignedGenerator.cs rename to src/BouncyCastle/cms/CMSSignedGenerator.cs diff --git a/crypto/src/cms/CMSSignedHelper.cs b/src/BouncyCastle/cms/CMSSignedHelper.cs similarity index 100% rename from crypto/src/cms/CMSSignedHelper.cs rename to src/BouncyCastle/cms/CMSSignedHelper.cs diff --git a/crypto/src/cms/CMSStreamException.cs b/src/BouncyCastle/cms/CMSStreamException.cs similarity index 100% rename from crypto/src/cms/CMSStreamException.cs rename to src/BouncyCastle/cms/CMSStreamException.cs diff --git a/crypto/src/cms/CMSTypedStream.cs b/src/BouncyCastle/cms/CMSTypedStream.cs similarity index 100% rename from crypto/src/cms/CMSTypedStream.cs rename to src/BouncyCastle/cms/CMSTypedStream.cs diff --git a/crypto/src/cms/CMSUtils.cs b/src/BouncyCastle/cms/CMSUtils.cs similarity index 100% rename from crypto/src/cms/CMSUtils.cs rename to src/BouncyCastle/cms/CMSUtils.cs diff --git a/crypto/src/cms/CounterSignatureDigestCalculator.cs b/src/BouncyCastle/cms/CounterSignatureDigestCalculator.cs similarity index 100% rename from crypto/src/cms/CounterSignatureDigestCalculator.cs rename to src/BouncyCastle/cms/CounterSignatureDigestCalculator.cs diff --git a/crypto/src/cms/DefaultAuthenticatedAttributeTableGenerator.cs b/src/BouncyCastle/cms/DefaultAuthenticatedAttributeTableGenerator.cs similarity index 100% rename from crypto/src/cms/DefaultAuthenticatedAttributeTableGenerator.cs rename to src/BouncyCastle/cms/DefaultAuthenticatedAttributeTableGenerator.cs diff --git a/crypto/src/cms/DefaultSignedAttributeTableGenerator.cs b/src/BouncyCastle/cms/DefaultSignedAttributeTableGenerator.cs similarity index 100% rename from crypto/src/cms/DefaultSignedAttributeTableGenerator.cs rename to src/BouncyCastle/cms/DefaultSignedAttributeTableGenerator.cs diff --git a/crypto/src/cms/IDigestCalculator.cs b/src/BouncyCastle/cms/IDigestCalculator.cs similarity index 100% rename from crypto/src/cms/IDigestCalculator.cs rename to src/BouncyCastle/cms/IDigestCalculator.cs diff --git a/crypto/src/cms/KEKRecipientInfoGenerator.cs b/src/BouncyCastle/cms/KEKRecipientInfoGenerator.cs similarity index 100% rename from crypto/src/cms/KEKRecipientInfoGenerator.cs rename to src/BouncyCastle/cms/KEKRecipientInfoGenerator.cs diff --git a/crypto/src/cms/KEKRecipientInformation.cs b/src/BouncyCastle/cms/KEKRecipientInformation.cs similarity index 100% rename from crypto/src/cms/KEKRecipientInformation.cs rename to src/BouncyCastle/cms/KEKRecipientInformation.cs diff --git a/crypto/src/cms/KeyAgreeRecipientInfoGenerator.cs b/src/BouncyCastle/cms/KeyAgreeRecipientInfoGenerator.cs similarity index 100% rename from crypto/src/cms/KeyAgreeRecipientInfoGenerator.cs rename to src/BouncyCastle/cms/KeyAgreeRecipientInfoGenerator.cs diff --git a/crypto/src/cms/KeyAgreeRecipientInformation.cs b/src/BouncyCastle/cms/KeyAgreeRecipientInformation.cs similarity index 100% rename from crypto/src/cms/KeyAgreeRecipientInformation.cs rename to src/BouncyCastle/cms/KeyAgreeRecipientInformation.cs diff --git a/crypto/src/cms/KeyTransRecipientInfoGenerator.cs b/src/BouncyCastle/cms/KeyTransRecipientInfoGenerator.cs similarity index 100% rename from crypto/src/cms/KeyTransRecipientInfoGenerator.cs rename to src/BouncyCastle/cms/KeyTransRecipientInfoGenerator.cs diff --git a/crypto/src/cms/KeyTransRecipientInformation.cs b/src/BouncyCastle/cms/KeyTransRecipientInformation.cs similarity index 100% rename from crypto/src/cms/KeyTransRecipientInformation.cs rename to src/BouncyCastle/cms/KeyTransRecipientInformation.cs diff --git a/crypto/src/cms/OriginatorId.cs b/src/BouncyCastle/cms/OriginatorId.cs similarity index 100% rename from crypto/src/cms/OriginatorId.cs rename to src/BouncyCastle/cms/OriginatorId.cs diff --git a/crypto/src/cms/OriginatorInfoGenerator.cs b/src/BouncyCastle/cms/OriginatorInfoGenerator.cs similarity index 100% rename from crypto/src/cms/OriginatorInfoGenerator.cs rename to src/BouncyCastle/cms/OriginatorInfoGenerator.cs diff --git a/crypto/src/cms/OriginatorInformation.cs b/src/BouncyCastle/cms/OriginatorInformation.cs similarity index 100% rename from crypto/src/cms/OriginatorInformation.cs rename to src/BouncyCastle/cms/OriginatorInformation.cs diff --git a/crypto/src/cms/PKCS5Scheme2PBEKey.cs b/src/BouncyCastle/cms/PKCS5Scheme2PBEKey.cs similarity index 100% rename from crypto/src/cms/PKCS5Scheme2PBEKey.cs rename to src/BouncyCastle/cms/PKCS5Scheme2PBEKey.cs diff --git a/crypto/src/cms/PKCS5Scheme2UTF8PBEKey.cs b/src/BouncyCastle/cms/PKCS5Scheme2UTF8PBEKey.cs similarity index 100% rename from crypto/src/cms/PKCS5Scheme2UTF8PBEKey.cs rename to src/BouncyCastle/cms/PKCS5Scheme2UTF8PBEKey.cs diff --git a/crypto/src/cms/PasswordRecipientInfoGenerator.cs b/src/BouncyCastle/cms/PasswordRecipientInfoGenerator.cs similarity index 100% rename from crypto/src/cms/PasswordRecipientInfoGenerator.cs rename to src/BouncyCastle/cms/PasswordRecipientInfoGenerator.cs diff --git a/crypto/src/cms/PasswordRecipientInformation.cs b/src/BouncyCastle/cms/PasswordRecipientInformation.cs similarity index 100% rename from crypto/src/cms/PasswordRecipientInformation.cs rename to src/BouncyCastle/cms/PasswordRecipientInformation.cs diff --git a/crypto/src/cms/RecipientId.cs b/src/BouncyCastle/cms/RecipientId.cs similarity index 100% rename from crypto/src/cms/RecipientId.cs rename to src/BouncyCastle/cms/RecipientId.cs diff --git a/crypto/src/cms/RecipientInfoGenerator.cs b/src/BouncyCastle/cms/RecipientInfoGenerator.cs similarity index 100% rename from crypto/src/cms/RecipientInfoGenerator.cs rename to src/BouncyCastle/cms/RecipientInfoGenerator.cs diff --git a/crypto/src/cms/RecipientInformation.cs b/src/BouncyCastle/cms/RecipientInformation.cs similarity index 100% rename from crypto/src/cms/RecipientInformation.cs rename to src/BouncyCastle/cms/RecipientInformation.cs diff --git a/crypto/src/cms/RecipientInformationStore.cs b/src/BouncyCastle/cms/RecipientInformationStore.cs similarity index 100% rename from crypto/src/cms/RecipientInformationStore.cs rename to src/BouncyCastle/cms/RecipientInformationStore.cs diff --git a/crypto/src/cms/SignerId.cs b/src/BouncyCastle/cms/SignerId.cs similarity index 100% rename from crypto/src/cms/SignerId.cs rename to src/BouncyCastle/cms/SignerId.cs diff --git a/crypto/src/cms/SignerInfoGenerator.cs b/src/BouncyCastle/cms/SignerInfoGenerator.cs similarity index 100% rename from crypto/src/cms/SignerInfoGenerator.cs rename to src/BouncyCastle/cms/SignerInfoGenerator.cs diff --git a/crypto/src/cms/SignerInformation.cs b/src/BouncyCastle/cms/SignerInformation.cs similarity index 100% rename from crypto/src/cms/SignerInformation.cs rename to src/BouncyCastle/cms/SignerInformation.cs diff --git a/crypto/src/cms/SignerInformationStore.cs b/src/BouncyCastle/cms/SignerInformationStore.cs similarity index 100% rename from crypto/src/cms/SignerInformationStore.cs rename to src/BouncyCastle/cms/SignerInformationStore.cs diff --git a/crypto/src/cms/SimpleAttributeTableGenerator.cs b/src/BouncyCastle/cms/SimpleAttributeTableGenerator.cs similarity index 100% rename from crypto/src/cms/SimpleAttributeTableGenerator.cs rename to src/BouncyCastle/cms/SimpleAttributeTableGenerator.cs diff --git a/crypto/src/crypto/AsymmetricCipherKeyPair.cs b/src/BouncyCastle/crypto/AsymmetricCipherKeyPair.cs similarity index 100% rename from crypto/src/crypto/AsymmetricCipherKeyPair.cs rename to src/BouncyCastle/crypto/AsymmetricCipherKeyPair.cs diff --git a/crypto/src/crypto/AsymmetricKeyParameter.cs b/src/BouncyCastle/crypto/AsymmetricKeyParameter.cs similarity index 100% rename from crypto/src/crypto/AsymmetricKeyParameter.cs rename to src/BouncyCastle/crypto/AsymmetricKeyParameter.cs diff --git a/crypto/src/crypto/BufferedAeadBlockCipher.cs b/src/BouncyCastle/crypto/BufferedAeadBlockCipher.cs similarity index 100% rename from crypto/src/crypto/BufferedAeadBlockCipher.cs rename to src/BouncyCastle/crypto/BufferedAeadBlockCipher.cs diff --git a/crypto/src/crypto/BufferedAsymmetricBlockCipher.cs b/src/BouncyCastle/crypto/BufferedAsymmetricBlockCipher.cs similarity index 100% rename from crypto/src/crypto/BufferedAsymmetricBlockCipher.cs rename to src/BouncyCastle/crypto/BufferedAsymmetricBlockCipher.cs diff --git a/crypto/src/crypto/BufferedBlockCipher.cs b/src/BouncyCastle/crypto/BufferedBlockCipher.cs similarity index 100% rename from crypto/src/crypto/BufferedBlockCipher.cs rename to src/BouncyCastle/crypto/BufferedBlockCipher.cs diff --git a/crypto/src/crypto/BufferedCipherBase.cs b/src/BouncyCastle/crypto/BufferedCipherBase.cs similarity index 100% rename from crypto/src/crypto/BufferedCipherBase.cs rename to src/BouncyCastle/crypto/BufferedCipherBase.cs diff --git a/crypto/src/crypto/BufferedIesCipher.cs b/src/BouncyCastle/crypto/BufferedIesCipher.cs similarity index 100% rename from crypto/src/crypto/BufferedIesCipher.cs rename to src/BouncyCastle/crypto/BufferedIesCipher.cs diff --git a/crypto/src/crypto/BufferedStreamCipher.cs b/src/BouncyCastle/crypto/BufferedStreamCipher.cs similarity index 100% rename from crypto/src/crypto/BufferedStreamCipher.cs rename to src/BouncyCastle/crypto/BufferedStreamCipher.cs diff --git a/crypto/src/crypto/Check.cs b/src/BouncyCastle/crypto/Check.cs similarity index 100% rename from crypto/src/crypto/Check.cs rename to src/BouncyCastle/crypto/Check.cs diff --git a/crypto/src/crypto/CipherKeyGenerator.cs b/src/BouncyCastle/crypto/CipherKeyGenerator.cs similarity index 100% rename from crypto/src/crypto/CipherKeyGenerator.cs rename to src/BouncyCastle/crypto/CipherKeyGenerator.cs diff --git a/crypto/src/crypto/CryptoException.cs b/src/BouncyCastle/crypto/CryptoException.cs similarity index 100% rename from crypto/src/crypto/CryptoException.cs rename to src/BouncyCastle/crypto/CryptoException.cs diff --git a/crypto/src/crypto/DataLengthException.cs b/src/BouncyCastle/crypto/DataLengthException.cs similarity index 100% rename from crypto/src/crypto/DataLengthException.cs rename to src/BouncyCastle/crypto/DataLengthException.cs diff --git a/crypto/src/crypto/IAsymmetricBlockCipher.cs b/src/BouncyCastle/crypto/IAsymmetricBlockCipher.cs similarity index 100% rename from crypto/src/crypto/IAsymmetricBlockCipher.cs rename to src/BouncyCastle/crypto/IAsymmetricBlockCipher.cs diff --git a/crypto/src/crypto/IAsymmetricCipherKeyPairGenerator.cs b/src/BouncyCastle/crypto/IAsymmetricCipherKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/IAsymmetricCipherKeyPairGenerator.cs rename to src/BouncyCastle/crypto/IAsymmetricCipherKeyPairGenerator.cs diff --git a/crypto/src/crypto/IBasicAgreement.cs b/src/BouncyCastle/crypto/IBasicAgreement.cs similarity index 100% rename from crypto/src/crypto/IBasicAgreement.cs rename to src/BouncyCastle/crypto/IBasicAgreement.cs diff --git a/crypto/src/crypto/IBlockCipher.cs b/src/BouncyCastle/crypto/IBlockCipher.cs similarity index 100% rename from crypto/src/crypto/IBlockCipher.cs rename to src/BouncyCastle/crypto/IBlockCipher.cs diff --git a/crypto/src/crypto/IBlockResult.cs b/src/BouncyCastle/crypto/IBlockResult.cs similarity index 100% rename from crypto/src/crypto/IBlockResult.cs rename to src/BouncyCastle/crypto/IBlockResult.cs diff --git a/crypto/src/crypto/IBufferedCipher.cs b/src/BouncyCastle/crypto/IBufferedCipher.cs similarity index 100% rename from crypto/src/crypto/IBufferedCipher.cs rename to src/BouncyCastle/crypto/IBufferedCipher.cs diff --git a/crypto/src/crypto/ICipherParameters.cs b/src/BouncyCastle/crypto/ICipherParameters.cs similarity index 100% rename from crypto/src/crypto/ICipherParameters.cs rename to src/BouncyCastle/crypto/ICipherParameters.cs diff --git a/crypto/src/crypto/IDSA.cs b/src/BouncyCastle/crypto/IDSA.cs similarity index 100% rename from crypto/src/crypto/IDSA.cs rename to src/BouncyCastle/crypto/IDSA.cs diff --git a/crypto/src/crypto/IDerivationFunction.cs b/src/BouncyCastle/crypto/IDerivationFunction.cs similarity index 100% rename from crypto/src/crypto/IDerivationFunction.cs rename to src/BouncyCastle/crypto/IDerivationFunction.cs diff --git a/crypto/src/crypto/IDerivationParameters.cs b/src/BouncyCastle/crypto/IDerivationParameters.cs similarity index 100% rename from crypto/src/crypto/IDerivationParameters.cs rename to src/BouncyCastle/crypto/IDerivationParameters.cs diff --git a/crypto/src/crypto/IDigest.cs b/src/BouncyCastle/crypto/IDigest.cs similarity index 100% rename from crypto/src/crypto/IDigest.cs rename to src/BouncyCastle/crypto/IDigest.cs diff --git a/crypto/src/crypto/IDsaExt.cs b/src/BouncyCastle/crypto/IDsaExt.cs similarity index 100% rename from crypto/src/crypto/IDsaExt.cs rename to src/BouncyCastle/crypto/IDsaExt.cs diff --git a/crypto/src/crypto/IEntropySource.cs b/src/BouncyCastle/crypto/IEntropySource.cs similarity index 100% rename from crypto/src/crypto/IEntropySource.cs rename to src/BouncyCastle/crypto/IEntropySource.cs diff --git a/crypto/src/crypto/IEntropySourceProvider.cs b/src/BouncyCastle/crypto/IEntropySourceProvider.cs similarity index 100% rename from crypto/src/crypto/IEntropySourceProvider.cs rename to src/BouncyCastle/crypto/IEntropySourceProvider.cs diff --git a/crypto/src/crypto/IMac.cs b/src/BouncyCastle/crypto/IMac.cs similarity index 100% rename from crypto/src/crypto/IMac.cs rename to src/BouncyCastle/crypto/IMac.cs diff --git a/crypto/src/crypto/IRawAgreement.cs b/src/BouncyCastle/crypto/IRawAgreement.cs similarity index 100% rename from crypto/src/crypto/IRawAgreement.cs rename to src/BouncyCastle/crypto/IRawAgreement.cs diff --git a/crypto/src/crypto/IRsa.cs b/src/BouncyCastle/crypto/IRsa.cs similarity index 100% rename from crypto/src/crypto/IRsa.cs rename to src/BouncyCastle/crypto/IRsa.cs diff --git a/crypto/src/crypto/ISignatureFactory.cs b/src/BouncyCastle/crypto/ISignatureFactory.cs similarity index 100% rename from crypto/src/crypto/ISignatureFactory.cs rename to src/BouncyCastle/crypto/ISignatureFactory.cs diff --git a/crypto/src/crypto/ISigner.cs b/src/BouncyCastle/crypto/ISigner.cs similarity index 100% rename from crypto/src/crypto/ISigner.cs rename to src/BouncyCastle/crypto/ISigner.cs diff --git a/crypto/src/crypto/ISignerWithRecovery.cs b/src/BouncyCastle/crypto/ISignerWithRecovery.cs similarity index 100% rename from crypto/src/crypto/ISignerWithRecovery.cs rename to src/BouncyCastle/crypto/ISignerWithRecovery.cs diff --git a/crypto/src/crypto/IStreamCalculator.cs b/src/BouncyCastle/crypto/IStreamCalculator.cs similarity index 100% rename from crypto/src/crypto/IStreamCalculator.cs rename to src/BouncyCastle/crypto/IStreamCalculator.cs diff --git a/crypto/src/crypto/IStreamCipher.cs b/src/BouncyCastle/crypto/IStreamCipher.cs similarity index 100% rename from crypto/src/crypto/IStreamCipher.cs rename to src/BouncyCastle/crypto/IStreamCipher.cs diff --git a/crypto/src/crypto/IVerifier.cs b/src/BouncyCastle/crypto/IVerifier.cs similarity index 100% rename from crypto/src/crypto/IVerifier.cs rename to src/BouncyCastle/crypto/IVerifier.cs diff --git a/crypto/src/crypto/IVerifierFactory.cs b/src/BouncyCastle/crypto/IVerifierFactory.cs similarity index 100% rename from crypto/src/crypto/IVerifierFactory.cs rename to src/BouncyCastle/crypto/IVerifierFactory.cs diff --git a/crypto/src/crypto/IVerifierFactoryProvider.cs b/src/BouncyCastle/crypto/IVerifierFactoryProvider.cs similarity index 100% rename from crypto/src/crypto/IVerifierFactoryProvider.cs rename to src/BouncyCastle/crypto/IVerifierFactoryProvider.cs diff --git a/crypto/src/crypto/IWrapper.cs b/src/BouncyCastle/crypto/IWrapper.cs similarity index 100% rename from crypto/src/crypto/IWrapper.cs rename to src/BouncyCastle/crypto/IWrapper.cs diff --git a/crypto/src/crypto/IXof.cs b/src/BouncyCastle/crypto/IXof.cs similarity index 100% rename from crypto/src/crypto/IXof.cs rename to src/BouncyCastle/crypto/IXof.cs diff --git a/crypto/src/crypto/InvalidCipherTextException.cs b/src/BouncyCastle/crypto/InvalidCipherTextException.cs similarity index 100% rename from crypto/src/crypto/InvalidCipherTextException.cs rename to src/BouncyCastle/crypto/InvalidCipherTextException.cs diff --git a/crypto/src/crypto/KeyGenerationParameters.cs b/src/BouncyCastle/crypto/KeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/KeyGenerationParameters.cs rename to src/BouncyCastle/crypto/KeyGenerationParameters.cs diff --git a/crypto/src/crypto/MaxBytesExceededException.cs b/src/BouncyCastle/crypto/MaxBytesExceededException.cs similarity index 100% rename from crypto/src/crypto/MaxBytesExceededException.cs rename to src/BouncyCastle/crypto/MaxBytesExceededException.cs diff --git a/crypto/src/crypto/OutputLengthException.cs b/src/BouncyCastle/crypto/OutputLengthException.cs similarity index 100% rename from crypto/src/crypto/OutputLengthException.cs rename to src/BouncyCastle/crypto/OutputLengthException.cs diff --git a/crypto/src/crypto/PbeParametersGenerator.cs b/src/BouncyCastle/crypto/PbeParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/PbeParametersGenerator.cs rename to src/BouncyCastle/crypto/PbeParametersGenerator.cs diff --git a/crypto/src/crypto/StreamBlockCipher.cs b/src/BouncyCastle/crypto/StreamBlockCipher.cs similarity index 100% rename from crypto/src/crypto/StreamBlockCipher.cs rename to src/BouncyCastle/crypto/StreamBlockCipher.cs diff --git a/crypto/src/crypto/agreement/DHAgreement.cs b/src/BouncyCastle/crypto/agreement/DHAgreement.cs similarity index 100% rename from crypto/src/crypto/agreement/DHAgreement.cs rename to src/BouncyCastle/crypto/agreement/DHAgreement.cs diff --git a/crypto/src/crypto/agreement/DHBasicAgreement.cs b/src/BouncyCastle/crypto/agreement/DHBasicAgreement.cs similarity index 100% rename from crypto/src/crypto/agreement/DHBasicAgreement.cs rename to src/BouncyCastle/crypto/agreement/DHBasicAgreement.cs diff --git a/crypto/src/crypto/agreement/DHStandardGroups.cs b/src/BouncyCastle/crypto/agreement/DHStandardGroups.cs similarity index 100% rename from crypto/src/crypto/agreement/DHStandardGroups.cs rename to src/BouncyCastle/crypto/agreement/DHStandardGroups.cs diff --git a/crypto/src/crypto/agreement/ECDHBasicAgreement.cs b/src/BouncyCastle/crypto/agreement/ECDHBasicAgreement.cs similarity index 100% rename from crypto/src/crypto/agreement/ECDHBasicAgreement.cs rename to src/BouncyCastle/crypto/agreement/ECDHBasicAgreement.cs diff --git a/crypto/src/crypto/agreement/ECDHCBasicAgreement.cs b/src/BouncyCastle/crypto/agreement/ECDHCBasicAgreement.cs similarity index 100% rename from crypto/src/crypto/agreement/ECDHCBasicAgreement.cs rename to src/BouncyCastle/crypto/agreement/ECDHCBasicAgreement.cs diff --git a/crypto/src/crypto/agreement/ECDHWithKdfBasicAgreement.cs b/src/BouncyCastle/crypto/agreement/ECDHWithKdfBasicAgreement.cs similarity index 100% rename from crypto/src/crypto/agreement/ECDHWithKdfBasicAgreement.cs rename to src/BouncyCastle/crypto/agreement/ECDHWithKdfBasicAgreement.cs diff --git a/crypto/src/crypto/agreement/ECMqvBasicAgreement.cs b/src/BouncyCastle/crypto/agreement/ECMqvBasicAgreement.cs similarity index 100% rename from crypto/src/crypto/agreement/ECMqvBasicAgreement.cs rename to src/BouncyCastle/crypto/agreement/ECMqvBasicAgreement.cs diff --git a/crypto/src/crypto/agreement/ECMqvWithKdfBasicAgreement.cs b/src/BouncyCastle/crypto/agreement/ECMqvWithKdfBasicAgreement.cs similarity index 100% rename from crypto/src/crypto/agreement/ECMqvWithKdfBasicAgreement.cs rename to src/BouncyCastle/crypto/agreement/ECMqvWithKdfBasicAgreement.cs diff --git a/crypto/src/crypto/agreement/SM2KeyExchange.cs b/src/BouncyCastle/crypto/agreement/SM2KeyExchange.cs similarity index 100% rename from crypto/src/crypto/agreement/SM2KeyExchange.cs rename to src/BouncyCastle/crypto/agreement/SM2KeyExchange.cs diff --git a/crypto/src/crypto/agreement/X25519Agreement.cs b/src/BouncyCastle/crypto/agreement/X25519Agreement.cs similarity index 100% rename from crypto/src/crypto/agreement/X25519Agreement.cs rename to src/BouncyCastle/crypto/agreement/X25519Agreement.cs diff --git a/crypto/src/crypto/agreement/X448Agreement.cs b/src/BouncyCastle/crypto/agreement/X448Agreement.cs similarity index 100% rename from crypto/src/crypto/agreement/X448Agreement.cs rename to src/BouncyCastle/crypto/agreement/X448Agreement.cs diff --git a/crypto/src/crypto/agreement/jpake/JPakeParticipant.cs b/src/BouncyCastle/crypto/agreement/jpake/JPakeParticipant.cs old mode 100755 new mode 100644 similarity index 100% rename from crypto/src/crypto/agreement/jpake/JPakeParticipant.cs rename to src/BouncyCastle/crypto/agreement/jpake/JPakeParticipant.cs diff --git a/crypto/src/crypto/agreement/jpake/JPakePrimeOrderGroup.cs b/src/BouncyCastle/crypto/agreement/jpake/JPakePrimeOrderGroup.cs old mode 100755 new mode 100644 similarity index 100% rename from crypto/src/crypto/agreement/jpake/JPakePrimeOrderGroup.cs rename to src/BouncyCastle/crypto/agreement/jpake/JPakePrimeOrderGroup.cs diff --git a/crypto/src/crypto/agreement/jpake/JPakePrimeOrderGroups.cs b/src/BouncyCastle/crypto/agreement/jpake/JPakePrimeOrderGroups.cs old mode 100755 new mode 100644 similarity index 100% rename from crypto/src/crypto/agreement/jpake/JPakePrimeOrderGroups.cs rename to src/BouncyCastle/crypto/agreement/jpake/JPakePrimeOrderGroups.cs diff --git a/crypto/src/crypto/agreement/jpake/JPakeRound1Payload.cs b/src/BouncyCastle/crypto/agreement/jpake/JPakeRound1Payload.cs old mode 100755 new mode 100644 similarity index 100% rename from crypto/src/crypto/agreement/jpake/JPakeRound1Payload.cs rename to src/BouncyCastle/crypto/agreement/jpake/JPakeRound1Payload.cs diff --git a/crypto/src/crypto/agreement/jpake/JPakeRound2Payload.cs b/src/BouncyCastle/crypto/agreement/jpake/JPakeRound2Payload.cs old mode 100755 new mode 100644 similarity index 100% rename from crypto/src/crypto/agreement/jpake/JPakeRound2Payload.cs rename to src/BouncyCastle/crypto/agreement/jpake/JPakeRound2Payload.cs diff --git a/crypto/src/crypto/agreement/jpake/JPakeRound3Payload.cs b/src/BouncyCastle/crypto/agreement/jpake/JPakeRound3Payload.cs old mode 100755 new mode 100644 similarity index 100% rename from crypto/src/crypto/agreement/jpake/JPakeRound3Payload.cs rename to src/BouncyCastle/crypto/agreement/jpake/JPakeRound3Payload.cs diff --git a/crypto/src/crypto/agreement/jpake/JPakeUtilities.cs b/src/BouncyCastle/crypto/agreement/jpake/JPakeUtilities.cs similarity index 100% rename from crypto/src/crypto/agreement/jpake/JPakeUtilities.cs rename to src/BouncyCastle/crypto/agreement/jpake/JPakeUtilities.cs diff --git a/crypto/src/crypto/agreement/kdf/ConcatenationKdfGenerator.cs b/src/BouncyCastle/crypto/agreement/kdf/ConcatenationKdfGenerator.cs similarity index 100% rename from crypto/src/crypto/agreement/kdf/ConcatenationKdfGenerator.cs rename to src/BouncyCastle/crypto/agreement/kdf/ConcatenationKdfGenerator.cs diff --git a/crypto/src/crypto/agreement/kdf/DHKdfParameters.cs b/src/BouncyCastle/crypto/agreement/kdf/DHKdfParameters.cs similarity index 100% rename from crypto/src/crypto/agreement/kdf/DHKdfParameters.cs rename to src/BouncyCastle/crypto/agreement/kdf/DHKdfParameters.cs diff --git a/crypto/src/crypto/agreement/kdf/DHKekGenerator.cs b/src/BouncyCastle/crypto/agreement/kdf/DHKekGenerator.cs similarity index 100% rename from crypto/src/crypto/agreement/kdf/DHKekGenerator.cs rename to src/BouncyCastle/crypto/agreement/kdf/DHKekGenerator.cs diff --git a/crypto/src/crypto/agreement/kdf/ECDHKekGenerator.cs b/src/BouncyCastle/crypto/agreement/kdf/ECDHKekGenerator.cs similarity index 100% rename from crypto/src/crypto/agreement/kdf/ECDHKekGenerator.cs rename to src/BouncyCastle/crypto/agreement/kdf/ECDHKekGenerator.cs diff --git a/crypto/src/crypto/agreement/srp/SRP6Client.cs b/src/BouncyCastle/crypto/agreement/srp/SRP6Client.cs similarity index 100% rename from crypto/src/crypto/agreement/srp/SRP6Client.cs rename to src/BouncyCastle/crypto/agreement/srp/SRP6Client.cs diff --git a/crypto/src/crypto/agreement/srp/SRP6Server.cs b/src/BouncyCastle/crypto/agreement/srp/SRP6Server.cs similarity index 100% rename from crypto/src/crypto/agreement/srp/SRP6Server.cs rename to src/BouncyCastle/crypto/agreement/srp/SRP6Server.cs diff --git a/crypto/src/crypto/agreement/srp/SRP6StandardGroups.cs b/src/BouncyCastle/crypto/agreement/srp/SRP6StandardGroups.cs similarity index 100% rename from crypto/src/crypto/agreement/srp/SRP6StandardGroups.cs rename to src/BouncyCastle/crypto/agreement/srp/SRP6StandardGroups.cs diff --git a/crypto/src/crypto/agreement/srp/SRP6Utilities.cs b/src/BouncyCastle/crypto/agreement/srp/SRP6Utilities.cs similarity index 100% rename from crypto/src/crypto/agreement/srp/SRP6Utilities.cs rename to src/BouncyCastle/crypto/agreement/srp/SRP6Utilities.cs diff --git a/crypto/src/crypto/agreement/srp/SRP6VerifierGenerator.cs b/src/BouncyCastle/crypto/agreement/srp/SRP6VerifierGenerator.cs similarity index 100% rename from crypto/src/crypto/agreement/srp/SRP6VerifierGenerator.cs rename to src/BouncyCastle/crypto/agreement/srp/SRP6VerifierGenerator.cs diff --git a/crypto/src/crypto/digests/Blake2bDigest.cs b/src/BouncyCastle/crypto/digests/Blake2bDigest.cs similarity index 100% rename from crypto/src/crypto/digests/Blake2bDigest.cs rename to src/BouncyCastle/crypto/digests/Blake2bDigest.cs diff --git a/crypto/src/crypto/digests/Blake2sDigest.cs b/src/BouncyCastle/crypto/digests/Blake2sDigest.cs similarity index 100% rename from crypto/src/crypto/digests/Blake2sDigest.cs rename to src/BouncyCastle/crypto/digests/Blake2sDigest.cs diff --git a/crypto/src/crypto/digests/DSTU7564Digest.cs b/src/BouncyCastle/crypto/digests/DSTU7564Digest.cs similarity index 100% rename from crypto/src/crypto/digests/DSTU7564Digest.cs rename to src/BouncyCastle/crypto/digests/DSTU7564Digest.cs diff --git a/crypto/src/crypto/digests/GOST3411Digest.cs b/src/BouncyCastle/crypto/digests/GOST3411Digest.cs similarity index 100% rename from crypto/src/crypto/digests/GOST3411Digest.cs rename to src/BouncyCastle/crypto/digests/GOST3411Digest.cs diff --git a/crypto/src/crypto/digests/GOST3411_2012Digest.cs b/src/BouncyCastle/crypto/digests/GOST3411_2012Digest.cs similarity index 100% rename from crypto/src/crypto/digests/GOST3411_2012Digest.cs rename to src/BouncyCastle/crypto/digests/GOST3411_2012Digest.cs diff --git a/crypto/src/crypto/digests/GOST3411_2012_256Digest.cs b/src/BouncyCastle/crypto/digests/GOST3411_2012_256Digest.cs similarity index 100% rename from crypto/src/crypto/digests/GOST3411_2012_256Digest.cs rename to src/BouncyCastle/crypto/digests/GOST3411_2012_256Digest.cs diff --git a/crypto/src/crypto/digests/GOST3411_2012_512Digest.cs b/src/BouncyCastle/crypto/digests/GOST3411_2012_512Digest.cs similarity index 100% rename from crypto/src/crypto/digests/GOST3411_2012_512Digest.cs rename to src/BouncyCastle/crypto/digests/GOST3411_2012_512Digest.cs diff --git a/crypto/src/crypto/digests/GeneralDigest.cs b/src/BouncyCastle/crypto/digests/GeneralDigest.cs similarity index 100% rename from crypto/src/crypto/digests/GeneralDigest.cs rename to src/BouncyCastle/crypto/digests/GeneralDigest.cs diff --git a/crypto/src/crypto/digests/KeccakDigest.cs b/src/BouncyCastle/crypto/digests/KeccakDigest.cs similarity index 100% rename from crypto/src/crypto/digests/KeccakDigest.cs rename to src/BouncyCastle/crypto/digests/KeccakDigest.cs diff --git a/crypto/src/crypto/digests/LongDigest.cs b/src/BouncyCastle/crypto/digests/LongDigest.cs similarity index 100% rename from crypto/src/crypto/digests/LongDigest.cs rename to src/BouncyCastle/crypto/digests/LongDigest.cs diff --git a/crypto/src/crypto/digests/MD2Digest.cs b/src/BouncyCastle/crypto/digests/MD2Digest.cs similarity index 100% rename from crypto/src/crypto/digests/MD2Digest.cs rename to src/BouncyCastle/crypto/digests/MD2Digest.cs diff --git a/crypto/src/crypto/digests/MD4Digest.cs b/src/BouncyCastle/crypto/digests/MD4Digest.cs similarity index 100% rename from crypto/src/crypto/digests/MD4Digest.cs rename to src/BouncyCastle/crypto/digests/MD4Digest.cs diff --git a/crypto/src/crypto/digests/MD5Digest.cs b/src/BouncyCastle/crypto/digests/MD5Digest.cs similarity index 100% rename from crypto/src/crypto/digests/MD5Digest.cs rename to src/BouncyCastle/crypto/digests/MD5Digest.cs diff --git a/crypto/src/crypto/digests/NonMemoableDigest.cs b/src/BouncyCastle/crypto/digests/NonMemoableDigest.cs similarity index 100% rename from crypto/src/crypto/digests/NonMemoableDigest.cs rename to src/BouncyCastle/crypto/digests/NonMemoableDigest.cs diff --git a/crypto/src/crypto/digests/NullDigest.cs b/src/BouncyCastle/crypto/digests/NullDigest.cs similarity index 100% rename from crypto/src/crypto/digests/NullDigest.cs rename to src/BouncyCastle/crypto/digests/NullDigest.cs diff --git a/crypto/src/crypto/digests/RipeMD128Digest.cs b/src/BouncyCastle/crypto/digests/RipeMD128Digest.cs similarity index 100% rename from crypto/src/crypto/digests/RipeMD128Digest.cs rename to src/BouncyCastle/crypto/digests/RipeMD128Digest.cs diff --git a/crypto/src/crypto/digests/RipeMD160Digest.cs b/src/BouncyCastle/crypto/digests/RipeMD160Digest.cs similarity index 100% rename from crypto/src/crypto/digests/RipeMD160Digest.cs rename to src/BouncyCastle/crypto/digests/RipeMD160Digest.cs diff --git a/crypto/src/crypto/digests/RipeMD256Digest.cs b/src/BouncyCastle/crypto/digests/RipeMD256Digest.cs similarity index 100% rename from crypto/src/crypto/digests/RipeMD256Digest.cs rename to src/BouncyCastle/crypto/digests/RipeMD256Digest.cs diff --git a/crypto/src/crypto/digests/RipeMD320Digest.cs b/src/BouncyCastle/crypto/digests/RipeMD320Digest.cs similarity index 100% rename from crypto/src/crypto/digests/RipeMD320Digest.cs rename to src/BouncyCastle/crypto/digests/RipeMD320Digest.cs diff --git a/crypto/src/crypto/digests/SHA3Digest.cs b/src/BouncyCastle/crypto/digests/SHA3Digest.cs similarity index 100% rename from crypto/src/crypto/digests/SHA3Digest.cs rename to src/BouncyCastle/crypto/digests/SHA3Digest.cs diff --git a/crypto/src/crypto/digests/SM3Digest.cs b/src/BouncyCastle/crypto/digests/SM3Digest.cs similarity index 100% rename from crypto/src/crypto/digests/SM3Digest.cs rename to src/BouncyCastle/crypto/digests/SM3Digest.cs diff --git a/crypto/src/crypto/digests/Sha1Digest.cs b/src/BouncyCastle/crypto/digests/Sha1Digest.cs similarity index 100% rename from crypto/src/crypto/digests/Sha1Digest.cs rename to src/BouncyCastle/crypto/digests/Sha1Digest.cs diff --git a/crypto/src/crypto/digests/Sha224Digest.cs b/src/BouncyCastle/crypto/digests/Sha224Digest.cs similarity index 100% rename from crypto/src/crypto/digests/Sha224Digest.cs rename to src/BouncyCastle/crypto/digests/Sha224Digest.cs diff --git a/crypto/src/crypto/digests/Sha256Digest.cs b/src/BouncyCastle/crypto/digests/Sha256Digest.cs similarity index 100% rename from crypto/src/crypto/digests/Sha256Digest.cs rename to src/BouncyCastle/crypto/digests/Sha256Digest.cs diff --git a/crypto/src/crypto/digests/Sha384Digest.cs b/src/BouncyCastle/crypto/digests/Sha384Digest.cs similarity index 100% rename from crypto/src/crypto/digests/Sha384Digest.cs rename to src/BouncyCastle/crypto/digests/Sha384Digest.cs diff --git a/crypto/src/crypto/digests/Sha512Digest.cs b/src/BouncyCastle/crypto/digests/Sha512Digest.cs similarity index 100% rename from crypto/src/crypto/digests/Sha512Digest.cs rename to src/BouncyCastle/crypto/digests/Sha512Digest.cs diff --git a/crypto/src/crypto/digests/Sha512tDigest.cs b/src/BouncyCastle/crypto/digests/Sha512tDigest.cs similarity index 100% rename from crypto/src/crypto/digests/Sha512tDigest.cs rename to src/BouncyCastle/crypto/digests/Sha512tDigest.cs diff --git a/crypto/src/crypto/digests/ShakeDigest.cs b/src/BouncyCastle/crypto/digests/ShakeDigest.cs similarity index 100% rename from crypto/src/crypto/digests/ShakeDigest.cs rename to src/BouncyCastle/crypto/digests/ShakeDigest.cs diff --git a/crypto/src/crypto/digests/ShortenedDigest.cs b/src/BouncyCastle/crypto/digests/ShortenedDigest.cs similarity index 100% rename from crypto/src/crypto/digests/ShortenedDigest.cs rename to src/BouncyCastle/crypto/digests/ShortenedDigest.cs diff --git a/crypto/src/crypto/digests/SkeinDigest.cs b/src/BouncyCastle/crypto/digests/SkeinDigest.cs similarity index 100% rename from crypto/src/crypto/digests/SkeinDigest.cs rename to src/BouncyCastle/crypto/digests/SkeinDigest.cs diff --git a/crypto/src/crypto/digests/SkeinEngine.cs b/src/BouncyCastle/crypto/digests/SkeinEngine.cs similarity index 100% rename from crypto/src/crypto/digests/SkeinEngine.cs rename to src/BouncyCastle/crypto/digests/SkeinEngine.cs diff --git a/crypto/src/crypto/digests/TigerDigest.cs b/src/BouncyCastle/crypto/digests/TigerDigest.cs similarity index 100% rename from crypto/src/crypto/digests/TigerDigest.cs rename to src/BouncyCastle/crypto/digests/TigerDigest.cs diff --git a/crypto/src/crypto/digests/WhirlpoolDigest.cs b/src/BouncyCastle/crypto/digests/WhirlpoolDigest.cs similarity index 100% rename from crypto/src/crypto/digests/WhirlpoolDigest.cs rename to src/BouncyCastle/crypto/digests/WhirlpoolDigest.cs diff --git a/crypto/src/crypto/ec/CustomNamedCurves.cs b/src/BouncyCastle/crypto/ec/CustomNamedCurves.cs similarity index 100% rename from crypto/src/crypto/ec/CustomNamedCurves.cs rename to src/BouncyCastle/crypto/ec/CustomNamedCurves.cs diff --git a/crypto/src/crypto/encodings/ISO9796d1Encoding.cs b/src/BouncyCastle/crypto/encodings/ISO9796d1Encoding.cs similarity index 100% rename from crypto/src/crypto/encodings/ISO9796d1Encoding.cs rename to src/BouncyCastle/crypto/encodings/ISO9796d1Encoding.cs diff --git a/crypto/src/crypto/encodings/OaepEncoding.cs b/src/BouncyCastle/crypto/encodings/OaepEncoding.cs similarity index 100% rename from crypto/src/crypto/encodings/OaepEncoding.cs rename to src/BouncyCastle/crypto/encodings/OaepEncoding.cs diff --git a/crypto/src/crypto/encodings/Pkcs1Encoding.cs b/src/BouncyCastle/crypto/encodings/Pkcs1Encoding.cs similarity index 100% rename from crypto/src/crypto/encodings/Pkcs1Encoding.cs rename to src/BouncyCastle/crypto/encodings/Pkcs1Encoding.cs diff --git a/crypto/src/crypto/engines/AesEngine.cs b/src/BouncyCastle/crypto/engines/AesEngine.cs similarity index 100% rename from crypto/src/crypto/engines/AesEngine.cs rename to src/BouncyCastle/crypto/engines/AesEngine.cs diff --git a/crypto/src/crypto/engines/AesFastEngine.cs b/src/BouncyCastle/crypto/engines/AesFastEngine.cs similarity index 100% rename from crypto/src/crypto/engines/AesFastEngine.cs rename to src/BouncyCastle/crypto/engines/AesFastEngine.cs diff --git a/crypto/src/crypto/engines/AesLightEngine.cs b/src/BouncyCastle/crypto/engines/AesLightEngine.cs similarity index 100% rename from crypto/src/crypto/engines/AesLightEngine.cs rename to src/BouncyCastle/crypto/engines/AesLightEngine.cs diff --git a/crypto/src/crypto/engines/AesWrapEngine.cs b/src/BouncyCastle/crypto/engines/AesWrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/AesWrapEngine.cs rename to src/BouncyCastle/crypto/engines/AesWrapEngine.cs diff --git a/crypto/src/crypto/engines/BlowfishEngine.cs b/src/BouncyCastle/crypto/engines/BlowfishEngine.cs similarity index 100% rename from crypto/src/crypto/engines/BlowfishEngine.cs rename to src/BouncyCastle/crypto/engines/BlowfishEngine.cs diff --git a/crypto/src/crypto/engines/CamelliaEngine.cs b/src/BouncyCastle/crypto/engines/CamelliaEngine.cs similarity index 100% rename from crypto/src/crypto/engines/CamelliaEngine.cs rename to src/BouncyCastle/crypto/engines/CamelliaEngine.cs diff --git a/crypto/src/crypto/engines/CamelliaLightEngine.cs b/src/BouncyCastle/crypto/engines/CamelliaLightEngine.cs similarity index 100% rename from crypto/src/crypto/engines/CamelliaLightEngine.cs rename to src/BouncyCastle/crypto/engines/CamelliaLightEngine.cs diff --git a/crypto/src/crypto/engines/CamelliaWrapEngine.cs b/src/BouncyCastle/crypto/engines/CamelliaWrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/CamelliaWrapEngine.cs rename to src/BouncyCastle/crypto/engines/CamelliaWrapEngine.cs diff --git a/crypto/src/crypto/engines/Cast5Engine.cs b/src/BouncyCastle/crypto/engines/Cast5Engine.cs similarity index 100% rename from crypto/src/crypto/engines/Cast5Engine.cs rename to src/BouncyCastle/crypto/engines/Cast5Engine.cs diff --git a/crypto/src/crypto/engines/Cast6Engine.cs b/src/BouncyCastle/crypto/engines/Cast6Engine.cs similarity index 100% rename from crypto/src/crypto/engines/Cast6Engine.cs rename to src/BouncyCastle/crypto/engines/Cast6Engine.cs diff --git a/crypto/src/crypto/engines/ChaCha7539Engine.cs b/src/BouncyCastle/crypto/engines/ChaCha7539Engine.cs similarity index 100% rename from crypto/src/crypto/engines/ChaCha7539Engine.cs rename to src/BouncyCastle/crypto/engines/ChaCha7539Engine.cs diff --git a/crypto/src/crypto/engines/ChaChaEngine.cs b/src/BouncyCastle/crypto/engines/ChaChaEngine.cs similarity index 100% rename from crypto/src/crypto/engines/ChaChaEngine.cs rename to src/BouncyCastle/crypto/engines/ChaChaEngine.cs diff --git a/crypto/src/crypto/engines/DesEdeEngine.cs b/src/BouncyCastle/crypto/engines/DesEdeEngine.cs similarity index 100% rename from crypto/src/crypto/engines/DesEdeEngine.cs rename to src/BouncyCastle/crypto/engines/DesEdeEngine.cs diff --git a/crypto/src/crypto/engines/DesEdeWrapEngine.cs b/src/BouncyCastle/crypto/engines/DesEdeWrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/DesEdeWrapEngine.cs rename to src/BouncyCastle/crypto/engines/DesEdeWrapEngine.cs diff --git a/crypto/src/crypto/engines/DesEngine.cs b/src/BouncyCastle/crypto/engines/DesEngine.cs similarity index 100% rename from crypto/src/crypto/engines/DesEngine.cs rename to src/BouncyCastle/crypto/engines/DesEngine.cs diff --git a/crypto/src/crypto/engines/Dstu7624Engine.cs b/src/BouncyCastle/crypto/engines/Dstu7624Engine.cs similarity index 100% rename from crypto/src/crypto/engines/Dstu7624Engine.cs rename to src/BouncyCastle/crypto/engines/Dstu7624Engine.cs diff --git a/crypto/src/crypto/engines/Dstu7624WrapEngine.cs b/src/BouncyCastle/crypto/engines/Dstu7624WrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/Dstu7624WrapEngine.cs rename to src/BouncyCastle/crypto/engines/Dstu7624WrapEngine.cs diff --git a/crypto/src/crypto/engines/ElGamalEngine.cs b/src/BouncyCastle/crypto/engines/ElGamalEngine.cs similarity index 100% rename from crypto/src/crypto/engines/ElGamalEngine.cs rename to src/BouncyCastle/crypto/engines/ElGamalEngine.cs diff --git a/crypto/src/crypto/engines/GOST28147Engine.cs b/src/BouncyCastle/crypto/engines/GOST28147Engine.cs similarity index 100% rename from crypto/src/crypto/engines/GOST28147Engine.cs rename to src/BouncyCastle/crypto/engines/GOST28147Engine.cs diff --git a/crypto/src/crypto/engines/HC128Engine.cs b/src/BouncyCastle/crypto/engines/HC128Engine.cs similarity index 100% rename from crypto/src/crypto/engines/HC128Engine.cs rename to src/BouncyCastle/crypto/engines/HC128Engine.cs diff --git a/crypto/src/crypto/engines/HC256Engine.cs b/src/BouncyCastle/crypto/engines/HC256Engine.cs similarity index 100% rename from crypto/src/crypto/engines/HC256Engine.cs rename to src/BouncyCastle/crypto/engines/HC256Engine.cs diff --git a/crypto/src/crypto/engines/ISAACEngine.cs b/src/BouncyCastle/crypto/engines/ISAACEngine.cs similarity index 100% rename from crypto/src/crypto/engines/ISAACEngine.cs rename to src/BouncyCastle/crypto/engines/ISAACEngine.cs diff --git a/crypto/src/crypto/engines/IdeaEngine.cs b/src/BouncyCastle/crypto/engines/IdeaEngine.cs similarity index 100% rename from crypto/src/crypto/engines/IdeaEngine.cs rename to src/BouncyCastle/crypto/engines/IdeaEngine.cs diff --git a/crypto/src/crypto/engines/IesEngine.cs b/src/BouncyCastle/crypto/engines/IesEngine.cs similarity index 100% rename from crypto/src/crypto/engines/IesEngine.cs rename to src/BouncyCastle/crypto/engines/IesEngine.cs diff --git a/crypto/src/crypto/engines/NaccacheSternEngine.cs b/src/BouncyCastle/crypto/engines/NaccacheSternEngine.cs similarity index 100% rename from crypto/src/crypto/engines/NaccacheSternEngine.cs rename to src/BouncyCastle/crypto/engines/NaccacheSternEngine.cs diff --git a/crypto/src/crypto/engines/NoekeonEngine.cs b/src/BouncyCastle/crypto/engines/NoekeonEngine.cs similarity index 100% rename from crypto/src/crypto/engines/NoekeonEngine.cs rename to src/BouncyCastle/crypto/engines/NoekeonEngine.cs diff --git a/crypto/src/crypto/engines/NullEngine.cs b/src/BouncyCastle/crypto/engines/NullEngine.cs similarity index 100% rename from crypto/src/crypto/engines/NullEngine.cs rename to src/BouncyCastle/crypto/engines/NullEngine.cs diff --git a/crypto/src/crypto/engines/RC2Engine.cs b/src/BouncyCastle/crypto/engines/RC2Engine.cs similarity index 100% rename from crypto/src/crypto/engines/RC2Engine.cs rename to src/BouncyCastle/crypto/engines/RC2Engine.cs diff --git a/crypto/src/crypto/engines/RC2WrapEngine.cs b/src/BouncyCastle/crypto/engines/RC2WrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RC2WrapEngine.cs rename to src/BouncyCastle/crypto/engines/RC2WrapEngine.cs diff --git a/crypto/src/crypto/engines/RC4Engine.cs b/src/BouncyCastle/crypto/engines/RC4Engine.cs similarity index 100% rename from crypto/src/crypto/engines/RC4Engine.cs rename to src/BouncyCastle/crypto/engines/RC4Engine.cs diff --git a/crypto/src/crypto/engines/RC532Engine.cs b/src/BouncyCastle/crypto/engines/RC532Engine.cs similarity index 100% rename from crypto/src/crypto/engines/RC532Engine.cs rename to src/BouncyCastle/crypto/engines/RC532Engine.cs diff --git a/crypto/src/crypto/engines/RC564Engine.cs b/src/BouncyCastle/crypto/engines/RC564Engine.cs similarity index 100% rename from crypto/src/crypto/engines/RC564Engine.cs rename to src/BouncyCastle/crypto/engines/RC564Engine.cs diff --git a/crypto/src/crypto/engines/RC6Engine.cs b/src/BouncyCastle/crypto/engines/RC6Engine.cs similarity index 100% rename from crypto/src/crypto/engines/RC6Engine.cs rename to src/BouncyCastle/crypto/engines/RC6Engine.cs diff --git a/crypto/src/crypto/engines/RFC3211WrapEngine.cs b/src/BouncyCastle/crypto/engines/RFC3211WrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RFC3211WrapEngine.cs rename to src/BouncyCastle/crypto/engines/RFC3211WrapEngine.cs diff --git a/crypto/src/crypto/engines/RFC3394WrapEngine.cs b/src/BouncyCastle/crypto/engines/RFC3394WrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RFC3394WrapEngine.cs rename to src/BouncyCastle/crypto/engines/RFC3394WrapEngine.cs diff --git a/crypto/src/crypto/engines/RSABlindedEngine.cs b/src/BouncyCastle/crypto/engines/RSABlindedEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RSABlindedEngine.cs rename to src/BouncyCastle/crypto/engines/RSABlindedEngine.cs diff --git a/crypto/src/crypto/engines/RSABlindingEngine.cs b/src/BouncyCastle/crypto/engines/RSABlindingEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RSABlindingEngine.cs rename to src/BouncyCastle/crypto/engines/RSABlindingEngine.cs diff --git a/crypto/src/crypto/engines/RSACoreEngine.cs b/src/BouncyCastle/crypto/engines/RSACoreEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RSACoreEngine.cs rename to src/BouncyCastle/crypto/engines/RSACoreEngine.cs diff --git a/crypto/src/crypto/engines/RijndaelEngine.cs b/src/BouncyCastle/crypto/engines/RijndaelEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RijndaelEngine.cs rename to src/BouncyCastle/crypto/engines/RijndaelEngine.cs diff --git a/crypto/src/crypto/engines/RsaEngine.cs b/src/BouncyCastle/crypto/engines/RsaEngine.cs similarity index 100% rename from crypto/src/crypto/engines/RsaEngine.cs rename to src/BouncyCastle/crypto/engines/RsaEngine.cs diff --git a/crypto/src/crypto/engines/SEEDEngine.cs b/src/BouncyCastle/crypto/engines/SEEDEngine.cs similarity index 100% rename from crypto/src/crypto/engines/SEEDEngine.cs rename to src/BouncyCastle/crypto/engines/SEEDEngine.cs diff --git a/crypto/src/crypto/engines/SEEDWrapEngine.cs b/src/BouncyCastle/crypto/engines/SEEDWrapEngine.cs similarity index 100% rename from crypto/src/crypto/engines/SEEDWrapEngine.cs rename to src/BouncyCastle/crypto/engines/SEEDWrapEngine.cs diff --git a/crypto/src/crypto/engines/SM2Engine.cs b/src/BouncyCastle/crypto/engines/SM2Engine.cs similarity index 100% rename from crypto/src/crypto/engines/SM2Engine.cs rename to src/BouncyCastle/crypto/engines/SM2Engine.cs diff --git a/crypto/src/crypto/engines/SM4Engine.cs b/src/BouncyCastle/crypto/engines/SM4Engine.cs similarity index 100% rename from crypto/src/crypto/engines/SM4Engine.cs rename to src/BouncyCastle/crypto/engines/SM4Engine.cs diff --git a/crypto/src/crypto/engines/Salsa20Engine.cs b/src/BouncyCastle/crypto/engines/Salsa20Engine.cs similarity index 100% rename from crypto/src/crypto/engines/Salsa20Engine.cs rename to src/BouncyCastle/crypto/engines/Salsa20Engine.cs diff --git a/crypto/src/crypto/engines/SerpentEngine.cs b/src/BouncyCastle/crypto/engines/SerpentEngine.cs similarity index 100% rename from crypto/src/crypto/engines/SerpentEngine.cs rename to src/BouncyCastle/crypto/engines/SerpentEngine.cs diff --git a/crypto/src/crypto/engines/SerpentEngineBase.cs b/src/BouncyCastle/crypto/engines/SerpentEngineBase.cs similarity index 100% rename from crypto/src/crypto/engines/SerpentEngineBase.cs rename to src/BouncyCastle/crypto/engines/SerpentEngineBase.cs diff --git a/crypto/src/crypto/engines/SkipjackEngine.cs b/src/BouncyCastle/crypto/engines/SkipjackEngine.cs similarity index 100% rename from crypto/src/crypto/engines/SkipjackEngine.cs rename to src/BouncyCastle/crypto/engines/SkipjackEngine.cs diff --git a/crypto/src/crypto/engines/TEAEngine.cs b/src/BouncyCastle/crypto/engines/TEAEngine.cs similarity index 100% rename from crypto/src/crypto/engines/TEAEngine.cs rename to src/BouncyCastle/crypto/engines/TEAEngine.cs diff --git a/crypto/src/crypto/engines/ThreefishEngine.cs b/src/BouncyCastle/crypto/engines/ThreefishEngine.cs similarity index 100% rename from crypto/src/crypto/engines/ThreefishEngine.cs rename to src/BouncyCastle/crypto/engines/ThreefishEngine.cs diff --git a/crypto/src/crypto/engines/TnepresEngine.cs b/src/BouncyCastle/crypto/engines/TnepresEngine.cs similarity index 100% rename from crypto/src/crypto/engines/TnepresEngine.cs rename to src/BouncyCastle/crypto/engines/TnepresEngine.cs diff --git a/crypto/src/crypto/engines/TwofishEngine.cs b/src/BouncyCastle/crypto/engines/TwofishEngine.cs similarity index 100% rename from crypto/src/crypto/engines/TwofishEngine.cs rename to src/BouncyCastle/crypto/engines/TwofishEngine.cs diff --git a/crypto/src/crypto/engines/VMPCEngine.cs b/src/BouncyCastle/crypto/engines/VMPCEngine.cs similarity index 100% rename from crypto/src/crypto/engines/VMPCEngine.cs rename to src/BouncyCastle/crypto/engines/VMPCEngine.cs diff --git a/crypto/src/crypto/engines/VMPCKSA3Engine.cs b/src/BouncyCastle/crypto/engines/VMPCKSA3Engine.cs similarity index 100% rename from crypto/src/crypto/engines/VMPCKSA3Engine.cs rename to src/BouncyCastle/crypto/engines/VMPCKSA3Engine.cs diff --git a/crypto/src/crypto/engines/XSalsa20Engine.cs b/src/BouncyCastle/crypto/engines/XSalsa20Engine.cs similarity index 100% rename from crypto/src/crypto/engines/XSalsa20Engine.cs rename to src/BouncyCastle/crypto/engines/XSalsa20Engine.cs diff --git a/crypto/src/crypto/engines/XTEAEngine.cs b/src/BouncyCastle/crypto/engines/XTEAEngine.cs similarity index 100% rename from crypto/src/crypto/engines/XTEAEngine.cs rename to src/BouncyCastle/crypto/engines/XTEAEngine.cs diff --git a/crypto/src/crypto/generators/BCrypt.cs b/src/BouncyCastle/crypto/generators/BCrypt.cs similarity index 100% rename from crypto/src/crypto/generators/BCrypt.cs rename to src/BouncyCastle/crypto/generators/BCrypt.cs diff --git a/crypto/src/crypto/generators/BaseKdfBytesGenerator.cs b/src/BouncyCastle/crypto/generators/BaseKdfBytesGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/BaseKdfBytesGenerator.cs rename to src/BouncyCastle/crypto/generators/BaseKdfBytesGenerator.cs diff --git a/crypto/src/crypto/generators/DHBasicKeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/DHBasicKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/DHBasicKeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/DHBasicKeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/DHKeyGeneratorHelper.cs b/src/BouncyCastle/crypto/generators/DHKeyGeneratorHelper.cs similarity index 100% rename from crypto/src/crypto/generators/DHKeyGeneratorHelper.cs rename to src/BouncyCastle/crypto/generators/DHKeyGeneratorHelper.cs diff --git a/crypto/src/crypto/generators/DHKeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/DHKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/DHKeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/DHKeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/DHParametersGenerator.cs b/src/BouncyCastle/crypto/generators/DHParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/DHParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/DHParametersGenerator.cs diff --git a/crypto/src/crypto/generators/DHParametersHelper.cs b/src/BouncyCastle/crypto/generators/DHParametersHelper.cs similarity index 100% rename from crypto/src/crypto/generators/DHParametersHelper.cs rename to src/BouncyCastle/crypto/generators/DHParametersHelper.cs diff --git a/crypto/src/crypto/generators/DesEdeKeyGenerator.cs b/src/BouncyCastle/crypto/generators/DesEdeKeyGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/DesEdeKeyGenerator.cs rename to src/BouncyCastle/crypto/generators/DesEdeKeyGenerator.cs diff --git a/crypto/src/crypto/generators/DesKeyGenerator.cs b/src/BouncyCastle/crypto/generators/DesKeyGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/DesKeyGenerator.cs rename to src/BouncyCastle/crypto/generators/DesKeyGenerator.cs diff --git a/crypto/src/crypto/generators/DsaKeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/DsaKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/DsaKeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/DsaKeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/DsaParametersGenerator.cs b/src/BouncyCastle/crypto/generators/DsaParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/DsaParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/DsaParametersGenerator.cs diff --git a/crypto/src/crypto/generators/ECKeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/ECKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/ECKeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/ECKeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/Ed25519KeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/Ed25519KeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Ed25519KeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/Ed25519KeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/Ed448KeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/Ed448KeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Ed448KeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/Ed448KeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/ElGamalKeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/ElGamalKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/ElGamalKeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/ElGamalKeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/ElGamalParametersGenerator.cs b/src/BouncyCastle/crypto/generators/ElGamalParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/ElGamalParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/ElGamalParametersGenerator.cs diff --git a/crypto/src/crypto/generators/GOST3410KeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/GOST3410KeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/GOST3410KeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/GOST3410KeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/GOST3410ParametersGenerator.cs b/src/BouncyCastle/crypto/generators/GOST3410ParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/GOST3410ParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/GOST3410ParametersGenerator.cs diff --git a/crypto/src/crypto/generators/HKDFBytesGenerator.cs b/src/BouncyCastle/crypto/generators/HKDFBytesGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/HKDFBytesGenerator.cs rename to src/BouncyCastle/crypto/generators/HKDFBytesGenerator.cs diff --git a/crypto/src/crypto/generators/Kdf1BytesGenerator.cs b/src/BouncyCastle/crypto/generators/Kdf1BytesGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Kdf1BytesGenerator.cs rename to src/BouncyCastle/crypto/generators/Kdf1BytesGenerator.cs diff --git a/crypto/src/crypto/generators/Kdf2BytesGenerator.cs b/src/BouncyCastle/crypto/generators/Kdf2BytesGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Kdf2BytesGenerator.cs rename to src/BouncyCastle/crypto/generators/Kdf2BytesGenerator.cs diff --git a/crypto/src/crypto/generators/Mgf1BytesGenerator.cs b/src/BouncyCastle/crypto/generators/Mgf1BytesGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Mgf1BytesGenerator.cs rename to src/BouncyCastle/crypto/generators/Mgf1BytesGenerator.cs diff --git a/crypto/src/crypto/generators/NaccacheSternKeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/NaccacheSternKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/NaccacheSternKeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/NaccacheSternKeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/OpenBsdBCrypt.cs b/src/BouncyCastle/crypto/generators/OpenBsdBCrypt.cs similarity index 100% rename from crypto/src/crypto/generators/OpenBsdBCrypt.cs rename to src/BouncyCastle/crypto/generators/OpenBsdBCrypt.cs diff --git a/crypto/src/crypto/generators/OpenSSLPBEParametersGenerator.cs b/src/BouncyCastle/crypto/generators/OpenSSLPBEParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/OpenSSLPBEParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/OpenSSLPBEParametersGenerator.cs diff --git a/crypto/src/crypto/generators/Pkcs12ParametersGenerator.cs b/src/BouncyCastle/crypto/generators/Pkcs12ParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Pkcs12ParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/Pkcs12ParametersGenerator.cs diff --git a/crypto/src/crypto/generators/Pkcs5S1ParametersGenerator.cs b/src/BouncyCastle/crypto/generators/Pkcs5S1ParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Pkcs5S1ParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/Pkcs5S1ParametersGenerator.cs diff --git a/crypto/src/crypto/generators/Pkcs5S2ParametersGenerator.cs b/src/BouncyCastle/crypto/generators/Pkcs5S2ParametersGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Pkcs5S2ParametersGenerator.cs rename to src/BouncyCastle/crypto/generators/Pkcs5S2ParametersGenerator.cs diff --git a/crypto/src/crypto/generators/Poly1305KeyGenerator.cs b/src/BouncyCastle/crypto/generators/Poly1305KeyGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/Poly1305KeyGenerator.cs rename to src/BouncyCastle/crypto/generators/Poly1305KeyGenerator.cs diff --git a/crypto/src/crypto/generators/RSABlindingFactorGenerator.cs b/src/BouncyCastle/crypto/generators/RSABlindingFactorGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/RSABlindingFactorGenerator.cs rename to src/BouncyCastle/crypto/generators/RSABlindingFactorGenerator.cs diff --git a/crypto/src/crypto/generators/RsaKeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/RsaKeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/RsaKeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/RsaKeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/SCrypt.cs b/src/BouncyCastle/crypto/generators/SCrypt.cs similarity index 100% rename from crypto/src/crypto/generators/SCrypt.cs rename to src/BouncyCastle/crypto/generators/SCrypt.cs diff --git a/crypto/src/crypto/generators/X25519KeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/X25519KeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/X25519KeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/X25519KeyPairGenerator.cs diff --git a/crypto/src/crypto/generators/X448KeyPairGenerator.cs b/src/BouncyCastle/crypto/generators/X448KeyPairGenerator.cs similarity index 100% rename from crypto/src/crypto/generators/X448KeyPairGenerator.cs rename to src/BouncyCastle/crypto/generators/X448KeyPairGenerator.cs diff --git a/crypto/src/crypto/io/CipherStream.cs b/src/BouncyCastle/crypto/io/CipherStream.cs similarity index 100% rename from crypto/src/crypto/io/CipherStream.cs rename to src/BouncyCastle/crypto/io/CipherStream.cs diff --git a/crypto/src/crypto/io/DigestSink.cs b/src/BouncyCastle/crypto/io/DigestSink.cs similarity index 100% rename from crypto/src/crypto/io/DigestSink.cs rename to src/BouncyCastle/crypto/io/DigestSink.cs diff --git a/crypto/src/crypto/io/DigestStream.cs b/src/BouncyCastle/crypto/io/DigestStream.cs similarity index 100% rename from crypto/src/crypto/io/DigestStream.cs rename to src/BouncyCastle/crypto/io/DigestStream.cs diff --git a/crypto/src/crypto/io/MacSink.cs b/src/BouncyCastle/crypto/io/MacSink.cs similarity index 100% rename from crypto/src/crypto/io/MacSink.cs rename to src/BouncyCastle/crypto/io/MacSink.cs diff --git a/crypto/src/crypto/io/MacStream.cs b/src/BouncyCastle/crypto/io/MacStream.cs similarity index 100% rename from crypto/src/crypto/io/MacStream.cs rename to src/BouncyCastle/crypto/io/MacStream.cs diff --git a/crypto/src/crypto/io/SignerSink.cs b/src/BouncyCastle/crypto/io/SignerSink.cs similarity index 100% rename from crypto/src/crypto/io/SignerSink.cs rename to src/BouncyCastle/crypto/io/SignerSink.cs diff --git a/crypto/src/crypto/io/SignerStream.cs b/src/BouncyCastle/crypto/io/SignerStream.cs similarity index 100% rename from crypto/src/crypto/io/SignerStream.cs rename to src/BouncyCastle/crypto/io/SignerStream.cs diff --git a/crypto/src/crypto/macs/CMac.cs b/src/BouncyCastle/crypto/macs/CMac.cs similarity index 100% rename from crypto/src/crypto/macs/CMac.cs rename to src/BouncyCastle/crypto/macs/CMac.cs diff --git a/crypto/src/crypto/macs/CbcBlockCipherMac.cs b/src/BouncyCastle/crypto/macs/CbcBlockCipherMac.cs similarity index 100% rename from crypto/src/crypto/macs/CbcBlockCipherMac.cs rename to src/BouncyCastle/crypto/macs/CbcBlockCipherMac.cs diff --git a/crypto/src/crypto/macs/CfbBlockCipherMac.cs b/src/BouncyCastle/crypto/macs/CfbBlockCipherMac.cs similarity index 100% rename from crypto/src/crypto/macs/CfbBlockCipherMac.cs rename to src/BouncyCastle/crypto/macs/CfbBlockCipherMac.cs diff --git a/crypto/src/crypto/macs/DSTU7564Mac.cs b/src/BouncyCastle/crypto/macs/DSTU7564Mac.cs similarity index 100% rename from crypto/src/crypto/macs/DSTU7564Mac.cs rename to src/BouncyCastle/crypto/macs/DSTU7564Mac.cs diff --git a/crypto/src/crypto/macs/DSTU7624Mac.cs b/src/BouncyCastle/crypto/macs/DSTU7624Mac.cs similarity index 100% rename from crypto/src/crypto/macs/DSTU7624Mac.cs rename to src/BouncyCastle/crypto/macs/DSTU7624Mac.cs diff --git a/crypto/src/crypto/macs/GMac.cs b/src/BouncyCastle/crypto/macs/GMac.cs similarity index 100% rename from crypto/src/crypto/macs/GMac.cs rename to src/BouncyCastle/crypto/macs/GMac.cs diff --git a/crypto/src/crypto/macs/GOST28147Mac.cs b/src/BouncyCastle/crypto/macs/GOST28147Mac.cs similarity index 100% rename from crypto/src/crypto/macs/GOST28147Mac.cs rename to src/BouncyCastle/crypto/macs/GOST28147Mac.cs diff --git a/crypto/src/crypto/macs/HMac.cs b/src/BouncyCastle/crypto/macs/HMac.cs similarity index 100% rename from crypto/src/crypto/macs/HMac.cs rename to src/BouncyCastle/crypto/macs/HMac.cs diff --git a/crypto/src/crypto/macs/ISO9797Alg3Mac.cs b/src/BouncyCastle/crypto/macs/ISO9797Alg3Mac.cs similarity index 100% rename from crypto/src/crypto/macs/ISO9797Alg3Mac.cs rename to src/BouncyCastle/crypto/macs/ISO9797Alg3Mac.cs diff --git a/crypto/src/crypto/macs/Poly1305.cs b/src/BouncyCastle/crypto/macs/Poly1305.cs similarity index 100% rename from crypto/src/crypto/macs/Poly1305.cs rename to src/BouncyCastle/crypto/macs/Poly1305.cs diff --git a/crypto/src/crypto/macs/SipHash.cs b/src/BouncyCastle/crypto/macs/SipHash.cs similarity index 100% rename from crypto/src/crypto/macs/SipHash.cs rename to src/BouncyCastle/crypto/macs/SipHash.cs diff --git a/crypto/src/crypto/macs/SkeinMac.cs b/src/BouncyCastle/crypto/macs/SkeinMac.cs similarity index 100% rename from crypto/src/crypto/macs/SkeinMac.cs rename to src/BouncyCastle/crypto/macs/SkeinMac.cs diff --git a/crypto/src/crypto/macs/VMPCMac.cs b/src/BouncyCastle/crypto/macs/VMPCMac.cs similarity index 100% rename from crypto/src/crypto/macs/VMPCMac.cs rename to src/BouncyCastle/crypto/macs/VMPCMac.cs diff --git a/crypto/src/crypto/modes/CbcBlockCipher.cs b/src/BouncyCastle/crypto/modes/CbcBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/CbcBlockCipher.cs rename to src/BouncyCastle/crypto/modes/CbcBlockCipher.cs diff --git a/crypto/src/crypto/modes/CcmBlockCipher.cs b/src/BouncyCastle/crypto/modes/CcmBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/CcmBlockCipher.cs rename to src/BouncyCastle/crypto/modes/CcmBlockCipher.cs diff --git a/crypto/src/crypto/modes/CfbBlockCipher.cs b/src/BouncyCastle/crypto/modes/CfbBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/CfbBlockCipher.cs rename to src/BouncyCastle/crypto/modes/CfbBlockCipher.cs diff --git a/crypto/src/crypto/modes/CtsBlockCipher.cs b/src/BouncyCastle/crypto/modes/CtsBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/CtsBlockCipher.cs rename to src/BouncyCastle/crypto/modes/CtsBlockCipher.cs diff --git a/crypto/src/crypto/modes/EAXBlockCipher.cs b/src/BouncyCastle/crypto/modes/EAXBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/EAXBlockCipher.cs rename to src/BouncyCastle/crypto/modes/EAXBlockCipher.cs diff --git a/crypto/src/crypto/modes/GCMBlockCipher.cs b/src/BouncyCastle/crypto/modes/GCMBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/GCMBlockCipher.cs rename to src/BouncyCastle/crypto/modes/GCMBlockCipher.cs diff --git a/crypto/src/crypto/modes/GOFBBlockCipher.cs b/src/BouncyCastle/crypto/modes/GOFBBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/GOFBBlockCipher.cs rename to src/BouncyCastle/crypto/modes/GOFBBlockCipher.cs diff --git a/crypto/src/crypto/modes/IAeadBlockCipher.cs b/src/BouncyCastle/crypto/modes/IAeadBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/IAeadBlockCipher.cs rename to src/BouncyCastle/crypto/modes/IAeadBlockCipher.cs diff --git a/crypto/src/crypto/modes/KCcmBlockCipher.cs b/src/BouncyCastle/crypto/modes/KCcmBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/KCcmBlockCipher.cs rename to src/BouncyCastle/crypto/modes/KCcmBlockCipher.cs diff --git a/crypto/src/crypto/modes/KCtrBlockCipher.cs b/src/BouncyCastle/crypto/modes/KCtrBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/KCtrBlockCipher.cs rename to src/BouncyCastle/crypto/modes/KCtrBlockCipher.cs diff --git a/crypto/src/crypto/modes/OCBBlockCipher.cs b/src/BouncyCastle/crypto/modes/OCBBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/OCBBlockCipher.cs rename to src/BouncyCastle/crypto/modes/OCBBlockCipher.cs diff --git a/crypto/src/crypto/modes/OfbBlockCipher.cs b/src/BouncyCastle/crypto/modes/OfbBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/OfbBlockCipher.cs rename to src/BouncyCastle/crypto/modes/OfbBlockCipher.cs diff --git a/crypto/src/crypto/modes/OpenPgpCfbBlockCipher.cs b/src/BouncyCastle/crypto/modes/OpenPgpCfbBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/OpenPgpCfbBlockCipher.cs rename to src/BouncyCastle/crypto/modes/OpenPgpCfbBlockCipher.cs diff --git a/crypto/src/crypto/modes/SicBlockCipher.cs b/src/BouncyCastle/crypto/modes/SicBlockCipher.cs similarity index 100% rename from crypto/src/crypto/modes/SicBlockCipher.cs rename to src/BouncyCastle/crypto/modes/SicBlockCipher.cs diff --git a/crypto/src/crypto/modes/gcm/BasicGcmExponentiator.cs b/src/BouncyCastle/crypto/modes/gcm/BasicGcmExponentiator.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/BasicGcmExponentiator.cs rename to src/BouncyCastle/crypto/modes/gcm/BasicGcmExponentiator.cs diff --git a/crypto/src/crypto/modes/gcm/BasicGcmMultiplier.cs b/src/BouncyCastle/crypto/modes/gcm/BasicGcmMultiplier.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/BasicGcmMultiplier.cs rename to src/BouncyCastle/crypto/modes/gcm/BasicGcmMultiplier.cs diff --git a/crypto/src/crypto/modes/gcm/GcmUtilities.cs b/src/BouncyCastle/crypto/modes/gcm/GcmUtilities.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/GcmUtilities.cs rename to src/BouncyCastle/crypto/modes/gcm/GcmUtilities.cs diff --git a/crypto/src/crypto/modes/gcm/IGcmExponentiator.cs b/src/BouncyCastle/crypto/modes/gcm/IGcmExponentiator.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/IGcmExponentiator.cs rename to src/BouncyCastle/crypto/modes/gcm/IGcmExponentiator.cs diff --git a/crypto/src/crypto/modes/gcm/IGcmMultiplier.cs b/src/BouncyCastle/crypto/modes/gcm/IGcmMultiplier.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/IGcmMultiplier.cs rename to src/BouncyCastle/crypto/modes/gcm/IGcmMultiplier.cs diff --git a/crypto/src/crypto/modes/gcm/Tables1kGcmExponentiator.cs b/src/BouncyCastle/crypto/modes/gcm/Tables1kGcmExponentiator.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/Tables1kGcmExponentiator.cs rename to src/BouncyCastle/crypto/modes/gcm/Tables1kGcmExponentiator.cs diff --git a/crypto/src/crypto/modes/gcm/Tables64kGcmMultiplier.cs b/src/BouncyCastle/crypto/modes/gcm/Tables64kGcmMultiplier.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/Tables64kGcmMultiplier.cs rename to src/BouncyCastle/crypto/modes/gcm/Tables64kGcmMultiplier.cs diff --git a/crypto/src/crypto/modes/gcm/Tables8kGcmMultiplier.cs b/src/BouncyCastle/crypto/modes/gcm/Tables8kGcmMultiplier.cs similarity index 100% rename from crypto/src/crypto/modes/gcm/Tables8kGcmMultiplier.cs rename to src/BouncyCastle/crypto/modes/gcm/Tables8kGcmMultiplier.cs diff --git a/crypto/src/crypto/operators/Asn1Signature.cs b/src/BouncyCastle/crypto/operators/Asn1Signature.cs similarity index 100% rename from crypto/src/crypto/operators/Asn1Signature.cs rename to src/BouncyCastle/crypto/operators/Asn1Signature.cs diff --git a/crypto/src/crypto/operators/DefaultSignatureCalculator.cs b/src/BouncyCastle/crypto/operators/DefaultSignatureCalculator.cs similarity index 100% rename from crypto/src/crypto/operators/DefaultSignatureCalculator.cs rename to src/BouncyCastle/crypto/operators/DefaultSignatureCalculator.cs diff --git a/crypto/src/crypto/operators/DefaultSignatureResult.cs b/src/BouncyCastle/crypto/operators/DefaultSignatureResult.cs similarity index 100% rename from crypto/src/crypto/operators/DefaultSignatureResult.cs rename to src/BouncyCastle/crypto/operators/DefaultSignatureResult.cs diff --git a/crypto/src/crypto/operators/DefaultVerifierCalculator.cs b/src/BouncyCastle/crypto/operators/DefaultVerifierCalculator.cs similarity index 100% rename from crypto/src/crypto/operators/DefaultVerifierCalculator.cs rename to src/BouncyCastle/crypto/operators/DefaultVerifierCalculator.cs diff --git a/crypto/src/crypto/operators/DefaultVerifierResult.cs b/src/BouncyCastle/crypto/operators/DefaultVerifierResult.cs similarity index 100% rename from crypto/src/crypto/operators/DefaultVerifierResult.cs rename to src/BouncyCastle/crypto/operators/DefaultVerifierResult.cs diff --git a/crypto/src/crypto/paddings/BlockCipherPadding.cs b/src/BouncyCastle/crypto/paddings/BlockCipherPadding.cs similarity index 100% rename from crypto/src/crypto/paddings/BlockCipherPadding.cs rename to src/BouncyCastle/crypto/paddings/BlockCipherPadding.cs diff --git a/crypto/src/crypto/paddings/ISO10126d2Padding.cs b/src/BouncyCastle/crypto/paddings/ISO10126d2Padding.cs similarity index 100% rename from crypto/src/crypto/paddings/ISO10126d2Padding.cs rename to src/BouncyCastle/crypto/paddings/ISO10126d2Padding.cs diff --git a/crypto/src/crypto/paddings/ISO7816d4Padding.cs b/src/BouncyCastle/crypto/paddings/ISO7816d4Padding.cs similarity index 100% rename from crypto/src/crypto/paddings/ISO7816d4Padding.cs rename to src/BouncyCastle/crypto/paddings/ISO7816d4Padding.cs diff --git a/crypto/src/crypto/paddings/PaddedBufferedBlockCipher.cs b/src/BouncyCastle/crypto/paddings/PaddedBufferedBlockCipher.cs similarity index 100% rename from crypto/src/crypto/paddings/PaddedBufferedBlockCipher.cs rename to src/BouncyCastle/crypto/paddings/PaddedBufferedBlockCipher.cs diff --git a/crypto/src/crypto/paddings/Pkcs7Padding.cs b/src/BouncyCastle/crypto/paddings/Pkcs7Padding.cs similarity index 100% rename from crypto/src/crypto/paddings/Pkcs7Padding.cs rename to src/BouncyCastle/crypto/paddings/Pkcs7Padding.cs diff --git a/crypto/src/crypto/paddings/TbcPadding.cs b/src/BouncyCastle/crypto/paddings/TbcPadding.cs similarity index 100% rename from crypto/src/crypto/paddings/TbcPadding.cs rename to src/BouncyCastle/crypto/paddings/TbcPadding.cs diff --git a/crypto/src/crypto/paddings/X923Padding.cs b/src/BouncyCastle/crypto/paddings/X923Padding.cs similarity index 100% rename from crypto/src/crypto/paddings/X923Padding.cs rename to src/BouncyCastle/crypto/paddings/X923Padding.cs diff --git a/crypto/src/crypto/paddings/ZeroBytePadding.cs b/src/BouncyCastle/crypto/paddings/ZeroBytePadding.cs similarity index 100% rename from crypto/src/crypto/paddings/ZeroBytePadding.cs rename to src/BouncyCastle/crypto/paddings/ZeroBytePadding.cs diff --git a/crypto/src/crypto/parameters/AEADParameters.cs b/src/BouncyCastle/crypto/parameters/AEADParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/AEADParameters.cs rename to src/BouncyCastle/crypto/parameters/AEADParameters.cs diff --git a/crypto/src/crypto/parameters/CcmParameters.cs b/src/BouncyCastle/crypto/parameters/CcmParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/CcmParameters.cs rename to src/BouncyCastle/crypto/parameters/CcmParameters.cs diff --git a/crypto/src/crypto/parameters/DHKeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/DHKeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DHKeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/DHKeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/DHKeyParameters.cs b/src/BouncyCastle/crypto/parameters/DHKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DHKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/DHKeyParameters.cs diff --git a/crypto/src/crypto/parameters/DHParameters.cs b/src/BouncyCastle/crypto/parameters/DHParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DHParameters.cs rename to src/BouncyCastle/crypto/parameters/DHParameters.cs diff --git a/crypto/src/crypto/parameters/DHPrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/DHPrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DHPrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/DHPrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/DHPublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/DHPublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DHPublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/DHPublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/DHValidationParameters.cs b/src/BouncyCastle/crypto/parameters/DHValidationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DHValidationParameters.cs rename to src/BouncyCastle/crypto/parameters/DHValidationParameters.cs diff --git a/crypto/src/crypto/parameters/DSAParameterGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/DSAParameterGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DSAParameterGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/DSAParameterGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/DesEdeParameters.cs b/src/BouncyCastle/crypto/parameters/DesEdeParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DesEdeParameters.cs rename to src/BouncyCastle/crypto/parameters/DesEdeParameters.cs diff --git a/crypto/src/crypto/parameters/DesParameters.cs b/src/BouncyCastle/crypto/parameters/DesParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DesParameters.cs rename to src/BouncyCastle/crypto/parameters/DesParameters.cs diff --git a/crypto/src/crypto/parameters/DsaKeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/DsaKeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DsaKeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/DsaKeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/DsaKeyParameters.cs b/src/BouncyCastle/crypto/parameters/DsaKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DsaKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/DsaKeyParameters.cs diff --git a/crypto/src/crypto/parameters/DsaParameters.cs b/src/BouncyCastle/crypto/parameters/DsaParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DsaParameters.cs rename to src/BouncyCastle/crypto/parameters/DsaParameters.cs diff --git a/crypto/src/crypto/parameters/DsaPrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/DsaPrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DsaPrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/DsaPrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/DsaPublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/DsaPublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DsaPublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/DsaPublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/DsaValidationParameters.cs b/src/BouncyCastle/crypto/parameters/DsaValidationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/DsaValidationParameters.cs rename to src/BouncyCastle/crypto/parameters/DsaValidationParameters.cs diff --git a/crypto/src/crypto/parameters/ECDomainParameters.cs b/src/BouncyCastle/crypto/parameters/ECDomainParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ECDomainParameters.cs rename to src/BouncyCastle/crypto/parameters/ECDomainParameters.cs diff --git a/crypto/src/crypto/parameters/ECKeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/ECKeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ECKeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/ECKeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/ECKeyParameters.cs b/src/BouncyCastle/crypto/parameters/ECKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ECKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/ECKeyParameters.cs diff --git a/crypto/src/crypto/parameters/ECPrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/ECPrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ECPrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/ECPrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/ECPublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/ECPublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ECPublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/ECPublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/Ed25519KeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/Ed25519KeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/Ed25519KeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/Ed25519KeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/Ed25519PrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/Ed25519PrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/Ed25519PrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/Ed25519PrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/Ed25519PublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/Ed25519PublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/Ed25519PublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/Ed25519PublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/Ed448KeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/Ed448KeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/Ed448KeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/Ed448KeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/Ed448PrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/Ed448PrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/Ed448PrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/Ed448PrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/Ed448PublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/Ed448PublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/Ed448PublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/Ed448PublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/ElGamalKeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/ElGamalKeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ElGamalKeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/ElGamalKeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/ElGamalKeyParameters.cs b/src/BouncyCastle/crypto/parameters/ElGamalKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ElGamalKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/ElGamalKeyParameters.cs diff --git a/crypto/src/crypto/parameters/ElGamalParameters.cs b/src/BouncyCastle/crypto/parameters/ElGamalParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ElGamalParameters.cs rename to src/BouncyCastle/crypto/parameters/ElGamalParameters.cs diff --git a/crypto/src/crypto/parameters/ElGamalPrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/ElGamalPrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ElGamalPrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/ElGamalPrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/ElGamalPublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/ElGamalPublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ElGamalPublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/ElGamalPublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/GOST3410KeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/GOST3410KeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/GOST3410KeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/GOST3410KeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/GOST3410KeyParameters.cs b/src/BouncyCastle/crypto/parameters/GOST3410KeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/GOST3410KeyParameters.cs rename to src/BouncyCastle/crypto/parameters/GOST3410KeyParameters.cs diff --git a/crypto/src/crypto/parameters/GOST3410Parameters.cs b/src/BouncyCastle/crypto/parameters/GOST3410Parameters.cs similarity index 100% rename from crypto/src/crypto/parameters/GOST3410Parameters.cs rename to src/BouncyCastle/crypto/parameters/GOST3410Parameters.cs diff --git a/crypto/src/crypto/parameters/GOST3410PrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/GOST3410PrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/GOST3410PrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/GOST3410PrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/GOST3410PublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/GOST3410PublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/GOST3410PublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/GOST3410PublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/GOST3410ValidationParameters.cs b/src/BouncyCastle/crypto/parameters/GOST3410ValidationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/GOST3410ValidationParameters.cs rename to src/BouncyCastle/crypto/parameters/GOST3410ValidationParameters.cs diff --git a/crypto/src/crypto/parameters/HKDFParameters.cs b/src/BouncyCastle/crypto/parameters/HKDFParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/HKDFParameters.cs rename to src/BouncyCastle/crypto/parameters/HKDFParameters.cs diff --git a/crypto/src/crypto/parameters/ISO18033KDFParameters.cs b/src/BouncyCastle/crypto/parameters/ISO18033KDFParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/ISO18033KDFParameters.cs rename to src/BouncyCastle/crypto/parameters/ISO18033KDFParameters.cs diff --git a/crypto/src/crypto/parameters/IesParameters.cs b/src/BouncyCastle/crypto/parameters/IesParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/IesParameters.cs rename to src/BouncyCastle/crypto/parameters/IesParameters.cs diff --git a/crypto/src/crypto/parameters/IesWithCipherParameters.cs b/src/BouncyCastle/crypto/parameters/IesWithCipherParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/IesWithCipherParameters.cs rename to src/BouncyCastle/crypto/parameters/IesWithCipherParameters.cs diff --git a/crypto/src/crypto/parameters/KdfParameters.cs b/src/BouncyCastle/crypto/parameters/KdfParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/KdfParameters.cs rename to src/BouncyCastle/crypto/parameters/KdfParameters.cs diff --git a/crypto/src/crypto/parameters/KeyParameter.cs b/src/BouncyCastle/crypto/parameters/KeyParameter.cs similarity index 100% rename from crypto/src/crypto/parameters/KeyParameter.cs rename to src/BouncyCastle/crypto/parameters/KeyParameter.cs diff --git a/crypto/src/crypto/parameters/MgfParameters.cs b/src/BouncyCastle/crypto/parameters/MgfParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/MgfParameters.cs rename to src/BouncyCastle/crypto/parameters/MgfParameters.cs diff --git a/crypto/src/crypto/parameters/MqvPrivateParameters.cs b/src/BouncyCastle/crypto/parameters/MqvPrivateParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/MqvPrivateParameters.cs rename to src/BouncyCastle/crypto/parameters/MqvPrivateParameters.cs diff --git a/crypto/src/crypto/parameters/MqvPublicParameters.cs b/src/BouncyCastle/crypto/parameters/MqvPublicParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/MqvPublicParameters.cs rename to src/BouncyCastle/crypto/parameters/MqvPublicParameters.cs diff --git a/crypto/src/crypto/parameters/NaccacheSternKeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/NaccacheSternKeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/NaccacheSternKeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/NaccacheSternKeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/NaccacheSternKeyParameters.cs b/src/BouncyCastle/crypto/parameters/NaccacheSternKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/NaccacheSternKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/NaccacheSternKeyParameters.cs diff --git a/crypto/src/crypto/parameters/NaccacheSternPrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/NaccacheSternPrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/NaccacheSternPrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/NaccacheSternPrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/ParametersWithID.cs b/src/BouncyCastle/crypto/parameters/ParametersWithID.cs similarity index 100% rename from crypto/src/crypto/parameters/ParametersWithID.cs rename to src/BouncyCastle/crypto/parameters/ParametersWithID.cs diff --git a/crypto/src/crypto/parameters/ParametersWithIV.cs b/src/BouncyCastle/crypto/parameters/ParametersWithIV.cs similarity index 100% rename from crypto/src/crypto/parameters/ParametersWithIV.cs rename to src/BouncyCastle/crypto/parameters/ParametersWithIV.cs diff --git a/crypto/src/crypto/parameters/ParametersWithRandom.cs b/src/BouncyCastle/crypto/parameters/ParametersWithRandom.cs similarity index 100% rename from crypto/src/crypto/parameters/ParametersWithRandom.cs rename to src/BouncyCastle/crypto/parameters/ParametersWithRandom.cs diff --git a/crypto/src/crypto/parameters/ParametersWithSBox.cs b/src/BouncyCastle/crypto/parameters/ParametersWithSBox.cs similarity index 100% rename from crypto/src/crypto/parameters/ParametersWithSBox.cs rename to src/BouncyCastle/crypto/parameters/ParametersWithSBox.cs diff --git a/crypto/src/crypto/parameters/ParametersWithSalt.cs b/src/BouncyCastle/crypto/parameters/ParametersWithSalt.cs similarity index 100% rename from crypto/src/crypto/parameters/ParametersWithSalt.cs rename to src/BouncyCastle/crypto/parameters/ParametersWithSalt.cs diff --git a/crypto/src/crypto/parameters/RC2Parameters.cs b/src/BouncyCastle/crypto/parameters/RC2Parameters.cs similarity index 100% rename from crypto/src/crypto/parameters/RC2Parameters.cs rename to src/BouncyCastle/crypto/parameters/RC2Parameters.cs diff --git a/crypto/src/crypto/parameters/RC5Parameters.cs b/src/BouncyCastle/crypto/parameters/RC5Parameters.cs similarity index 100% rename from crypto/src/crypto/parameters/RC5Parameters.cs rename to src/BouncyCastle/crypto/parameters/RC5Parameters.cs diff --git a/crypto/src/crypto/parameters/RSABlindingParameters.cs b/src/BouncyCastle/crypto/parameters/RSABlindingParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/RSABlindingParameters.cs rename to src/BouncyCastle/crypto/parameters/RSABlindingParameters.cs diff --git a/crypto/src/crypto/parameters/RsaKeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/RsaKeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/RsaKeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/RsaKeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/RsaKeyParameters.cs b/src/BouncyCastle/crypto/parameters/RsaKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/RsaKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/RsaKeyParameters.cs diff --git a/crypto/src/crypto/parameters/RsaPrivateCrtKeyParameters.cs b/src/BouncyCastle/crypto/parameters/RsaPrivateCrtKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/RsaPrivateCrtKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/RsaPrivateCrtKeyParameters.cs diff --git a/crypto/src/crypto/parameters/SM2KeyExchangePrivateParameters.cs b/src/BouncyCastle/crypto/parameters/SM2KeyExchangePrivateParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/SM2KeyExchangePrivateParameters.cs rename to src/BouncyCastle/crypto/parameters/SM2KeyExchangePrivateParameters.cs diff --git a/crypto/src/crypto/parameters/SM2KeyExchangePublicParameters.cs b/src/BouncyCastle/crypto/parameters/SM2KeyExchangePublicParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/SM2KeyExchangePublicParameters.cs rename to src/BouncyCastle/crypto/parameters/SM2KeyExchangePublicParameters.cs diff --git a/crypto/src/crypto/parameters/SkeinParameters.cs b/src/BouncyCastle/crypto/parameters/SkeinParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/SkeinParameters.cs rename to src/BouncyCastle/crypto/parameters/SkeinParameters.cs diff --git a/crypto/src/crypto/parameters/Srp6GroupParameters.cs b/src/BouncyCastle/crypto/parameters/Srp6GroupParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/Srp6GroupParameters.cs rename to src/BouncyCastle/crypto/parameters/Srp6GroupParameters.cs diff --git a/crypto/src/crypto/parameters/TweakableBlockCipherParameters.cs b/src/BouncyCastle/crypto/parameters/TweakableBlockCipherParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/TweakableBlockCipherParameters.cs rename to src/BouncyCastle/crypto/parameters/TweakableBlockCipherParameters.cs diff --git a/crypto/src/crypto/parameters/X25519KeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/X25519KeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/X25519KeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/X25519KeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/X25519PrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/X25519PrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/X25519PrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/X25519PrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/X25519PublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/X25519PublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/X25519PublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/X25519PublicKeyParameters.cs diff --git a/crypto/src/crypto/parameters/X448KeyGenerationParameters.cs b/src/BouncyCastle/crypto/parameters/X448KeyGenerationParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/X448KeyGenerationParameters.cs rename to src/BouncyCastle/crypto/parameters/X448KeyGenerationParameters.cs diff --git a/crypto/src/crypto/parameters/X448PrivateKeyParameters.cs b/src/BouncyCastle/crypto/parameters/X448PrivateKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/X448PrivateKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/X448PrivateKeyParameters.cs diff --git a/crypto/src/crypto/parameters/X448PublicKeyParameters.cs b/src/BouncyCastle/crypto/parameters/X448PublicKeyParameters.cs similarity index 100% rename from crypto/src/crypto/parameters/X448PublicKeyParameters.cs rename to src/BouncyCastle/crypto/parameters/X448PublicKeyParameters.cs diff --git a/crypto/src/crypto/prng/BasicEntropySourceProvider.cs b/src/BouncyCastle/crypto/prng/BasicEntropySourceProvider.cs similarity index 100% rename from crypto/src/crypto/prng/BasicEntropySourceProvider.cs rename to src/BouncyCastle/crypto/prng/BasicEntropySourceProvider.cs diff --git a/crypto/src/crypto/prng/CryptoApiEntropySourceProvider.cs b/src/BouncyCastle/crypto/prng/CryptoApiEntropySourceProvider.cs similarity index 100% rename from crypto/src/crypto/prng/CryptoApiEntropySourceProvider.cs rename to src/BouncyCastle/crypto/prng/CryptoApiEntropySourceProvider.cs diff --git a/crypto/src/crypto/prng/CryptoApiRandomGenerator.cs b/src/BouncyCastle/crypto/prng/CryptoApiRandomGenerator.cs similarity index 100% rename from crypto/src/crypto/prng/CryptoApiRandomGenerator.cs rename to src/BouncyCastle/crypto/prng/CryptoApiRandomGenerator.cs diff --git a/crypto/src/crypto/prng/DigestRandomGenerator.cs b/src/BouncyCastle/crypto/prng/DigestRandomGenerator.cs similarity index 100% rename from crypto/src/crypto/prng/DigestRandomGenerator.cs rename to src/BouncyCastle/crypto/prng/DigestRandomGenerator.cs diff --git a/crypto/src/crypto/prng/EntropyUtilities.cs b/src/BouncyCastle/crypto/prng/EntropyUtilities.cs similarity index 100% rename from crypto/src/crypto/prng/EntropyUtilities.cs rename to src/BouncyCastle/crypto/prng/EntropyUtilities.cs diff --git a/crypto/src/crypto/prng/IDrbgProvider.cs b/src/BouncyCastle/crypto/prng/IDrbgProvider.cs similarity index 100% rename from crypto/src/crypto/prng/IDrbgProvider.cs rename to src/BouncyCastle/crypto/prng/IDrbgProvider.cs diff --git a/crypto/src/crypto/prng/IRandomGenerator.cs b/src/BouncyCastle/crypto/prng/IRandomGenerator.cs similarity index 100% rename from crypto/src/crypto/prng/IRandomGenerator.cs rename to src/BouncyCastle/crypto/prng/IRandomGenerator.cs diff --git a/crypto/src/crypto/prng/ReversedWindowGenerator.cs b/src/BouncyCastle/crypto/prng/ReversedWindowGenerator.cs similarity index 100% rename from crypto/src/crypto/prng/ReversedWindowGenerator.cs rename to src/BouncyCastle/crypto/prng/ReversedWindowGenerator.cs diff --git a/crypto/src/crypto/prng/SP800SecureRandom.cs b/src/BouncyCastle/crypto/prng/SP800SecureRandom.cs similarity index 100% rename from crypto/src/crypto/prng/SP800SecureRandom.cs rename to src/BouncyCastle/crypto/prng/SP800SecureRandom.cs diff --git a/crypto/src/crypto/prng/SP800SecureRandomBuilder.cs b/src/BouncyCastle/crypto/prng/SP800SecureRandomBuilder.cs similarity index 100% rename from crypto/src/crypto/prng/SP800SecureRandomBuilder.cs rename to src/BouncyCastle/crypto/prng/SP800SecureRandomBuilder.cs diff --git a/crypto/src/crypto/prng/ThreadedSeedGenerator.cs b/src/BouncyCastle/crypto/prng/ThreadedSeedGenerator.cs similarity index 100% rename from crypto/src/crypto/prng/ThreadedSeedGenerator.cs rename to src/BouncyCastle/crypto/prng/ThreadedSeedGenerator.cs diff --git a/crypto/src/crypto/prng/VMPCRandomGenerator.cs b/src/BouncyCastle/crypto/prng/VMPCRandomGenerator.cs similarity index 100% rename from crypto/src/crypto/prng/VMPCRandomGenerator.cs rename to src/BouncyCastle/crypto/prng/VMPCRandomGenerator.cs diff --git a/crypto/src/crypto/prng/X931Rng.cs b/src/BouncyCastle/crypto/prng/X931Rng.cs similarity index 100% rename from crypto/src/crypto/prng/X931Rng.cs rename to src/BouncyCastle/crypto/prng/X931Rng.cs diff --git a/crypto/src/crypto/prng/X931SecureRandom.cs b/src/BouncyCastle/crypto/prng/X931SecureRandom.cs similarity index 100% rename from crypto/src/crypto/prng/X931SecureRandom.cs rename to src/BouncyCastle/crypto/prng/X931SecureRandom.cs diff --git a/crypto/src/crypto/prng/X931SecureRandomBuilder.cs b/src/BouncyCastle/crypto/prng/X931SecureRandomBuilder.cs similarity index 100% rename from crypto/src/crypto/prng/X931SecureRandomBuilder.cs rename to src/BouncyCastle/crypto/prng/X931SecureRandomBuilder.cs diff --git a/crypto/src/crypto/prng/drbg/CtrSP800Drbg.cs b/src/BouncyCastle/crypto/prng/drbg/CtrSP800Drbg.cs similarity index 100% rename from crypto/src/crypto/prng/drbg/CtrSP800Drbg.cs rename to src/BouncyCastle/crypto/prng/drbg/CtrSP800Drbg.cs diff --git a/crypto/src/crypto/prng/drbg/DrbgUtilities.cs b/src/BouncyCastle/crypto/prng/drbg/DrbgUtilities.cs similarity index 100% rename from crypto/src/crypto/prng/drbg/DrbgUtilities.cs rename to src/BouncyCastle/crypto/prng/drbg/DrbgUtilities.cs diff --git a/crypto/src/crypto/prng/drbg/HMacSP800Drbg.cs b/src/BouncyCastle/crypto/prng/drbg/HMacSP800Drbg.cs similarity index 100% rename from crypto/src/crypto/prng/drbg/HMacSP800Drbg.cs rename to src/BouncyCastle/crypto/prng/drbg/HMacSP800Drbg.cs diff --git a/crypto/src/crypto/prng/drbg/HashSP800Drbg.cs b/src/BouncyCastle/crypto/prng/drbg/HashSP800Drbg.cs similarity index 100% rename from crypto/src/crypto/prng/drbg/HashSP800Drbg.cs rename to src/BouncyCastle/crypto/prng/drbg/HashSP800Drbg.cs diff --git a/crypto/src/crypto/prng/drbg/ISP80090Drbg.cs b/src/BouncyCastle/crypto/prng/drbg/ISP80090Drbg.cs similarity index 100% rename from crypto/src/crypto/prng/drbg/ISP80090Drbg.cs rename to src/BouncyCastle/crypto/prng/drbg/ISP80090Drbg.cs diff --git a/crypto/src/crypto/signers/DsaDigestSigner.cs b/src/BouncyCastle/crypto/signers/DsaDigestSigner.cs similarity index 100% rename from crypto/src/crypto/signers/DsaDigestSigner.cs rename to src/BouncyCastle/crypto/signers/DsaDigestSigner.cs diff --git a/crypto/src/crypto/signers/DsaSigner.cs b/src/BouncyCastle/crypto/signers/DsaSigner.cs similarity index 100% rename from crypto/src/crypto/signers/DsaSigner.cs rename to src/BouncyCastle/crypto/signers/DsaSigner.cs diff --git a/crypto/src/crypto/signers/ECDsaSigner.cs b/src/BouncyCastle/crypto/signers/ECDsaSigner.cs similarity index 100% rename from crypto/src/crypto/signers/ECDsaSigner.cs rename to src/BouncyCastle/crypto/signers/ECDsaSigner.cs diff --git a/crypto/src/crypto/signers/ECGOST3410Signer.cs b/src/BouncyCastle/crypto/signers/ECGOST3410Signer.cs similarity index 100% rename from crypto/src/crypto/signers/ECGOST3410Signer.cs rename to src/BouncyCastle/crypto/signers/ECGOST3410Signer.cs diff --git a/crypto/src/crypto/signers/ECNRSigner.cs b/src/BouncyCastle/crypto/signers/ECNRSigner.cs similarity index 100% rename from crypto/src/crypto/signers/ECNRSigner.cs rename to src/BouncyCastle/crypto/signers/ECNRSigner.cs diff --git a/crypto/src/crypto/signers/Ed25519Signer.cs b/src/BouncyCastle/crypto/signers/Ed25519Signer.cs similarity index 100% rename from crypto/src/crypto/signers/Ed25519Signer.cs rename to src/BouncyCastle/crypto/signers/Ed25519Signer.cs diff --git a/crypto/src/crypto/signers/Ed25519ctxSigner.cs b/src/BouncyCastle/crypto/signers/Ed25519ctxSigner.cs similarity index 100% rename from crypto/src/crypto/signers/Ed25519ctxSigner.cs rename to src/BouncyCastle/crypto/signers/Ed25519ctxSigner.cs diff --git a/crypto/src/crypto/signers/Ed25519phSigner.cs b/src/BouncyCastle/crypto/signers/Ed25519phSigner.cs similarity index 100% rename from crypto/src/crypto/signers/Ed25519phSigner.cs rename to src/BouncyCastle/crypto/signers/Ed25519phSigner.cs diff --git a/crypto/src/crypto/signers/Ed448Signer.cs b/src/BouncyCastle/crypto/signers/Ed448Signer.cs similarity index 100% rename from crypto/src/crypto/signers/Ed448Signer.cs rename to src/BouncyCastle/crypto/signers/Ed448Signer.cs diff --git a/crypto/src/crypto/signers/Ed448phSigner.cs b/src/BouncyCastle/crypto/signers/Ed448phSigner.cs similarity index 100% rename from crypto/src/crypto/signers/Ed448phSigner.cs rename to src/BouncyCastle/crypto/signers/Ed448phSigner.cs diff --git a/crypto/src/crypto/signers/GOST3410DigestSigner.cs b/src/BouncyCastle/crypto/signers/GOST3410DigestSigner.cs similarity index 100% rename from crypto/src/crypto/signers/GOST3410DigestSigner.cs rename to src/BouncyCastle/crypto/signers/GOST3410DigestSigner.cs diff --git a/crypto/src/crypto/signers/GOST3410Signer.cs b/src/BouncyCastle/crypto/signers/GOST3410Signer.cs similarity index 100% rename from crypto/src/crypto/signers/GOST3410Signer.cs rename to src/BouncyCastle/crypto/signers/GOST3410Signer.cs diff --git a/crypto/src/crypto/signers/GenericSigner.cs b/src/BouncyCastle/crypto/signers/GenericSigner.cs similarity index 100% rename from crypto/src/crypto/signers/GenericSigner.cs rename to src/BouncyCastle/crypto/signers/GenericSigner.cs diff --git a/crypto/src/crypto/signers/HMacDsaKCalculator.cs b/src/BouncyCastle/crypto/signers/HMacDsaKCalculator.cs similarity index 100% rename from crypto/src/crypto/signers/HMacDsaKCalculator.cs rename to src/BouncyCastle/crypto/signers/HMacDsaKCalculator.cs diff --git a/crypto/src/crypto/signers/IDsaEncoding.cs b/src/BouncyCastle/crypto/signers/IDsaEncoding.cs similarity index 100% rename from crypto/src/crypto/signers/IDsaEncoding.cs rename to src/BouncyCastle/crypto/signers/IDsaEncoding.cs diff --git a/crypto/src/crypto/signers/IDsaKCalculator.cs b/src/BouncyCastle/crypto/signers/IDsaKCalculator.cs similarity index 100% rename from crypto/src/crypto/signers/IDsaKCalculator.cs rename to src/BouncyCastle/crypto/signers/IDsaKCalculator.cs diff --git a/crypto/src/crypto/signers/Iso9796d2PssSigner.cs b/src/BouncyCastle/crypto/signers/Iso9796d2PssSigner.cs similarity index 100% rename from crypto/src/crypto/signers/Iso9796d2PssSigner.cs rename to src/BouncyCastle/crypto/signers/Iso9796d2PssSigner.cs diff --git a/crypto/src/crypto/signers/Iso9796d2Signer.cs b/src/BouncyCastle/crypto/signers/Iso9796d2Signer.cs similarity index 100% rename from crypto/src/crypto/signers/Iso9796d2Signer.cs rename to src/BouncyCastle/crypto/signers/Iso9796d2Signer.cs diff --git a/crypto/src/crypto/signers/IsoTrailers.cs b/src/BouncyCastle/crypto/signers/IsoTrailers.cs similarity index 100% rename from crypto/src/crypto/signers/IsoTrailers.cs rename to src/BouncyCastle/crypto/signers/IsoTrailers.cs diff --git a/crypto/src/crypto/signers/PlainDsaEncoding.cs b/src/BouncyCastle/crypto/signers/PlainDsaEncoding.cs similarity index 100% rename from crypto/src/crypto/signers/PlainDsaEncoding.cs rename to src/BouncyCastle/crypto/signers/PlainDsaEncoding.cs diff --git a/crypto/src/crypto/signers/PssSigner.cs b/src/BouncyCastle/crypto/signers/PssSigner.cs similarity index 100% rename from crypto/src/crypto/signers/PssSigner.cs rename to src/BouncyCastle/crypto/signers/PssSigner.cs diff --git a/crypto/src/crypto/signers/RandomDsaKCalculator.cs b/src/BouncyCastle/crypto/signers/RandomDsaKCalculator.cs similarity index 100% rename from crypto/src/crypto/signers/RandomDsaKCalculator.cs rename to src/BouncyCastle/crypto/signers/RandomDsaKCalculator.cs diff --git a/crypto/src/crypto/signers/RsaDigestSigner.cs b/src/BouncyCastle/crypto/signers/RsaDigestSigner.cs similarity index 100% rename from crypto/src/crypto/signers/RsaDigestSigner.cs rename to src/BouncyCastle/crypto/signers/RsaDigestSigner.cs diff --git a/crypto/src/crypto/signers/SM2Signer.cs b/src/BouncyCastle/crypto/signers/SM2Signer.cs similarity index 100% rename from crypto/src/crypto/signers/SM2Signer.cs rename to src/BouncyCastle/crypto/signers/SM2Signer.cs diff --git a/crypto/src/crypto/signers/StandardDsaEncoding.cs b/src/BouncyCastle/crypto/signers/StandardDsaEncoding.cs similarity index 100% rename from crypto/src/crypto/signers/StandardDsaEncoding.cs rename to src/BouncyCastle/crypto/signers/StandardDsaEncoding.cs diff --git a/crypto/src/crypto/signers/X931Signer.cs b/src/BouncyCastle/crypto/signers/X931Signer.cs similarity index 100% rename from crypto/src/crypto/signers/X931Signer.cs rename to src/BouncyCastle/crypto/signers/X931Signer.cs diff --git a/crypto/src/crypto/tls/AbstractTlsAgreementCredentials.cs b/src/BouncyCastle/crypto/tls/AbstractTlsAgreementCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsAgreementCredentials.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsAgreementCredentials.cs diff --git a/crypto/src/crypto/tls/AbstractTlsCipherFactory.cs b/src/BouncyCastle/crypto/tls/AbstractTlsCipherFactory.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsCipherFactory.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsCipherFactory.cs diff --git a/crypto/src/crypto/tls/AbstractTlsClient.cs b/src/BouncyCastle/crypto/tls/AbstractTlsClient.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsClient.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsClient.cs diff --git a/crypto/src/crypto/tls/AbstractTlsContext.cs b/src/BouncyCastle/crypto/tls/AbstractTlsContext.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsContext.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsContext.cs diff --git a/crypto/src/crypto/tls/AbstractTlsCredentials.cs b/src/BouncyCastle/crypto/tls/AbstractTlsCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsCredentials.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsCredentials.cs diff --git a/crypto/src/crypto/tls/AbstractTlsEncryptionCredentials.cs b/src/BouncyCastle/crypto/tls/AbstractTlsEncryptionCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsEncryptionCredentials.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsEncryptionCredentials.cs diff --git a/crypto/src/crypto/tls/AbstractTlsKeyExchange.cs b/src/BouncyCastle/crypto/tls/AbstractTlsKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsKeyExchange.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsKeyExchange.cs diff --git a/crypto/src/crypto/tls/AbstractTlsPeer.cs b/src/BouncyCastle/crypto/tls/AbstractTlsPeer.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsPeer.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsPeer.cs diff --git a/crypto/src/crypto/tls/AbstractTlsServer.cs b/src/BouncyCastle/crypto/tls/AbstractTlsServer.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsServer.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsServer.cs diff --git a/crypto/src/crypto/tls/AbstractTlsSigner.cs b/src/BouncyCastle/crypto/tls/AbstractTlsSigner.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsSigner.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsSigner.cs diff --git a/crypto/src/crypto/tls/AbstractTlsSignerCredentials.cs b/src/BouncyCastle/crypto/tls/AbstractTlsSignerCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/AbstractTlsSignerCredentials.cs rename to src/BouncyCastle/crypto/tls/AbstractTlsSignerCredentials.cs diff --git a/crypto/src/crypto/tls/AlertDescription.cs b/src/BouncyCastle/crypto/tls/AlertDescription.cs similarity index 100% rename from crypto/src/crypto/tls/AlertDescription.cs rename to src/BouncyCastle/crypto/tls/AlertDescription.cs diff --git a/crypto/src/crypto/tls/AlertLevel.cs b/src/BouncyCastle/crypto/tls/AlertLevel.cs similarity index 100% rename from crypto/src/crypto/tls/AlertLevel.cs rename to src/BouncyCastle/crypto/tls/AlertLevel.cs diff --git a/crypto/src/crypto/tls/BasicTlsPskIdentity.cs b/src/BouncyCastle/crypto/tls/BasicTlsPskIdentity.cs similarity index 100% rename from crypto/src/crypto/tls/BasicTlsPskIdentity.cs rename to src/BouncyCastle/crypto/tls/BasicTlsPskIdentity.cs diff --git a/crypto/src/crypto/tls/BulkCipherAlgorithm.cs b/src/BouncyCastle/crypto/tls/BulkCipherAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/BulkCipherAlgorithm.cs rename to src/BouncyCastle/crypto/tls/BulkCipherAlgorithm.cs diff --git a/crypto/src/crypto/tls/ByteQueue.cs b/src/BouncyCastle/crypto/tls/ByteQueue.cs similarity index 100% rename from crypto/src/crypto/tls/ByteQueue.cs rename to src/BouncyCastle/crypto/tls/ByteQueue.cs diff --git a/crypto/src/crypto/tls/ByteQueueStream.cs b/src/BouncyCastle/crypto/tls/ByteQueueStream.cs similarity index 100% rename from crypto/src/crypto/tls/ByteQueueStream.cs rename to src/BouncyCastle/crypto/tls/ByteQueueStream.cs diff --git a/crypto/src/crypto/tls/CertChainType.cs b/src/BouncyCastle/crypto/tls/CertChainType.cs similarity index 100% rename from crypto/src/crypto/tls/CertChainType.cs rename to src/BouncyCastle/crypto/tls/CertChainType.cs diff --git a/crypto/src/crypto/tls/Certificate.cs b/src/BouncyCastle/crypto/tls/Certificate.cs similarity index 100% rename from crypto/src/crypto/tls/Certificate.cs rename to src/BouncyCastle/crypto/tls/Certificate.cs diff --git a/crypto/src/crypto/tls/CertificateRequest.cs b/src/BouncyCastle/crypto/tls/CertificateRequest.cs similarity index 100% rename from crypto/src/crypto/tls/CertificateRequest.cs rename to src/BouncyCastle/crypto/tls/CertificateRequest.cs diff --git a/crypto/src/crypto/tls/CertificateStatus.cs b/src/BouncyCastle/crypto/tls/CertificateStatus.cs similarity index 100% rename from crypto/src/crypto/tls/CertificateStatus.cs rename to src/BouncyCastle/crypto/tls/CertificateStatus.cs diff --git a/crypto/src/crypto/tls/CertificateStatusRequest.cs b/src/BouncyCastle/crypto/tls/CertificateStatusRequest.cs similarity index 100% rename from crypto/src/crypto/tls/CertificateStatusRequest.cs rename to src/BouncyCastle/crypto/tls/CertificateStatusRequest.cs diff --git a/crypto/src/crypto/tls/CertificateStatusType.cs b/src/BouncyCastle/crypto/tls/CertificateStatusType.cs similarity index 100% rename from crypto/src/crypto/tls/CertificateStatusType.cs rename to src/BouncyCastle/crypto/tls/CertificateStatusType.cs diff --git a/crypto/src/crypto/tls/CertificateType.cs b/src/BouncyCastle/crypto/tls/CertificateType.cs similarity index 100% rename from crypto/src/crypto/tls/CertificateType.cs rename to src/BouncyCastle/crypto/tls/CertificateType.cs diff --git a/crypto/src/crypto/tls/CertificateUrl.cs b/src/BouncyCastle/crypto/tls/CertificateUrl.cs similarity index 100% rename from crypto/src/crypto/tls/CertificateUrl.cs rename to src/BouncyCastle/crypto/tls/CertificateUrl.cs diff --git a/crypto/src/crypto/tls/Chacha20Poly1305.cs b/src/BouncyCastle/crypto/tls/Chacha20Poly1305.cs similarity index 100% rename from crypto/src/crypto/tls/Chacha20Poly1305.cs rename to src/BouncyCastle/crypto/tls/Chacha20Poly1305.cs diff --git a/crypto/src/crypto/tls/ChangeCipherSpec.cs b/src/BouncyCastle/crypto/tls/ChangeCipherSpec.cs similarity index 100% rename from crypto/src/crypto/tls/ChangeCipherSpec.cs rename to src/BouncyCastle/crypto/tls/ChangeCipherSpec.cs diff --git a/crypto/src/crypto/tls/CipherSuite.cs b/src/BouncyCastle/crypto/tls/CipherSuite.cs similarity index 100% rename from crypto/src/crypto/tls/CipherSuite.cs rename to src/BouncyCastle/crypto/tls/CipherSuite.cs diff --git a/crypto/src/crypto/tls/CipherType.cs b/src/BouncyCastle/crypto/tls/CipherType.cs similarity index 100% rename from crypto/src/crypto/tls/CipherType.cs rename to src/BouncyCastle/crypto/tls/CipherType.cs diff --git a/crypto/src/crypto/tls/ClientAuthenticationType.cs b/src/BouncyCastle/crypto/tls/ClientAuthenticationType.cs similarity index 100% rename from crypto/src/crypto/tls/ClientAuthenticationType.cs rename to src/BouncyCastle/crypto/tls/ClientAuthenticationType.cs diff --git a/crypto/src/crypto/tls/ClientCertificateType.cs b/src/BouncyCastle/crypto/tls/ClientCertificateType.cs similarity index 100% rename from crypto/src/crypto/tls/ClientCertificateType.cs rename to src/BouncyCastle/crypto/tls/ClientCertificateType.cs diff --git a/crypto/src/crypto/tls/CombinedHash.cs b/src/BouncyCastle/crypto/tls/CombinedHash.cs similarity index 100% rename from crypto/src/crypto/tls/CombinedHash.cs rename to src/BouncyCastle/crypto/tls/CombinedHash.cs diff --git a/crypto/src/crypto/tls/CompressionMethod.cs b/src/BouncyCastle/crypto/tls/CompressionMethod.cs similarity index 100% rename from crypto/src/crypto/tls/CompressionMethod.cs rename to src/BouncyCastle/crypto/tls/CompressionMethod.cs diff --git a/crypto/src/crypto/tls/ConnectionEnd.cs b/src/BouncyCastle/crypto/tls/ConnectionEnd.cs similarity index 100% rename from crypto/src/crypto/tls/ConnectionEnd.cs rename to src/BouncyCastle/crypto/tls/ConnectionEnd.cs diff --git a/crypto/src/crypto/tls/ContentType.cs b/src/BouncyCastle/crypto/tls/ContentType.cs similarity index 100% rename from crypto/src/crypto/tls/ContentType.cs rename to src/BouncyCastle/crypto/tls/ContentType.cs diff --git a/crypto/src/crypto/tls/DatagramTransport.cs b/src/BouncyCastle/crypto/tls/DatagramTransport.cs similarity index 100% rename from crypto/src/crypto/tls/DatagramTransport.cs rename to src/BouncyCastle/crypto/tls/DatagramTransport.cs diff --git a/crypto/src/crypto/tls/DefaultTlsAgreementCredentials.cs b/src/BouncyCastle/crypto/tls/DefaultTlsAgreementCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsAgreementCredentials.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsAgreementCredentials.cs diff --git a/crypto/src/crypto/tls/DefaultTlsCipherFactory.cs b/src/BouncyCastle/crypto/tls/DefaultTlsCipherFactory.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsCipherFactory.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsCipherFactory.cs diff --git a/crypto/src/crypto/tls/DefaultTlsClient.cs b/src/BouncyCastle/crypto/tls/DefaultTlsClient.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsClient.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsClient.cs diff --git a/crypto/src/crypto/tls/DefaultTlsDHVerifier.cs b/src/BouncyCastle/crypto/tls/DefaultTlsDHVerifier.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsDHVerifier.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsDHVerifier.cs diff --git a/crypto/src/crypto/tls/DefaultTlsEncryptionCredentials.cs b/src/BouncyCastle/crypto/tls/DefaultTlsEncryptionCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsEncryptionCredentials.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsEncryptionCredentials.cs diff --git a/crypto/src/crypto/tls/DefaultTlsServer.cs b/src/BouncyCastle/crypto/tls/DefaultTlsServer.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsServer.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsServer.cs diff --git a/crypto/src/crypto/tls/DefaultTlsSignerCredentials.cs b/src/BouncyCastle/crypto/tls/DefaultTlsSignerCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsSignerCredentials.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsSignerCredentials.cs diff --git a/crypto/src/crypto/tls/DefaultTlsSrpGroupVerifier.cs b/src/BouncyCastle/crypto/tls/DefaultTlsSrpGroupVerifier.cs similarity index 100% rename from crypto/src/crypto/tls/DefaultTlsSrpGroupVerifier.cs rename to src/BouncyCastle/crypto/tls/DefaultTlsSrpGroupVerifier.cs diff --git a/crypto/src/crypto/tls/DeferredHash.cs b/src/BouncyCastle/crypto/tls/DeferredHash.cs similarity index 100% rename from crypto/src/crypto/tls/DeferredHash.cs rename to src/BouncyCastle/crypto/tls/DeferredHash.cs diff --git a/crypto/src/crypto/tls/DigestInputBuffer.cs b/src/BouncyCastle/crypto/tls/DigestInputBuffer.cs similarity index 100% rename from crypto/src/crypto/tls/DigestInputBuffer.cs rename to src/BouncyCastle/crypto/tls/DigestInputBuffer.cs diff --git a/crypto/src/crypto/tls/DigitallySigned.cs b/src/BouncyCastle/crypto/tls/DigitallySigned.cs similarity index 100% rename from crypto/src/crypto/tls/DigitallySigned.cs rename to src/BouncyCastle/crypto/tls/DigitallySigned.cs diff --git a/crypto/src/crypto/tls/DtlsClientProtocol.cs b/src/BouncyCastle/crypto/tls/DtlsClientProtocol.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsClientProtocol.cs rename to src/BouncyCastle/crypto/tls/DtlsClientProtocol.cs diff --git a/crypto/src/crypto/tls/DtlsEpoch.cs b/src/BouncyCastle/crypto/tls/DtlsEpoch.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsEpoch.cs rename to src/BouncyCastle/crypto/tls/DtlsEpoch.cs diff --git a/crypto/src/crypto/tls/DtlsHandshakeRetransmit.cs b/src/BouncyCastle/crypto/tls/DtlsHandshakeRetransmit.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsHandshakeRetransmit.cs rename to src/BouncyCastle/crypto/tls/DtlsHandshakeRetransmit.cs diff --git a/crypto/src/crypto/tls/DtlsProtocol.cs b/src/BouncyCastle/crypto/tls/DtlsProtocol.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsProtocol.cs rename to src/BouncyCastle/crypto/tls/DtlsProtocol.cs diff --git a/crypto/src/crypto/tls/DtlsReassembler.cs b/src/BouncyCastle/crypto/tls/DtlsReassembler.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsReassembler.cs rename to src/BouncyCastle/crypto/tls/DtlsReassembler.cs diff --git a/crypto/src/crypto/tls/DtlsRecordLayer.cs b/src/BouncyCastle/crypto/tls/DtlsRecordLayer.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsRecordLayer.cs rename to src/BouncyCastle/crypto/tls/DtlsRecordLayer.cs diff --git a/crypto/src/crypto/tls/DtlsReliableHandshake.cs b/src/BouncyCastle/crypto/tls/DtlsReliableHandshake.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsReliableHandshake.cs rename to src/BouncyCastle/crypto/tls/DtlsReliableHandshake.cs diff --git a/crypto/src/crypto/tls/DtlsReplayWindow.cs b/src/BouncyCastle/crypto/tls/DtlsReplayWindow.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsReplayWindow.cs rename to src/BouncyCastle/crypto/tls/DtlsReplayWindow.cs diff --git a/crypto/src/crypto/tls/DtlsServerProtocol.cs b/src/BouncyCastle/crypto/tls/DtlsServerProtocol.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsServerProtocol.cs rename to src/BouncyCastle/crypto/tls/DtlsServerProtocol.cs diff --git a/crypto/src/crypto/tls/DtlsTransport.cs b/src/BouncyCastle/crypto/tls/DtlsTransport.cs similarity index 100% rename from crypto/src/crypto/tls/DtlsTransport.cs rename to src/BouncyCastle/crypto/tls/DtlsTransport.cs diff --git a/crypto/src/crypto/tls/ECBasisType.cs b/src/BouncyCastle/crypto/tls/ECBasisType.cs similarity index 100% rename from crypto/src/crypto/tls/ECBasisType.cs rename to src/BouncyCastle/crypto/tls/ECBasisType.cs diff --git a/crypto/src/crypto/tls/ECCurveType.cs b/src/BouncyCastle/crypto/tls/ECCurveType.cs similarity index 100% rename from crypto/src/crypto/tls/ECCurveType.cs rename to src/BouncyCastle/crypto/tls/ECCurveType.cs diff --git a/crypto/src/crypto/tls/ECPointFormat.cs b/src/BouncyCastle/crypto/tls/ECPointFormat.cs similarity index 100% rename from crypto/src/crypto/tls/ECPointFormat.cs rename to src/BouncyCastle/crypto/tls/ECPointFormat.cs diff --git a/crypto/src/crypto/tls/EncryptionAlgorithm.cs b/src/BouncyCastle/crypto/tls/EncryptionAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/EncryptionAlgorithm.cs rename to src/BouncyCastle/crypto/tls/EncryptionAlgorithm.cs diff --git a/crypto/src/crypto/tls/ExporterLabel.cs b/src/BouncyCastle/crypto/tls/ExporterLabel.cs similarity index 100% rename from crypto/src/crypto/tls/ExporterLabel.cs rename to src/BouncyCastle/crypto/tls/ExporterLabel.cs diff --git a/crypto/src/crypto/tls/ExtensionType.cs b/src/BouncyCastle/crypto/tls/ExtensionType.cs similarity index 100% rename from crypto/src/crypto/tls/ExtensionType.cs rename to src/BouncyCastle/crypto/tls/ExtensionType.cs diff --git a/crypto/src/crypto/tls/FiniteFieldDheGroup.cs b/src/BouncyCastle/crypto/tls/FiniteFieldDheGroup.cs similarity index 100% rename from crypto/src/crypto/tls/FiniteFieldDheGroup.cs rename to src/BouncyCastle/crypto/tls/FiniteFieldDheGroup.cs diff --git a/crypto/src/crypto/tls/HandshakeType.cs b/src/BouncyCastle/crypto/tls/HandshakeType.cs similarity index 100% rename from crypto/src/crypto/tls/HandshakeType.cs rename to src/BouncyCastle/crypto/tls/HandshakeType.cs diff --git a/crypto/src/crypto/tls/HashAlgorithm.cs b/src/BouncyCastle/crypto/tls/HashAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/HashAlgorithm.cs rename to src/BouncyCastle/crypto/tls/HashAlgorithm.cs diff --git a/crypto/src/crypto/tls/HeartbeatExtension.cs b/src/BouncyCastle/crypto/tls/HeartbeatExtension.cs similarity index 100% rename from crypto/src/crypto/tls/HeartbeatExtension.cs rename to src/BouncyCastle/crypto/tls/HeartbeatExtension.cs diff --git a/crypto/src/crypto/tls/HeartbeatMessage.cs b/src/BouncyCastle/crypto/tls/HeartbeatMessage.cs similarity index 100% rename from crypto/src/crypto/tls/HeartbeatMessage.cs rename to src/BouncyCastle/crypto/tls/HeartbeatMessage.cs diff --git a/crypto/src/crypto/tls/HeartbeatMessageType.cs b/src/BouncyCastle/crypto/tls/HeartbeatMessageType.cs similarity index 100% rename from crypto/src/crypto/tls/HeartbeatMessageType.cs rename to src/BouncyCastle/crypto/tls/HeartbeatMessageType.cs diff --git a/crypto/src/crypto/tls/HeartbeatMode.cs b/src/BouncyCastle/crypto/tls/HeartbeatMode.cs similarity index 100% rename from crypto/src/crypto/tls/HeartbeatMode.cs rename to src/BouncyCastle/crypto/tls/HeartbeatMode.cs diff --git a/crypto/src/crypto/tls/KeyExchangeAlgorithm.cs b/src/BouncyCastle/crypto/tls/KeyExchangeAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/KeyExchangeAlgorithm.cs rename to src/BouncyCastle/crypto/tls/KeyExchangeAlgorithm.cs diff --git a/crypto/src/crypto/tls/MacAlgorithm.cs b/src/BouncyCastle/crypto/tls/MacAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/MacAlgorithm.cs rename to src/BouncyCastle/crypto/tls/MacAlgorithm.cs diff --git a/crypto/src/crypto/tls/MaxFragmentLength.cs b/src/BouncyCastle/crypto/tls/MaxFragmentLength.cs similarity index 100% rename from crypto/src/crypto/tls/MaxFragmentLength.cs rename to src/BouncyCastle/crypto/tls/MaxFragmentLength.cs diff --git a/crypto/src/crypto/tls/NameType.cs b/src/BouncyCastle/crypto/tls/NameType.cs similarity index 100% rename from crypto/src/crypto/tls/NameType.cs rename to src/BouncyCastle/crypto/tls/NameType.cs diff --git a/crypto/src/crypto/tls/NamedCurve.cs b/src/BouncyCastle/crypto/tls/NamedCurve.cs similarity index 100% rename from crypto/src/crypto/tls/NamedCurve.cs rename to src/BouncyCastle/crypto/tls/NamedCurve.cs diff --git a/crypto/src/crypto/tls/NewSessionTicket.cs b/src/BouncyCastle/crypto/tls/NewSessionTicket.cs similarity index 100% rename from crypto/src/crypto/tls/NewSessionTicket.cs rename to src/BouncyCastle/crypto/tls/NewSessionTicket.cs diff --git a/crypto/src/crypto/tls/OcspStatusRequest.cs b/src/BouncyCastle/crypto/tls/OcspStatusRequest.cs similarity index 100% rename from crypto/src/crypto/tls/OcspStatusRequest.cs rename to src/BouncyCastle/crypto/tls/OcspStatusRequest.cs diff --git a/crypto/src/crypto/tls/PrfAlgorithm.cs b/src/BouncyCastle/crypto/tls/PrfAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/PrfAlgorithm.cs rename to src/BouncyCastle/crypto/tls/PrfAlgorithm.cs diff --git a/crypto/src/crypto/tls/ProtocolVersion.cs b/src/BouncyCastle/crypto/tls/ProtocolVersion.cs similarity index 100% rename from crypto/src/crypto/tls/ProtocolVersion.cs rename to src/BouncyCastle/crypto/tls/ProtocolVersion.cs diff --git a/crypto/src/crypto/tls/PskTlsClient.cs b/src/BouncyCastle/crypto/tls/PskTlsClient.cs similarity index 100% rename from crypto/src/crypto/tls/PskTlsClient.cs rename to src/BouncyCastle/crypto/tls/PskTlsClient.cs diff --git a/crypto/src/crypto/tls/PskTlsServer.cs b/src/BouncyCastle/crypto/tls/PskTlsServer.cs similarity index 100% rename from crypto/src/crypto/tls/PskTlsServer.cs rename to src/BouncyCastle/crypto/tls/PskTlsServer.cs diff --git a/crypto/src/crypto/tls/RecordStream.cs b/src/BouncyCastle/crypto/tls/RecordStream.cs similarity index 100% rename from crypto/src/crypto/tls/RecordStream.cs rename to src/BouncyCastle/crypto/tls/RecordStream.cs diff --git a/crypto/src/crypto/tls/SecurityParameters.cs b/src/BouncyCastle/crypto/tls/SecurityParameters.cs similarity index 100% rename from crypto/src/crypto/tls/SecurityParameters.cs rename to src/BouncyCastle/crypto/tls/SecurityParameters.cs diff --git a/crypto/src/crypto/tls/ServerName.cs b/src/BouncyCastle/crypto/tls/ServerName.cs similarity index 100% rename from crypto/src/crypto/tls/ServerName.cs rename to src/BouncyCastle/crypto/tls/ServerName.cs diff --git a/crypto/src/crypto/tls/ServerNameList.cs b/src/BouncyCastle/crypto/tls/ServerNameList.cs similarity index 100% rename from crypto/src/crypto/tls/ServerNameList.cs rename to src/BouncyCastle/crypto/tls/ServerNameList.cs diff --git a/crypto/src/crypto/tls/ServerOnlyTlsAuthentication.cs b/src/BouncyCastle/crypto/tls/ServerOnlyTlsAuthentication.cs similarity index 100% rename from crypto/src/crypto/tls/ServerOnlyTlsAuthentication.cs rename to src/BouncyCastle/crypto/tls/ServerOnlyTlsAuthentication.cs diff --git a/crypto/src/crypto/tls/ServerSrpParams.cs b/src/BouncyCastle/crypto/tls/ServerSrpParams.cs similarity index 100% rename from crypto/src/crypto/tls/ServerSrpParams.cs rename to src/BouncyCastle/crypto/tls/ServerSrpParams.cs diff --git a/crypto/src/crypto/tls/SessionParameters.cs b/src/BouncyCastle/crypto/tls/SessionParameters.cs similarity index 100% rename from crypto/src/crypto/tls/SessionParameters.cs rename to src/BouncyCastle/crypto/tls/SessionParameters.cs diff --git a/crypto/src/crypto/tls/SignatureAlgorithm.cs b/src/BouncyCastle/crypto/tls/SignatureAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/SignatureAlgorithm.cs rename to src/BouncyCastle/crypto/tls/SignatureAlgorithm.cs diff --git a/crypto/src/crypto/tls/SignatureAndHashAlgorithm.cs b/src/BouncyCastle/crypto/tls/SignatureAndHashAlgorithm.cs similarity index 100% rename from crypto/src/crypto/tls/SignatureAndHashAlgorithm.cs rename to src/BouncyCastle/crypto/tls/SignatureAndHashAlgorithm.cs diff --git a/crypto/src/crypto/tls/SignerInputBuffer.cs b/src/BouncyCastle/crypto/tls/SignerInputBuffer.cs similarity index 100% rename from crypto/src/crypto/tls/SignerInputBuffer.cs rename to src/BouncyCastle/crypto/tls/SignerInputBuffer.cs diff --git a/crypto/src/crypto/tls/SimulatedTlsSrpIdentityManager.cs b/src/BouncyCastle/crypto/tls/SimulatedTlsSrpIdentityManager.cs similarity index 100% rename from crypto/src/crypto/tls/SimulatedTlsSrpIdentityManager.cs rename to src/BouncyCastle/crypto/tls/SimulatedTlsSrpIdentityManager.cs diff --git a/crypto/src/crypto/tls/SrpTlsClient.cs b/src/BouncyCastle/crypto/tls/SrpTlsClient.cs similarity index 100% rename from crypto/src/crypto/tls/SrpTlsClient.cs rename to src/BouncyCastle/crypto/tls/SrpTlsClient.cs diff --git a/crypto/src/crypto/tls/SrpTlsServer.cs b/src/BouncyCastle/crypto/tls/SrpTlsServer.cs similarity index 100% rename from crypto/src/crypto/tls/SrpTlsServer.cs rename to src/BouncyCastle/crypto/tls/SrpTlsServer.cs diff --git a/crypto/src/crypto/tls/SrtpProtectionProfile.cs b/src/BouncyCastle/crypto/tls/SrtpProtectionProfile.cs similarity index 100% rename from crypto/src/crypto/tls/SrtpProtectionProfile.cs rename to src/BouncyCastle/crypto/tls/SrtpProtectionProfile.cs diff --git a/crypto/src/crypto/tls/Ssl3Mac.cs b/src/BouncyCastle/crypto/tls/Ssl3Mac.cs similarity index 100% rename from crypto/src/crypto/tls/Ssl3Mac.cs rename to src/BouncyCastle/crypto/tls/Ssl3Mac.cs diff --git a/crypto/src/crypto/tls/SupplementalDataEntry.cs b/src/BouncyCastle/crypto/tls/SupplementalDataEntry.cs similarity index 100% rename from crypto/src/crypto/tls/SupplementalDataEntry.cs rename to src/BouncyCastle/crypto/tls/SupplementalDataEntry.cs diff --git a/crypto/src/crypto/tls/SupplementalDataType.cs b/src/BouncyCastle/crypto/tls/SupplementalDataType.cs similarity index 100% rename from crypto/src/crypto/tls/SupplementalDataType.cs rename to src/BouncyCastle/crypto/tls/SupplementalDataType.cs diff --git a/crypto/src/crypto/tls/TlsAeadCipher.cs b/src/BouncyCastle/crypto/tls/TlsAeadCipher.cs similarity index 100% rename from crypto/src/crypto/tls/TlsAeadCipher.cs rename to src/BouncyCastle/crypto/tls/TlsAeadCipher.cs diff --git a/crypto/src/crypto/tls/TlsAgreementCredentials.cs b/src/BouncyCastle/crypto/tls/TlsAgreementCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/TlsAgreementCredentials.cs rename to src/BouncyCastle/crypto/tls/TlsAgreementCredentials.cs diff --git a/crypto/src/crypto/tls/TlsAuthentication.cs b/src/BouncyCastle/crypto/tls/TlsAuthentication.cs similarity index 100% rename from crypto/src/crypto/tls/TlsAuthentication.cs rename to src/BouncyCastle/crypto/tls/TlsAuthentication.cs diff --git a/crypto/src/crypto/tls/TlsBlockCipher.cs b/src/BouncyCastle/crypto/tls/TlsBlockCipher.cs similarity index 100% rename from crypto/src/crypto/tls/TlsBlockCipher.cs rename to src/BouncyCastle/crypto/tls/TlsBlockCipher.cs diff --git a/crypto/src/crypto/tls/TlsCipher.cs b/src/BouncyCastle/crypto/tls/TlsCipher.cs similarity index 100% rename from crypto/src/crypto/tls/TlsCipher.cs rename to src/BouncyCastle/crypto/tls/TlsCipher.cs diff --git a/crypto/src/crypto/tls/TlsCipherFactory.cs b/src/BouncyCastle/crypto/tls/TlsCipherFactory.cs similarity index 100% rename from crypto/src/crypto/tls/TlsCipherFactory.cs rename to src/BouncyCastle/crypto/tls/TlsCipherFactory.cs diff --git a/crypto/src/crypto/tls/TlsClient.cs b/src/BouncyCastle/crypto/tls/TlsClient.cs similarity index 100% rename from crypto/src/crypto/tls/TlsClient.cs rename to src/BouncyCastle/crypto/tls/TlsClient.cs diff --git a/crypto/src/crypto/tls/TlsClientContext.cs b/src/BouncyCastle/crypto/tls/TlsClientContext.cs similarity index 100% rename from crypto/src/crypto/tls/TlsClientContext.cs rename to src/BouncyCastle/crypto/tls/TlsClientContext.cs diff --git a/crypto/src/crypto/tls/TlsClientContextImpl.cs b/src/BouncyCastle/crypto/tls/TlsClientContextImpl.cs similarity index 100% rename from crypto/src/crypto/tls/TlsClientContextImpl.cs rename to src/BouncyCastle/crypto/tls/TlsClientContextImpl.cs diff --git a/crypto/src/crypto/tls/TlsClientProtocol.cs b/src/BouncyCastle/crypto/tls/TlsClientProtocol.cs similarity index 100% rename from crypto/src/crypto/tls/TlsClientProtocol.cs rename to src/BouncyCastle/crypto/tls/TlsClientProtocol.cs diff --git a/crypto/src/crypto/tls/TlsCompression.cs b/src/BouncyCastle/crypto/tls/TlsCompression.cs similarity index 100% rename from crypto/src/crypto/tls/TlsCompression.cs rename to src/BouncyCastle/crypto/tls/TlsCompression.cs diff --git a/crypto/src/crypto/tls/TlsContext.cs b/src/BouncyCastle/crypto/tls/TlsContext.cs similarity index 100% rename from crypto/src/crypto/tls/TlsContext.cs rename to src/BouncyCastle/crypto/tls/TlsContext.cs diff --git a/crypto/src/crypto/tls/TlsCredentials.cs b/src/BouncyCastle/crypto/tls/TlsCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/TlsCredentials.cs rename to src/BouncyCastle/crypto/tls/TlsCredentials.cs diff --git a/crypto/src/crypto/tls/TlsDHKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsDHKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsDHKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsDHKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsDHUtilities.cs b/src/BouncyCastle/crypto/tls/TlsDHUtilities.cs similarity index 100% rename from crypto/src/crypto/tls/TlsDHUtilities.cs rename to src/BouncyCastle/crypto/tls/TlsDHUtilities.cs diff --git a/crypto/src/crypto/tls/TlsDHVerifier.cs b/src/BouncyCastle/crypto/tls/TlsDHVerifier.cs similarity index 100% rename from crypto/src/crypto/tls/TlsDHVerifier.cs rename to src/BouncyCastle/crypto/tls/TlsDHVerifier.cs diff --git a/crypto/src/crypto/tls/TlsDeflateCompression.cs b/src/BouncyCastle/crypto/tls/TlsDeflateCompression.cs similarity index 100% rename from crypto/src/crypto/tls/TlsDeflateCompression.cs rename to src/BouncyCastle/crypto/tls/TlsDeflateCompression.cs diff --git a/crypto/src/crypto/tls/TlsDheKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsDheKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsDheKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsDheKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsDsaSigner.cs b/src/BouncyCastle/crypto/tls/TlsDsaSigner.cs similarity index 100% rename from crypto/src/crypto/tls/TlsDsaSigner.cs rename to src/BouncyCastle/crypto/tls/TlsDsaSigner.cs diff --git a/crypto/src/crypto/tls/TlsDssSigner.cs b/src/BouncyCastle/crypto/tls/TlsDssSigner.cs similarity index 100% rename from crypto/src/crypto/tls/TlsDssSigner.cs rename to src/BouncyCastle/crypto/tls/TlsDssSigner.cs diff --git a/crypto/src/crypto/tls/TlsECDHKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsECDHKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsECDHKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsECDHKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsECDheKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsECDheKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsECDheKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsECDheKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsECDsaSigner.cs b/src/BouncyCastle/crypto/tls/TlsECDsaSigner.cs similarity index 100% rename from crypto/src/crypto/tls/TlsECDsaSigner.cs rename to src/BouncyCastle/crypto/tls/TlsECDsaSigner.cs diff --git a/crypto/src/crypto/tls/TlsEccUtilities.cs b/src/BouncyCastle/crypto/tls/TlsEccUtilities.cs similarity index 100% rename from crypto/src/crypto/tls/TlsEccUtilities.cs rename to src/BouncyCastle/crypto/tls/TlsEccUtilities.cs diff --git a/crypto/src/crypto/tls/TlsEncryptionCredentials.cs b/src/BouncyCastle/crypto/tls/TlsEncryptionCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/TlsEncryptionCredentials.cs rename to src/BouncyCastle/crypto/tls/TlsEncryptionCredentials.cs diff --git a/crypto/src/crypto/tls/TlsException.cs b/src/BouncyCastle/crypto/tls/TlsException.cs similarity index 100% rename from crypto/src/crypto/tls/TlsException.cs rename to src/BouncyCastle/crypto/tls/TlsException.cs diff --git a/crypto/src/crypto/tls/TlsExtensionsUtilities.cs b/src/BouncyCastle/crypto/tls/TlsExtensionsUtilities.cs similarity index 100% rename from crypto/src/crypto/tls/TlsExtensionsUtilities.cs rename to src/BouncyCastle/crypto/tls/TlsExtensionsUtilities.cs diff --git a/crypto/src/crypto/tls/TlsFatalAlert.cs b/src/BouncyCastle/crypto/tls/TlsFatalAlert.cs similarity index 100% rename from crypto/src/crypto/tls/TlsFatalAlert.cs rename to src/BouncyCastle/crypto/tls/TlsFatalAlert.cs diff --git a/crypto/src/crypto/tls/TlsFatalAlertReceived.cs b/src/BouncyCastle/crypto/tls/TlsFatalAlertReceived.cs similarity index 100% rename from crypto/src/crypto/tls/TlsFatalAlertReceived.cs rename to src/BouncyCastle/crypto/tls/TlsFatalAlertReceived.cs diff --git a/crypto/src/crypto/tls/TlsHandshakeHash.cs b/src/BouncyCastle/crypto/tls/TlsHandshakeHash.cs similarity index 100% rename from crypto/src/crypto/tls/TlsHandshakeHash.cs rename to src/BouncyCastle/crypto/tls/TlsHandshakeHash.cs diff --git a/crypto/src/crypto/tls/TlsKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsMac.cs b/src/BouncyCastle/crypto/tls/TlsMac.cs similarity index 100% rename from crypto/src/crypto/tls/TlsMac.cs rename to src/BouncyCastle/crypto/tls/TlsMac.cs diff --git a/crypto/src/crypto/tls/TlsNoCloseNotifyException.cs b/src/BouncyCastle/crypto/tls/TlsNoCloseNotifyException.cs similarity index 100% rename from crypto/src/crypto/tls/TlsNoCloseNotifyException.cs rename to src/BouncyCastle/crypto/tls/TlsNoCloseNotifyException.cs diff --git a/crypto/src/crypto/tls/TlsNullCipher.cs b/src/BouncyCastle/crypto/tls/TlsNullCipher.cs similarity index 100% rename from crypto/src/crypto/tls/TlsNullCipher.cs rename to src/BouncyCastle/crypto/tls/TlsNullCipher.cs diff --git a/crypto/src/crypto/tls/TlsNullCompression.cs b/src/BouncyCastle/crypto/tls/TlsNullCompression.cs similarity index 100% rename from crypto/src/crypto/tls/TlsNullCompression.cs rename to src/BouncyCastle/crypto/tls/TlsNullCompression.cs diff --git a/crypto/src/crypto/tls/TlsPeer.cs b/src/BouncyCastle/crypto/tls/TlsPeer.cs similarity index 100% rename from crypto/src/crypto/tls/TlsPeer.cs rename to src/BouncyCastle/crypto/tls/TlsPeer.cs diff --git a/crypto/src/crypto/tls/TlsProtocol.cs b/src/BouncyCastle/crypto/tls/TlsProtocol.cs similarity index 100% rename from crypto/src/crypto/tls/TlsProtocol.cs rename to src/BouncyCastle/crypto/tls/TlsProtocol.cs diff --git a/crypto/src/crypto/tls/TlsProtocolHandler.cs b/src/BouncyCastle/crypto/tls/TlsProtocolHandler.cs similarity index 100% rename from crypto/src/crypto/tls/TlsProtocolHandler.cs rename to src/BouncyCastle/crypto/tls/TlsProtocolHandler.cs diff --git a/crypto/src/crypto/tls/TlsPskIdentity.cs b/src/BouncyCastle/crypto/tls/TlsPskIdentity.cs similarity index 100% rename from crypto/src/crypto/tls/TlsPskIdentity.cs rename to src/BouncyCastle/crypto/tls/TlsPskIdentity.cs diff --git a/crypto/src/crypto/tls/TlsPskIdentityManager.cs b/src/BouncyCastle/crypto/tls/TlsPskIdentityManager.cs similarity index 100% rename from crypto/src/crypto/tls/TlsPskIdentityManager.cs rename to src/BouncyCastle/crypto/tls/TlsPskIdentityManager.cs diff --git a/crypto/src/crypto/tls/TlsPskKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsPskKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsPskKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsPskKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsRsaKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsRsaKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsRsaKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsRsaKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsRsaSigner.cs b/src/BouncyCastle/crypto/tls/TlsRsaSigner.cs similarity index 100% rename from crypto/src/crypto/tls/TlsRsaSigner.cs rename to src/BouncyCastle/crypto/tls/TlsRsaSigner.cs diff --git a/crypto/src/crypto/tls/TlsRsaUtilities.cs b/src/BouncyCastle/crypto/tls/TlsRsaUtilities.cs similarity index 100% rename from crypto/src/crypto/tls/TlsRsaUtilities.cs rename to src/BouncyCastle/crypto/tls/TlsRsaUtilities.cs diff --git a/crypto/src/crypto/tls/TlsServer.cs b/src/BouncyCastle/crypto/tls/TlsServer.cs similarity index 100% rename from crypto/src/crypto/tls/TlsServer.cs rename to src/BouncyCastle/crypto/tls/TlsServer.cs diff --git a/crypto/src/crypto/tls/TlsServerContext.cs b/src/BouncyCastle/crypto/tls/TlsServerContext.cs similarity index 100% rename from crypto/src/crypto/tls/TlsServerContext.cs rename to src/BouncyCastle/crypto/tls/TlsServerContext.cs diff --git a/crypto/src/crypto/tls/TlsServerContextImpl.cs b/src/BouncyCastle/crypto/tls/TlsServerContextImpl.cs similarity index 100% rename from crypto/src/crypto/tls/TlsServerContextImpl.cs rename to src/BouncyCastle/crypto/tls/TlsServerContextImpl.cs diff --git a/crypto/src/crypto/tls/TlsServerProtocol.cs b/src/BouncyCastle/crypto/tls/TlsServerProtocol.cs similarity index 100% rename from crypto/src/crypto/tls/TlsServerProtocol.cs rename to src/BouncyCastle/crypto/tls/TlsServerProtocol.cs diff --git a/crypto/src/crypto/tls/TlsSession.cs b/src/BouncyCastle/crypto/tls/TlsSession.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSession.cs rename to src/BouncyCastle/crypto/tls/TlsSession.cs diff --git a/crypto/src/crypto/tls/TlsSessionImpl.cs b/src/BouncyCastle/crypto/tls/TlsSessionImpl.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSessionImpl.cs rename to src/BouncyCastle/crypto/tls/TlsSessionImpl.cs diff --git a/crypto/src/crypto/tls/TlsSigner.cs b/src/BouncyCastle/crypto/tls/TlsSigner.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSigner.cs rename to src/BouncyCastle/crypto/tls/TlsSigner.cs diff --git a/crypto/src/crypto/tls/TlsSignerCredentials.cs b/src/BouncyCastle/crypto/tls/TlsSignerCredentials.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSignerCredentials.cs rename to src/BouncyCastle/crypto/tls/TlsSignerCredentials.cs diff --git a/crypto/src/crypto/tls/TlsSrpGroupVerifier.cs b/src/BouncyCastle/crypto/tls/TlsSrpGroupVerifier.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSrpGroupVerifier.cs rename to src/BouncyCastle/crypto/tls/TlsSrpGroupVerifier.cs diff --git a/crypto/src/crypto/tls/TlsSrpIdentityManager.cs b/src/BouncyCastle/crypto/tls/TlsSrpIdentityManager.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSrpIdentityManager.cs rename to src/BouncyCastle/crypto/tls/TlsSrpIdentityManager.cs diff --git a/crypto/src/crypto/tls/TlsSrpKeyExchange.cs b/src/BouncyCastle/crypto/tls/TlsSrpKeyExchange.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSrpKeyExchange.cs rename to src/BouncyCastle/crypto/tls/TlsSrpKeyExchange.cs diff --git a/crypto/src/crypto/tls/TlsSrpLoginParameters.cs b/src/BouncyCastle/crypto/tls/TlsSrpLoginParameters.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSrpLoginParameters.cs rename to src/BouncyCastle/crypto/tls/TlsSrpLoginParameters.cs diff --git a/crypto/src/crypto/tls/TlsSrpUtilities.cs b/src/BouncyCastle/crypto/tls/TlsSrpUtilities.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSrpUtilities.cs rename to src/BouncyCastle/crypto/tls/TlsSrpUtilities.cs diff --git a/crypto/src/crypto/tls/TlsSrtpUtilities.cs b/src/BouncyCastle/crypto/tls/TlsSrtpUtilities.cs similarity index 100% rename from crypto/src/crypto/tls/TlsSrtpUtilities.cs rename to src/BouncyCastle/crypto/tls/TlsSrtpUtilities.cs diff --git a/crypto/src/crypto/tls/TlsStream.cs b/src/BouncyCastle/crypto/tls/TlsStream.cs similarity index 100% rename from crypto/src/crypto/tls/TlsStream.cs rename to src/BouncyCastle/crypto/tls/TlsStream.cs diff --git a/crypto/src/crypto/tls/TlsStreamCipher.cs b/src/BouncyCastle/crypto/tls/TlsStreamCipher.cs similarity index 100% rename from crypto/src/crypto/tls/TlsStreamCipher.cs rename to src/BouncyCastle/crypto/tls/TlsStreamCipher.cs diff --git a/crypto/src/crypto/tls/TlsUtilities.cs b/src/BouncyCastle/crypto/tls/TlsUtilities.cs similarity index 100% rename from crypto/src/crypto/tls/TlsUtilities.cs rename to src/BouncyCastle/crypto/tls/TlsUtilities.cs diff --git a/crypto/src/crypto/tls/UrlAndHash.cs b/src/BouncyCastle/crypto/tls/UrlAndHash.cs similarity index 100% rename from crypto/src/crypto/tls/UrlAndHash.cs rename to src/BouncyCastle/crypto/tls/UrlAndHash.cs diff --git a/crypto/src/crypto/tls/UseSrtpData.cs b/src/BouncyCastle/crypto/tls/UseSrtpData.cs similarity index 100% rename from crypto/src/crypto/tls/UseSrtpData.cs rename to src/BouncyCastle/crypto/tls/UseSrtpData.cs diff --git a/crypto/src/crypto/tls/UserMappingType.cs b/src/BouncyCastle/crypto/tls/UserMappingType.cs similarity index 100% rename from crypto/src/crypto/tls/UserMappingType.cs rename to src/BouncyCastle/crypto/tls/UserMappingType.cs diff --git a/crypto/src/crypto/util/Pack.cs b/src/BouncyCastle/crypto/util/Pack.cs similarity index 100% rename from crypto/src/crypto/util/Pack.cs rename to src/BouncyCastle/crypto/util/Pack.cs diff --git a/crypto/src/math/BigInteger.cs b/src/BouncyCastle/math/BigInteger.cs similarity index 100% rename from crypto/src/math/BigInteger.cs rename to src/BouncyCastle/math/BigInteger.cs diff --git a/crypto/src/math/Primes.cs b/src/BouncyCastle/math/Primes.cs similarity index 100% rename from crypto/src/math/Primes.cs rename to src/BouncyCastle/math/Primes.cs diff --git a/crypto/src/math/ec/ECAlgorithms.cs b/src/BouncyCastle/math/ec/ECAlgorithms.cs similarity index 100% rename from crypto/src/math/ec/ECAlgorithms.cs rename to src/BouncyCastle/math/ec/ECAlgorithms.cs diff --git a/crypto/src/math/ec/ECCurve.cs b/src/BouncyCastle/math/ec/ECCurve.cs similarity index 100% rename from crypto/src/math/ec/ECCurve.cs rename to src/BouncyCastle/math/ec/ECCurve.cs diff --git a/crypto/src/math/ec/ECFieldElement.cs b/src/BouncyCastle/math/ec/ECFieldElement.cs similarity index 100% rename from crypto/src/math/ec/ECFieldElement.cs rename to src/BouncyCastle/math/ec/ECFieldElement.cs diff --git a/crypto/src/math/ec/ECLookupTable.cs b/src/BouncyCastle/math/ec/ECLookupTable.cs similarity index 100% rename from crypto/src/math/ec/ECLookupTable.cs rename to src/BouncyCastle/math/ec/ECLookupTable.cs diff --git a/crypto/src/math/ec/ECPoint.cs b/src/BouncyCastle/math/ec/ECPoint.cs similarity index 100% rename from crypto/src/math/ec/ECPoint.cs rename to src/BouncyCastle/math/ec/ECPoint.cs diff --git a/crypto/src/math/ec/ECPointMap.cs b/src/BouncyCastle/math/ec/ECPointMap.cs similarity index 100% rename from crypto/src/math/ec/ECPointMap.cs rename to src/BouncyCastle/math/ec/ECPointMap.cs diff --git a/crypto/src/math/ec/LongArray.cs b/src/BouncyCastle/math/ec/LongArray.cs similarity index 100% rename from crypto/src/math/ec/LongArray.cs rename to src/BouncyCastle/math/ec/LongArray.cs diff --git a/crypto/src/math/ec/ScaleXPointMap.cs b/src/BouncyCastle/math/ec/ScaleXPointMap.cs similarity index 100% rename from crypto/src/math/ec/ScaleXPointMap.cs rename to src/BouncyCastle/math/ec/ScaleXPointMap.cs diff --git a/crypto/src/math/ec/ScaleYPointMap.cs b/src/BouncyCastle/math/ec/ScaleYPointMap.cs similarity index 100% rename from crypto/src/math/ec/ScaleYPointMap.cs rename to src/BouncyCastle/math/ec/ScaleYPointMap.cs diff --git a/crypto/src/math/ec/SimpleLookupTable.cs b/src/BouncyCastle/math/ec/SimpleLookupTable.cs similarity index 100% rename from crypto/src/math/ec/SimpleLookupTable.cs rename to src/BouncyCastle/math/ec/SimpleLookupTable.cs diff --git a/crypto/src/math/ec/abc/SimpleBigDecimal.cs b/src/BouncyCastle/math/ec/abc/SimpleBigDecimal.cs similarity index 100% rename from crypto/src/math/ec/abc/SimpleBigDecimal.cs rename to src/BouncyCastle/math/ec/abc/SimpleBigDecimal.cs diff --git a/crypto/src/math/ec/abc/Tnaf.cs b/src/BouncyCastle/math/ec/abc/Tnaf.cs similarity index 100% rename from crypto/src/math/ec/abc/Tnaf.cs rename to src/BouncyCastle/math/ec/abc/Tnaf.cs diff --git a/crypto/src/math/ec/abc/ZTauElement.cs b/src/BouncyCastle/math/ec/abc/ZTauElement.cs similarity index 100% rename from crypto/src/math/ec/abc/ZTauElement.cs rename to src/BouncyCastle/math/ec/abc/ZTauElement.cs diff --git a/crypto/src/math/ec/custom/djb/Curve25519.cs b/src/BouncyCastle/math/ec/custom/djb/Curve25519.cs similarity index 100% rename from crypto/src/math/ec/custom/djb/Curve25519.cs rename to src/BouncyCastle/math/ec/custom/djb/Curve25519.cs diff --git a/crypto/src/math/ec/custom/djb/Curve25519Field.cs b/src/BouncyCastle/math/ec/custom/djb/Curve25519Field.cs similarity index 100% rename from crypto/src/math/ec/custom/djb/Curve25519Field.cs rename to src/BouncyCastle/math/ec/custom/djb/Curve25519Field.cs diff --git a/crypto/src/math/ec/custom/djb/Curve25519FieldElement.cs b/src/BouncyCastle/math/ec/custom/djb/Curve25519FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/djb/Curve25519FieldElement.cs rename to src/BouncyCastle/math/ec/custom/djb/Curve25519FieldElement.cs diff --git a/crypto/src/math/ec/custom/djb/Curve25519Point.cs b/src/BouncyCastle/math/ec/custom/djb/Curve25519Point.cs similarity index 100% rename from crypto/src/math/ec/custom/djb/Curve25519Point.cs rename to src/BouncyCastle/math/ec/custom/djb/Curve25519Point.cs diff --git a/crypto/src/math/ec/custom/gm/SM2P256V1Curve.cs b/src/BouncyCastle/math/ec/custom/gm/SM2P256V1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/gm/SM2P256V1Curve.cs rename to src/BouncyCastle/math/ec/custom/gm/SM2P256V1Curve.cs diff --git a/crypto/src/math/ec/custom/gm/SM2P256V1Field.cs b/src/BouncyCastle/math/ec/custom/gm/SM2P256V1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/gm/SM2P256V1Field.cs rename to src/BouncyCastle/math/ec/custom/gm/SM2P256V1Field.cs diff --git a/crypto/src/math/ec/custom/gm/SM2P256V1FieldElement.cs b/src/BouncyCastle/math/ec/custom/gm/SM2P256V1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/gm/SM2P256V1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/gm/SM2P256V1FieldElement.cs diff --git a/crypto/src/math/ec/custom/gm/SM2P256V1Point.cs b/src/BouncyCastle/math/ec/custom/gm/SM2P256V1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/gm/SM2P256V1Point.cs rename to src/BouncyCastle/math/ec/custom/gm/SM2P256V1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP128R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP128R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP128R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP128R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP128R1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP128R1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP128R1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP128R1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP128R1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP128R1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP128R1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP128R1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP128R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP128R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP128R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP128R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R2Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R2Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R2Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R2Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R2Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R2Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R2Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R2Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R2FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R2FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R2FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R2FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP160R2Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP160R2Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP160R2Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP160R2Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192K1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192K1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192K1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192K1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192K1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192K1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192K1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192R1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192R1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192R1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192R1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192R1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192R1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192R1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP192R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP192R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP192R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP192R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224K1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224K1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224K1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224K1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224K1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224K1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224K1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224R1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224R1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224R1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224R1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224R1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224R1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224R1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP224R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP224R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP224R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP224R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256K1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256K1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256K1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256K1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256K1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256K1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256K1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256R1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256R1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256R1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256R1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256R1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256R1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256R1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP256R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP256R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP256R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP256R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP384R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP384R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP384R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP384R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP384R1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP384R1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP384R1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP384R1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP384R1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP384R1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP384R1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP384R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP384R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP384R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP384R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecP521R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecP521R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP521R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP521R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecP521R1Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecP521R1Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP521R1Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP521R1Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecP521R1FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP521R1FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP521R1FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecP521R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecP521R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecP521R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecP521R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT113Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT113Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT113Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT113Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT113FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT113FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT113FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT113FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT113R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT113R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT113R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT113R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT113R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT113R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT113R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT113R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT113R2Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT113R2Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT113R2Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT113R2Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT113R2Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT113R2Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT113R2Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT113R2Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT131Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT131Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT131Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT131Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT131FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT131FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT131FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT131FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT131R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT131R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT131R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT131R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT131R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT131R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT131R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT131R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT131R2Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT131R2Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT131R2Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT131R2Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT131R2Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT131R2Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT131R2Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT131R2Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163R2Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163R2Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163R2Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163R2Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT163R2Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT163R2Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT163R2Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT163R2Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT193Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT193Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT193Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT193Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT193FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT193FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT193FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT193FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT193R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT193R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT193R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT193R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT193R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT193R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT193R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT193R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT193R2Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT193R2Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT193R2Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT193R2Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT193R2Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT193R2Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT193R2Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT193R2Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT233Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT233Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT233Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT233Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT233FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT233FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT233FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT233FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT233K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT233K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT233K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT233K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT233K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT233K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT233K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT233K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT233R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT233R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT233R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT233R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT233R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT233R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT233R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT233R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT239Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT239Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT239Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT239Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT239FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT239FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT239FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT239FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT239K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT239K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT239K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT239K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT239K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT239K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT239K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT239K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT283Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT283Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT283Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT283Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT283FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT283FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT283FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT283FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT283K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT283K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT283K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT283K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT283K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT283K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT283K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT283K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT283R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT283R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT283R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT283R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT283R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT283R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT283R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT283R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT409Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT409Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT409Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT409Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT409FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT409FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT409FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT409FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT409K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT409K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT409K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT409K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT409K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT409K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT409K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT409K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT409R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT409R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT409R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT409R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT409R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT409R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT409R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT409R1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT571Field.cs b/src/BouncyCastle/math/ec/custom/sec/SecT571Field.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT571Field.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT571Field.cs diff --git a/crypto/src/math/ec/custom/sec/SecT571FieldElement.cs b/src/BouncyCastle/math/ec/custom/sec/SecT571FieldElement.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT571FieldElement.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT571FieldElement.cs diff --git a/crypto/src/math/ec/custom/sec/SecT571K1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT571K1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT571K1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT571K1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT571K1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT571K1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT571K1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT571K1Point.cs diff --git a/crypto/src/math/ec/custom/sec/SecT571R1Curve.cs b/src/BouncyCastle/math/ec/custom/sec/SecT571R1Curve.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT571R1Curve.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT571R1Curve.cs diff --git a/crypto/src/math/ec/custom/sec/SecT571R1Point.cs b/src/BouncyCastle/math/ec/custom/sec/SecT571R1Point.cs similarity index 100% rename from crypto/src/math/ec/custom/sec/SecT571R1Point.cs rename to src/BouncyCastle/math/ec/custom/sec/SecT571R1Point.cs diff --git a/crypto/src/math/ec/endo/ECEndomorphism.cs b/src/BouncyCastle/math/ec/endo/ECEndomorphism.cs similarity index 100% rename from crypto/src/math/ec/endo/ECEndomorphism.cs rename to src/BouncyCastle/math/ec/endo/ECEndomorphism.cs diff --git a/crypto/src/math/ec/endo/GlvEndomorphism.cs b/src/BouncyCastle/math/ec/endo/GlvEndomorphism.cs similarity index 100% rename from crypto/src/math/ec/endo/GlvEndomorphism.cs rename to src/BouncyCastle/math/ec/endo/GlvEndomorphism.cs diff --git a/crypto/src/math/ec/endo/GlvTypeBEndomorphism.cs b/src/BouncyCastle/math/ec/endo/GlvTypeBEndomorphism.cs similarity index 100% rename from crypto/src/math/ec/endo/GlvTypeBEndomorphism.cs rename to src/BouncyCastle/math/ec/endo/GlvTypeBEndomorphism.cs diff --git a/crypto/src/math/ec/endo/GlvTypeBParameters.cs b/src/BouncyCastle/math/ec/endo/GlvTypeBParameters.cs similarity index 100% rename from crypto/src/math/ec/endo/GlvTypeBParameters.cs rename to src/BouncyCastle/math/ec/endo/GlvTypeBParameters.cs diff --git a/crypto/src/math/ec/multiplier/AbstractECMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/AbstractECMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/AbstractECMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/AbstractECMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/DoubleAddMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/DoubleAddMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/DoubleAddMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/DoubleAddMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/ECMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/ECMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/ECMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/ECMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/FixedPointCombMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/FixedPointCombMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/FixedPointCombMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/FixedPointCombMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/FixedPointPreCompInfo.cs b/src/BouncyCastle/math/ec/multiplier/FixedPointPreCompInfo.cs similarity index 100% rename from crypto/src/math/ec/multiplier/FixedPointPreCompInfo.cs rename to src/BouncyCastle/math/ec/multiplier/FixedPointPreCompInfo.cs diff --git a/crypto/src/math/ec/multiplier/FixedPointUtilities.cs b/src/BouncyCastle/math/ec/multiplier/FixedPointUtilities.cs similarity index 100% rename from crypto/src/math/ec/multiplier/FixedPointUtilities.cs rename to src/BouncyCastle/math/ec/multiplier/FixedPointUtilities.cs diff --git a/crypto/src/math/ec/multiplier/GlvMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/GlvMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/GlvMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/GlvMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/IPreCompCallback.cs b/src/BouncyCastle/math/ec/multiplier/IPreCompCallback.cs similarity index 100% rename from crypto/src/math/ec/multiplier/IPreCompCallback.cs rename to src/BouncyCastle/math/ec/multiplier/IPreCompCallback.cs diff --git a/crypto/src/math/ec/multiplier/MixedNafR2LMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/MixedNafR2LMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/MixedNafR2LMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/MixedNafR2LMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/MontgomeryLadderMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/MontgomeryLadderMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/MontgomeryLadderMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/MontgomeryLadderMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/NafL2RMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/NafL2RMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/NafL2RMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/NafL2RMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/NafR2LMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/NafR2LMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/NafR2LMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/NafR2LMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/PreCompInfo.cs b/src/BouncyCastle/math/ec/multiplier/PreCompInfo.cs similarity index 100% rename from crypto/src/math/ec/multiplier/PreCompInfo.cs rename to src/BouncyCastle/math/ec/multiplier/PreCompInfo.cs diff --git a/crypto/src/math/ec/multiplier/ReferenceMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/ReferenceMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/ReferenceMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/ReferenceMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/ValidityPreCompInfo.cs b/src/BouncyCastle/math/ec/multiplier/ValidityPreCompInfo.cs similarity index 100% rename from crypto/src/math/ec/multiplier/ValidityPreCompInfo.cs rename to src/BouncyCastle/math/ec/multiplier/ValidityPreCompInfo.cs diff --git a/crypto/src/math/ec/multiplier/WNafL2RMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/WNafL2RMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/WNafL2RMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/WNafL2RMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/WNafPreCompInfo.cs b/src/BouncyCastle/math/ec/multiplier/WNafPreCompInfo.cs similarity index 100% rename from crypto/src/math/ec/multiplier/WNafPreCompInfo.cs rename to src/BouncyCastle/math/ec/multiplier/WNafPreCompInfo.cs diff --git a/crypto/src/math/ec/multiplier/WNafUtilities.cs b/src/BouncyCastle/math/ec/multiplier/WNafUtilities.cs similarity index 100% rename from crypto/src/math/ec/multiplier/WNafUtilities.cs rename to src/BouncyCastle/math/ec/multiplier/WNafUtilities.cs diff --git a/crypto/src/math/ec/multiplier/WTauNafMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/WTauNafMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/WTauNafMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/WTauNafMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/WTauNafPreCompInfo.cs b/src/BouncyCastle/math/ec/multiplier/WTauNafPreCompInfo.cs similarity index 100% rename from crypto/src/math/ec/multiplier/WTauNafPreCompInfo.cs rename to src/BouncyCastle/math/ec/multiplier/WTauNafPreCompInfo.cs diff --git a/crypto/src/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/ZSignedDigitL2RMultiplier.cs diff --git a/crypto/src/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs b/src/BouncyCastle/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs similarity index 100% rename from crypto/src/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs rename to src/BouncyCastle/math/ec/multiplier/ZSignedDigitR2LMultiplier.cs diff --git a/crypto/src/math/ec/rfc7748/X25519.cs b/src/BouncyCastle/math/ec/rfc7748/X25519.cs similarity index 100% rename from crypto/src/math/ec/rfc7748/X25519.cs rename to src/BouncyCastle/math/ec/rfc7748/X25519.cs diff --git a/crypto/src/math/ec/rfc7748/X25519Field.cs b/src/BouncyCastle/math/ec/rfc7748/X25519Field.cs similarity index 100% rename from crypto/src/math/ec/rfc7748/X25519Field.cs rename to src/BouncyCastle/math/ec/rfc7748/X25519Field.cs diff --git a/crypto/src/math/ec/rfc7748/X448.cs b/src/BouncyCastle/math/ec/rfc7748/X448.cs similarity index 100% rename from crypto/src/math/ec/rfc7748/X448.cs rename to src/BouncyCastle/math/ec/rfc7748/X448.cs diff --git a/crypto/src/math/ec/rfc7748/X448Field.cs b/src/BouncyCastle/math/ec/rfc7748/X448Field.cs similarity index 100% rename from crypto/src/math/ec/rfc7748/X448Field.cs rename to src/BouncyCastle/math/ec/rfc7748/X448Field.cs diff --git a/crypto/src/math/ec/rfc8032/Ed25519.cs b/src/BouncyCastle/math/ec/rfc8032/Ed25519.cs similarity index 100% rename from crypto/src/math/ec/rfc8032/Ed25519.cs rename to src/BouncyCastle/math/ec/rfc8032/Ed25519.cs diff --git a/crypto/src/math/ec/rfc8032/Ed448.cs b/src/BouncyCastle/math/ec/rfc8032/Ed448.cs similarity index 100% rename from crypto/src/math/ec/rfc8032/Ed448.cs rename to src/BouncyCastle/math/ec/rfc8032/Ed448.cs diff --git a/crypto/src/math/field/FiniteFields.cs b/src/BouncyCastle/math/field/FiniteFields.cs similarity index 100% rename from crypto/src/math/field/FiniteFields.cs rename to src/BouncyCastle/math/field/FiniteFields.cs diff --git a/crypto/src/math/field/GF2Polynomial.cs b/src/BouncyCastle/math/field/GF2Polynomial.cs similarity index 100% rename from crypto/src/math/field/GF2Polynomial.cs rename to src/BouncyCastle/math/field/GF2Polynomial.cs diff --git a/crypto/src/math/field/GenericPolynomialExtensionField.cs b/src/BouncyCastle/math/field/GenericPolynomialExtensionField.cs similarity index 100% rename from crypto/src/math/field/GenericPolynomialExtensionField.cs rename to src/BouncyCastle/math/field/GenericPolynomialExtensionField.cs diff --git a/crypto/src/math/field/IExtensionField.cs b/src/BouncyCastle/math/field/IExtensionField.cs similarity index 100% rename from crypto/src/math/field/IExtensionField.cs rename to src/BouncyCastle/math/field/IExtensionField.cs diff --git a/crypto/src/math/field/IFiniteField.cs b/src/BouncyCastle/math/field/IFiniteField.cs similarity index 100% rename from crypto/src/math/field/IFiniteField.cs rename to src/BouncyCastle/math/field/IFiniteField.cs diff --git a/crypto/src/math/field/IPolynomial.cs b/src/BouncyCastle/math/field/IPolynomial.cs similarity index 100% rename from crypto/src/math/field/IPolynomial.cs rename to src/BouncyCastle/math/field/IPolynomial.cs diff --git a/crypto/src/math/field/IPolynomialExtensionField.cs b/src/BouncyCastle/math/field/IPolynomialExtensionField.cs similarity index 100% rename from crypto/src/math/field/IPolynomialExtensionField.cs rename to src/BouncyCastle/math/field/IPolynomialExtensionField.cs diff --git a/crypto/src/math/field/PrimeField.cs b/src/BouncyCastle/math/field/PrimeField.cs similarity index 100% rename from crypto/src/math/field/PrimeField.cs rename to src/BouncyCastle/math/field/PrimeField.cs diff --git a/crypto/src/math/raw/Interleave.cs b/src/BouncyCastle/math/raw/Interleave.cs similarity index 100% rename from crypto/src/math/raw/Interleave.cs rename to src/BouncyCastle/math/raw/Interleave.cs diff --git a/crypto/src/math/raw/Mod.cs b/src/BouncyCastle/math/raw/Mod.cs similarity index 100% rename from crypto/src/math/raw/Mod.cs rename to src/BouncyCastle/math/raw/Mod.cs diff --git a/crypto/src/math/raw/Nat.cs b/src/BouncyCastle/math/raw/Nat.cs similarity index 100% rename from crypto/src/math/raw/Nat.cs rename to src/BouncyCastle/math/raw/Nat.cs diff --git a/crypto/src/math/raw/Nat128.cs b/src/BouncyCastle/math/raw/Nat128.cs similarity index 100% rename from crypto/src/math/raw/Nat128.cs rename to src/BouncyCastle/math/raw/Nat128.cs diff --git a/crypto/src/math/raw/Nat160.cs b/src/BouncyCastle/math/raw/Nat160.cs similarity index 100% rename from crypto/src/math/raw/Nat160.cs rename to src/BouncyCastle/math/raw/Nat160.cs diff --git a/crypto/src/math/raw/Nat192.cs b/src/BouncyCastle/math/raw/Nat192.cs similarity index 100% rename from crypto/src/math/raw/Nat192.cs rename to src/BouncyCastle/math/raw/Nat192.cs diff --git a/crypto/src/math/raw/Nat224.cs b/src/BouncyCastle/math/raw/Nat224.cs similarity index 100% rename from crypto/src/math/raw/Nat224.cs rename to src/BouncyCastle/math/raw/Nat224.cs diff --git a/crypto/src/math/raw/Nat256.cs b/src/BouncyCastle/math/raw/Nat256.cs similarity index 100% rename from crypto/src/math/raw/Nat256.cs rename to src/BouncyCastle/math/raw/Nat256.cs diff --git a/crypto/src/math/raw/Nat320.cs b/src/BouncyCastle/math/raw/Nat320.cs similarity index 100% rename from crypto/src/math/raw/Nat320.cs rename to src/BouncyCastle/math/raw/Nat320.cs diff --git a/crypto/src/math/raw/Nat384.cs b/src/BouncyCastle/math/raw/Nat384.cs similarity index 100% rename from crypto/src/math/raw/Nat384.cs rename to src/BouncyCastle/math/raw/Nat384.cs diff --git a/crypto/src/math/raw/Nat448.cs b/src/BouncyCastle/math/raw/Nat448.cs similarity index 100% rename from crypto/src/math/raw/Nat448.cs rename to src/BouncyCastle/math/raw/Nat448.cs diff --git a/crypto/src/math/raw/Nat512.cs b/src/BouncyCastle/math/raw/Nat512.cs similarity index 100% rename from crypto/src/math/raw/Nat512.cs rename to src/BouncyCastle/math/raw/Nat512.cs diff --git a/crypto/src/math/raw/Nat576.cs b/src/BouncyCastle/math/raw/Nat576.cs similarity index 100% rename from crypto/src/math/raw/Nat576.cs rename to src/BouncyCastle/math/raw/Nat576.cs diff --git a/crypto/src/ocsp/BasicOCSPResp.cs b/src/BouncyCastle/ocsp/BasicOCSPResp.cs similarity index 100% rename from crypto/src/ocsp/BasicOCSPResp.cs rename to src/BouncyCastle/ocsp/BasicOCSPResp.cs diff --git a/crypto/src/ocsp/BasicOCSPRespGenerator.cs b/src/BouncyCastle/ocsp/BasicOCSPRespGenerator.cs similarity index 100% rename from crypto/src/ocsp/BasicOCSPRespGenerator.cs rename to src/BouncyCastle/ocsp/BasicOCSPRespGenerator.cs diff --git a/crypto/src/ocsp/CertificateID.cs b/src/BouncyCastle/ocsp/CertificateID.cs similarity index 100% rename from crypto/src/ocsp/CertificateID.cs rename to src/BouncyCastle/ocsp/CertificateID.cs diff --git a/crypto/src/ocsp/CertificateStatus.cs b/src/BouncyCastle/ocsp/CertificateStatus.cs similarity index 100% rename from crypto/src/ocsp/CertificateStatus.cs rename to src/BouncyCastle/ocsp/CertificateStatus.cs diff --git a/crypto/src/ocsp/OCSPException.cs b/src/BouncyCastle/ocsp/OCSPException.cs similarity index 100% rename from crypto/src/ocsp/OCSPException.cs rename to src/BouncyCastle/ocsp/OCSPException.cs diff --git a/crypto/src/ocsp/OCSPReq.cs b/src/BouncyCastle/ocsp/OCSPReq.cs similarity index 100% rename from crypto/src/ocsp/OCSPReq.cs rename to src/BouncyCastle/ocsp/OCSPReq.cs diff --git a/crypto/src/ocsp/OCSPReqGenerator.cs b/src/BouncyCastle/ocsp/OCSPReqGenerator.cs similarity index 100% rename from crypto/src/ocsp/OCSPReqGenerator.cs rename to src/BouncyCastle/ocsp/OCSPReqGenerator.cs diff --git a/crypto/src/ocsp/OCSPResp.cs b/src/BouncyCastle/ocsp/OCSPResp.cs similarity index 100% rename from crypto/src/ocsp/OCSPResp.cs rename to src/BouncyCastle/ocsp/OCSPResp.cs diff --git a/crypto/src/ocsp/OCSPRespGenerator.cs b/src/BouncyCastle/ocsp/OCSPRespGenerator.cs similarity index 100% rename from crypto/src/ocsp/OCSPRespGenerator.cs rename to src/BouncyCastle/ocsp/OCSPRespGenerator.cs diff --git a/crypto/src/ocsp/OCSPRespStatus.cs b/src/BouncyCastle/ocsp/OCSPRespStatus.cs similarity index 100% rename from crypto/src/ocsp/OCSPRespStatus.cs rename to src/BouncyCastle/ocsp/OCSPRespStatus.cs diff --git a/crypto/src/ocsp/OCSPUtil.cs b/src/BouncyCastle/ocsp/OCSPUtil.cs similarity index 100% rename from crypto/src/ocsp/OCSPUtil.cs rename to src/BouncyCastle/ocsp/OCSPUtil.cs diff --git a/crypto/src/ocsp/Req.cs b/src/BouncyCastle/ocsp/Req.cs similarity index 100% rename from crypto/src/ocsp/Req.cs rename to src/BouncyCastle/ocsp/Req.cs diff --git a/crypto/src/ocsp/RespData.cs b/src/BouncyCastle/ocsp/RespData.cs similarity index 100% rename from crypto/src/ocsp/RespData.cs rename to src/BouncyCastle/ocsp/RespData.cs diff --git a/crypto/src/ocsp/RespID.cs b/src/BouncyCastle/ocsp/RespID.cs similarity index 100% rename from crypto/src/ocsp/RespID.cs rename to src/BouncyCastle/ocsp/RespID.cs diff --git a/crypto/src/ocsp/RevokedStatus.cs b/src/BouncyCastle/ocsp/RevokedStatus.cs similarity index 100% rename from crypto/src/ocsp/RevokedStatus.cs rename to src/BouncyCastle/ocsp/RevokedStatus.cs diff --git a/crypto/src/ocsp/SingleResp.cs b/src/BouncyCastle/ocsp/SingleResp.cs similarity index 100% rename from crypto/src/ocsp/SingleResp.cs rename to src/BouncyCastle/ocsp/SingleResp.cs diff --git a/crypto/src/ocsp/UnknownStatus.cs b/src/BouncyCastle/ocsp/UnknownStatus.cs similarity index 100% rename from crypto/src/ocsp/UnknownStatus.cs rename to src/BouncyCastle/ocsp/UnknownStatus.cs diff --git a/crypto/src/openpgp/IStreamGenerator.cs b/src/BouncyCastle/openpgp/IStreamGenerator.cs similarity index 100% rename from crypto/src/openpgp/IStreamGenerator.cs rename to src/BouncyCastle/openpgp/IStreamGenerator.cs diff --git a/crypto/src/openpgp/PGPKeyRing.cs b/src/BouncyCastle/openpgp/PGPKeyRing.cs similarity index 100% rename from crypto/src/openpgp/PGPKeyRing.cs rename to src/BouncyCastle/openpgp/PGPKeyRing.cs diff --git a/crypto/src/openpgp/PGPObject.cs b/src/BouncyCastle/openpgp/PGPObject.cs similarity index 100% rename from crypto/src/openpgp/PGPObject.cs rename to src/BouncyCastle/openpgp/PGPObject.cs diff --git a/crypto/src/openpgp/PGPUserAttributeSubpacketVectorGenerator.cs b/src/BouncyCastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.cs similarity index 100% rename from crypto/src/openpgp/PGPUserAttributeSubpacketVectorGenerator.cs rename to src/BouncyCastle/openpgp/PGPUserAttributeSubpacketVectorGenerator.cs diff --git a/crypto/src/openpgp/PgpCompressedData.cs b/src/BouncyCastle/openpgp/PgpCompressedData.cs similarity index 100% rename from crypto/src/openpgp/PgpCompressedData.cs rename to src/BouncyCastle/openpgp/PgpCompressedData.cs diff --git a/crypto/src/openpgp/PgpCompressedDataGenerator.cs b/src/BouncyCastle/openpgp/PgpCompressedDataGenerator.cs similarity index 100% rename from crypto/src/openpgp/PgpCompressedDataGenerator.cs rename to src/BouncyCastle/openpgp/PgpCompressedDataGenerator.cs diff --git a/crypto/src/openpgp/PgpDataValidationException.cs b/src/BouncyCastle/openpgp/PgpDataValidationException.cs similarity index 100% rename from crypto/src/openpgp/PgpDataValidationException.cs rename to src/BouncyCastle/openpgp/PgpDataValidationException.cs diff --git a/crypto/src/openpgp/PgpEncryptedData.cs b/src/BouncyCastle/openpgp/PgpEncryptedData.cs similarity index 100% rename from crypto/src/openpgp/PgpEncryptedData.cs rename to src/BouncyCastle/openpgp/PgpEncryptedData.cs diff --git a/crypto/src/openpgp/PgpEncryptedDataGenerator.cs b/src/BouncyCastle/openpgp/PgpEncryptedDataGenerator.cs similarity index 100% rename from crypto/src/openpgp/PgpEncryptedDataGenerator.cs rename to src/BouncyCastle/openpgp/PgpEncryptedDataGenerator.cs diff --git a/crypto/src/openpgp/PgpEncryptedDataList.cs b/src/BouncyCastle/openpgp/PgpEncryptedDataList.cs similarity index 100% rename from crypto/src/openpgp/PgpEncryptedDataList.cs rename to src/BouncyCastle/openpgp/PgpEncryptedDataList.cs diff --git a/crypto/src/openpgp/PgpException.cs b/src/BouncyCastle/openpgp/PgpException.cs similarity index 100% rename from crypto/src/openpgp/PgpException.cs rename to src/BouncyCastle/openpgp/PgpException.cs diff --git a/crypto/src/openpgp/PgpExperimental.cs b/src/BouncyCastle/openpgp/PgpExperimental.cs similarity index 100% rename from crypto/src/openpgp/PgpExperimental.cs rename to src/BouncyCastle/openpgp/PgpExperimental.cs diff --git a/crypto/src/openpgp/PgpKeyFlags.cs b/src/BouncyCastle/openpgp/PgpKeyFlags.cs similarity index 100% rename from crypto/src/openpgp/PgpKeyFlags.cs rename to src/BouncyCastle/openpgp/PgpKeyFlags.cs diff --git a/crypto/src/openpgp/PgpKeyPair.cs b/src/BouncyCastle/openpgp/PgpKeyPair.cs similarity index 100% rename from crypto/src/openpgp/PgpKeyPair.cs rename to src/BouncyCastle/openpgp/PgpKeyPair.cs diff --git a/crypto/src/openpgp/PgpKeyRingGenerator.cs b/src/BouncyCastle/openpgp/PgpKeyRingGenerator.cs similarity index 100% rename from crypto/src/openpgp/PgpKeyRingGenerator.cs rename to src/BouncyCastle/openpgp/PgpKeyRingGenerator.cs diff --git a/crypto/src/openpgp/PgpKeyValidationException.cs b/src/BouncyCastle/openpgp/PgpKeyValidationException.cs similarity index 100% rename from crypto/src/openpgp/PgpKeyValidationException.cs rename to src/BouncyCastle/openpgp/PgpKeyValidationException.cs diff --git a/crypto/src/openpgp/PgpLiteralData.cs b/src/BouncyCastle/openpgp/PgpLiteralData.cs similarity index 100% rename from crypto/src/openpgp/PgpLiteralData.cs rename to src/BouncyCastle/openpgp/PgpLiteralData.cs diff --git a/crypto/src/openpgp/PgpLiteralDataGenerator.cs b/src/BouncyCastle/openpgp/PgpLiteralDataGenerator.cs similarity index 100% rename from crypto/src/openpgp/PgpLiteralDataGenerator.cs rename to src/BouncyCastle/openpgp/PgpLiteralDataGenerator.cs diff --git a/crypto/src/openpgp/PgpMarker.cs b/src/BouncyCastle/openpgp/PgpMarker.cs similarity index 100% rename from crypto/src/openpgp/PgpMarker.cs rename to src/BouncyCastle/openpgp/PgpMarker.cs diff --git a/crypto/src/openpgp/PgpObjectFactory.cs b/src/BouncyCastle/openpgp/PgpObjectFactory.cs similarity index 100% rename from crypto/src/openpgp/PgpObjectFactory.cs rename to src/BouncyCastle/openpgp/PgpObjectFactory.cs diff --git a/crypto/src/openpgp/PgpOnePassSignature.cs b/src/BouncyCastle/openpgp/PgpOnePassSignature.cs similarity index 100% rename from crypto/src/openpgp/PgpOnePassSignature.cs rename to src/BouncyCastle/openpgp/PgpOnePassSignature.cs diff --git a/crypto/src/openpgp/PgpOnePassSignatureList.cs b/src/BouncyCastle/openpgp/PgpOnePassSignatureList.cs similarity index 100% rename from crypto/src/openpgp/PgpOnePassSignatureList.cs rename to src/BouncyCastle/openpgp/PgpOnePassSignatureList.cs diff --git a/crypto/src/openpgp/PgpPad.cs b/src/BouncyCastle/openpgp/PgpPad.cs similarity index 100% rename from crypto/src/openpgp/PgpPad.cs rename to src/BouncyCastle/openpgp/PgpPad.cs diff --git a/crypto/src/openpgp/PgpPbeEncryptedData.cs b/src/BouncyCastle/openpgp/PgpPbeEncryptedData.cs similarity index 100% rename from crypto/src/openpgp/PgpPbeEncryptedData.cs rename to src/BouncyCastle/openpgp/PgpPbeEncryptedData.cs diff --git a/crypto/src/openpgp/PgpPrivateKey.cs b/src/BouncyCastle/openpgp/PgpPrivateKey.cs similarity index 100% rename from crypto/src/openpgp/PgpPrivateKey.cs rename to src/BouncyCastle/openpgp/PgpPrivateKey.cs diff --git a/crypto/src/openpgp/PgpPublicKey.cs b/src/BouncyCastle/openpgp/PgpPublicKey.cs similarity index 100% rename from crypto/src/openpgp/PgpPublicKey.cs rename to src/BouncyCastle/openpgp/PgpPublicKey.cs diff --git a/crypto/src/openpgp/PgpPublicKeyEncryptedData.cs b/src/BouncyCastle/openpgp/PgpPublicKeyEncryptedData.cs similarity index 100% rename from crypto/src/openpgp/PgpPublicKeyEncryptedData.cs rename to src/BouncyCastle/openpgp/PgpPublicKeyEncryptedData.cs diff --git a/crypto/src/openpgp/PgpPublicKeyRing.cs b/src/BouncyCastle/openpgp/PgpPublicKeyRing.cs similarity index 100% rename from crypto/src/openpgp/PgpPublicKeyRing.cs rename to src/BouncyCastle/openpgp/PgpPublicKeyRing.cs diff --git a/crypto/src/openpgp/PgpPublicKeyRingBundle.cs b/src/BouncyCastle/openpgp/PgpPublicKeyRingBundle.cs similarity index 100% rename from crypto/src/openpgp/PgpPublicKeyRingBundle.cs rename to src/BouncyCastle/openpgp/PgpPublicKeyRingBundle.cs diff --git a/crypto/src/openpgp/PgpSecretKey.cs b/src/BouncyCastle/openpgp/PgpSecretKey.cs similarity index 100% rename from crypto/src/openpgp/PgpSecretKey.cs rename to src/BouncyCastle/openpgp/PgpSecretKey.cs diff --git a/crypto/src/openpgp/PgpSecretKeyRing.cs b/src/BouncyCastle/openpgp/PgpSecretKeyRing.cs similarity index 100% rename from crypto/src/openpgp/PgpSecretKeyRing.cs rename to src/BouncyCastle/openpgp/PgpSecretKeyRing.cs diff --git a/crypto/src/openpgp/PgpSecretKeyRingBundle.cs b/src/BouncyCastle/openpgp/PgpSecretKeyRingBundle.cs similarity index 100% rename from crypto/src/openpgp/PgpSecretKeyRingBundle.cs rename to src/BouncyCastle/openpgp/PgpSecretKeyRingBundle.cs diff --git a/crypto/src/openpgp/PgpSignature.cs b/src/BouncyCastle/openpgp/PgpSignature.cs similarity index 100% rename from crypto/src/openpgp/PgpSignature.cs rename to src/BouncyCastle/openpgp/PgpSignature.cs diff --git a/crypto/src/openpgp/PgpSignatureGenerator.cs b/src/BouncyCastle/openpgp/PgpSignatureGenerator.cs similarity index 100% rename from crypto/src/openpgp/PgpSignatureGenerator.cs rename to src/BouncyCastle/openpgp/PgpSignatureGenerator.cs diff --git a/crypto/src/openpgp/PgpSignatureList.cs b/src/BouncyCastle/openpgp/PgpSignatureList.cs similarity index 100% rename from crypto/src/openpgp/PgpSignatureList.cs rename to src/BouncyCastle/openpgp/PgpSignatureList.cs diff --git a/crypto/src/openpgp/PgpSignatureSubpacketGenerator.cs b/src/BouncyCastle/openpgp/PgpSignatureSubpacketGenerator.cs similarity index 100% rename from crypto/src/openpgp/PgpSignatureSubpacketGenerator.cs rename to src/BouncyCastle/openpgp/PgpSignatureSubpacketGenerator.cs diff --git a/crypto/src/openpgp/PgpSignatureSubpacketVector.cs b/src/BouncyCastle/openpgp/PgpSignatureSubpacketVector.cs similarity index 100% rename from crypto/src/openpgp/PgpSignatureSubpacketVector.cs rename to src/BouncyCastle/openpgp/PgpSignatureSubpacketVector.cs diff --git a/crypto/src/openpgp/PgpUserAttributeSubpacketVector.cs b/src/BouncyCastle/openpgp/PgpUserAttributeSubpacketVector.cs similarity index 100% rename from crypto/src/openpgp/PgpUserAttributeSubpacketVector.cs rename to src/BouncyCastle/openpgp/PgpUserAttributeSubpacketVector.cs diff --git a/crypto/src/openpgp/PgpUtilities.cs b/src/BouncyCastle/openpgp/PgpUtilities.cs similarity index 100% rename from crypto/src/openpgp/PgpUtilities.cs rename to src/BouncyCastle/openpgp/PgpUtilities.cs diff --git a/crypto/src/openpgp/PgpV3SignatureGenerator.cs b/src/BouncyCastle/openpgp/PgpV3SignatureGenerator.cs similarity index 100% rename from crypto/src/openpgp/PgpV3SignatureGenerator.cs rename to src/BouncyCastle/openpgp/PgpV3SignatureGenerator.cs diff --git a/crypto/src/openpgp/Rfc6637Utilities.cs b/src/BouncyCastle/openpgp/Rfc6637Utilities.cs similarity index 100% rename from crypto/src/openpgp/Rfc6637Utilities.cs rename to src/BouncyCastle/openpgp/Rfc6637Utilities.cs diff --git a/crypto/src/openpgp/SXprUtilities.cs b/src/BouncyCastle/openpgp/SXprUtilities.cs similarity index 100% rename from crypto/src/openpgp/SXprUtilities.cs rename to src/BouncyCastle/openpgp/SXprUtilities.cs diff --git a/crypto/src/openpgp/WrappedGeneratorStream.cs b/src/BouncyCastle/openpgp/WrappedGeneratorStream.cs similarity index 100% rename from crypto/src/openpgp/WrappedGeneratorStream.cs rename to src/BouncyCastle/openpgp/WrappedGeneratorStream.cs diff --git a/crypto/src/openssl/EncryptionException.cs b/src/BouncyCastle/openssl/EncryptionException.cs similarity index 100% rename from crypto/src/openssl/EncryptionException.cs rename to src/BouncyCastle/openssl/EncryptionException.cs diff --git a/crypto/src/openssl/IPasswordFinder.cs b/src/BouncyCastle/openssl/IPasswordFinder.cs similarity index 100% rename from crypto/src/openssl/IPasswordFinder.cs rename to src/BouncyCastle/openssl/IPasswordFinder.cs diff --git a/crypto/src/openssl/MiscPemGenerator.cs b/src/BouncyCastle/openssl/MiscPemGenerator.cs similarity index 100% rename from crypto/src/openssl/MiscPemGenerator.cs rename to src/BouncyCastle/openssl/MiscPemGenerator.cs diff --git a/crypto/src/openssl/PEMException.cs b/src/BouncyCastle/openssl/PEMException.cs similarity index 100% rename from crypto/src/openssl/PEMException.cs rename to src/BouncyCastle/openssl/PEMException.cs diff --git a/crypto/src/openssl/PEMReader.cs b/src/BouncyCastle/openssl/PEMReader.cs similarity index 100% rename from crypto/src/openssl/PEMReader.cs rename to src/BouncyCastle/openssl/PEMReader.cs diff --git a/crypto/src/openssl/PEMUtilities.cs b/src/BouncyCastle/openssl/PEMUtilities.cs similarity index 100% rename from crypto/src/openssl/PEMUtilities.cs rename to src/BouncyCastle/openssl/PEMUtilities.cs diff --git a/crypto/src/openssl/PEMWriter.cs b/src/BouncyCastle/openssl/PEMWriter.cs similarity index 100% rename from crypto/src/openssl/PEMWriter.cs rename to src/BouncyCastle/openssl/PEMWriter.cs diff --git a/crypto/src/openssl/PasswordException.cs b/src/BouncyCastle/openssl/PasswordException.cs similarity index 100% rename from crypto/src/openssl/PasswordException.cs rename to src/BouncyCastle/openssl/PasswordException.cs diff --git a/crypto/src/openssl/Pkcs8Generator.cs b/src/BouncyCastle/openssl/Pkcs8Generator.cs similarity index 100% rename from crypto/src/openssl/Pkcs8Generator.cs rename to src/BouncyCastle/openssl/Pkcs8Generator.cs diff --git a/crypto/src/pkcs/AsymmetricKeyEntry.cs b/src/BouncyCastle/pkcs/AsymmetricKeyEntry.cs similarity index 100% rename from crypto/src/pkcs/AsymmetricKeyEntry.cs rename to src/BouncyCastle/pkcs/AsymmetricKeyEntry.cs diff --git a/crypto/src/pkcs/EncryptedPrivateKeyInfoFactory.cs b/src/BouncyCastle/pkcs/EncryptedPrivateKeyInfoFactory.cs similarity index 100% rename from crypto/src/pkcs/EncryptedPrivateKeyInfoFactory.cs rename to src/BouncyCastle/pkcs/EncryptedPrivateKeyInfoFactory.cs diff --git a/crypto/src/pkcs/PKCS12StoreBuilder.cs b/src/BouncyCastle/pkcs/PKCS12StoreBuilder.cs similarity index 100% rename from crypto/src/pkcs/PKCS12StoreBuilder.cs rename to src/BouncyCastle/pkcs/PKCS12StoreBuilder.cs diff --git a/crypto/src/pkcs/Pkcs10CertificationRequest.cs b/src/BouncyCastle/pkcs/Pkcs10CertificationRequest.cs similarity index 100% rename from crypto/src/pkcs/Pkcs10CertificationRequest.cs rename to src/BouncyCastle/pkcs/Pkcs10CertificationRequest.cs diff --git a/crypto/src/pkcs/Pkcs10CertificationRequestDelaySigned.cs b/src/BouncyCastle/pkcs/Pkcs10CertificationRequestDelaySigned.cs similarity index 100% rename from crypto/src/pkcs/Pkcs10CertificationRequestDelaySigned.cs rename to src/BouncyCastle/pkcs/Pkcs10CertificationRequestDelaySigned.cs diff --git a/crypto/src/pkcs/Pkcs12Entry.cs b/src/BouncyCastle/pkcs/Pkcs12Entry.cs similarity index 100% rename from crypto/src/pkcs/Pkcs12Entry.cs rename to src/BouncyCastle/pkcs/Pkcs12Entry.cs diff --git a/crypto/src/pkcs/Pkcs12Store.cs b/src/BouncyCastle/pkcs/Pkcs12Store.cs similarity index 100% rename from crypto/src/pkcs/Pkcs12Store.cs rename to src/BouncyCastle/pkcs/Pkcs12Store.cs diff --git a/crypto/src/pkcs/Pkcs12Utilities.cs b/src/BouncyCastle/pkcs/Pkcs12Utilities.cs similarity index 100% rename from crypto/src/pkcs/Pkcs12Utilities.cs rename to src/BouncyCastle/pkcs/Pkcs12Utilities.cs diff --git a/crypto/src/pkcs/PrivateKeyInfoFactory.cs b/src/BouncyCastle/pkcs/PrivateKeyInfoFactory.cs similarity index 100% rename from crypto/src/pkcs/PrivateKeyInfoFactory.cs rename to src/BouncyCastle/pkcs/PrivateKeyInfoFactory.cs diff --git a/crypto/src/pkcs/X509CertificateEntry.cs b/src/BouncyCastle/pkcs/X509CertificateEntry.cs similarity index 100% rename from crypto/src/pkcs/X509CertificateEntry.cs rename to src/BouncyCastle/pkcs/X509CertificateEntry.cs diff --git a/crypto/src/pkix/CertStatus.cs b/src/BouncyCastle/pkix/CertStatus.cs similarity index 100% rename from crypto/src/pkix/CertStatus.cs rename to src/BouncyCastle/pkix/CertStatus.cs diff --git a/crypto/src/pkix/PkixAttrCertChecker.cs b/src/BouncyCastle/pkix/PkixAttrCertChecker.cs similarity index 100% rename from crypto/src/pkix/PkixAttrCertChecker.cs rename to src/BouncyCastle/pkix/PkixAttrCertChecker.cs diff --git a/crypto/src/pkix/PkixAttrCertPathBuilder.cs b/src/BouncyCastle/pkix/PkixAttrCertPathBuilder.cs similarity index 100% rename from crypto/src/pkix/PkixAttrCertPathBuilder.cs rename to src/BouncyCastle/pkix/PkixAttrCertPathBuilder.cs diff --git a/crypto/src/pkix/PkixAttrCertPathValidator.cs b/src/BouncyCastle/pkix/PkixAttrCertPathValidator.cs similarity index 100% rename from crypto/src/pkix/PkixAttrCertPathValidator.cs rename to src/BouncyCastle/pkix/PkixAttrCertPathValidator.cs diff --git a/crypto/src/pkix/PkixBuilderParameters.cs b/src/BouncyCastle/pkix/PkixBuilderParameters.cs similarity index 100% rename from crypto/src/pkix/PkixBuilderParameters.cs rename to src/BouncyCastle/pkix/PkixBuilderParameters.cs diff --git a/crypto/src/pkix/PkixCertPath.cs b/src/BouncyCastle/pkix/PkixCertPath.cs similarity index 100% rename from crypto/src/pkix/PkixCertPath.cs rename to src/BouncyCastle/pkix/PkixCertPath.cs diff --git a/crypto/src/pkix/PkixCertPathBuilder.cs b/src/BouncyCastle/pkix/PkixCertPathBuilder.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathBuilder.cs rename to src/BouncyCastle/pkix/PkixCertPathBuilder.cs diff --git a/crypto/src/pkix/PkixCertPathBuilderException.cs b/src/BouncyCastle/pkix/PkixCertPathBuilderException.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathBuilderException.cs rename to src/BouncyCastle/pkix/PkixCertPathBuilderException.cs diff --git a/crypto/src/pkix/PkixCertPathBuilderResult.cs b/src/BouncyCastle/pkix/PkixCertPathBuilderResult.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathBuilderResult.cs rename to src/BouncyCastle/pkix/PkixCertPathBuilderResult.cs diff --git a/crypto/src/pkix/PkixCertPathChecker.cs b/src/BouncyCastle/pkix/PkixCertPathChecker.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathChecker.cs rename to src/BouncyCastle/pkix/PkixCertPathChecker.cs diff --git a/crypto/src/pkix/PkixCertPathValidator.cs b/src/BouncyCastle/pkix/PkixCertPathValidator.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathValidator.cs rename to src/BouncyCastle/pkix/PkixCertPathValidator.cs diff --git a/crypto/src/pkix/PkixCertPathValidatorException.cs b/src/BouncyCastle/pkix/PkixCertPathValidatorException.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathValidatorException.cs rename to src/BouncyCastle/pkix/PkixCertPathValidatorException.cs diff --git a/crypto/src/pkix/PkixCertPathValidatorResult.cs b/src/BouncyCastle/pkix/PkixCertPathValidatorResult.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathValidatorResult.cs rename to src/BouncyCastle/pkix/PkixCertPathValidatorResult.cs diff --git a/crypto/src/pkix/PkixCertPathValidatorUtilities.cs b/src/BouncyCastle/pkix/PkixCertPathValidatorUtilities.cs similarity index 100% rename from crypto/src/pkix/PkixCertPathValidatorUtilities.cs rename to src/BouncyCastle/pkix/PkixCertPathValidatorUtilities.cs diff --git a/crypto/src/pkix/PkixCrlUtilities.cs b/src/BouncyCastle/pkix/PkixCrlUtilities.cs similarity index 100% rename from crypto/src/pkix/PkixCrlUtilities.cs rename to src/BouncyCastle/pkix/PkixCrlUtilities.cs diff --git a/crypto/src/pkix/PkixNameConstraintValidator.cs b/src/BouncyCastle/pkix/PkixNameConstraintValidator.cs similarity index 100% rename from crypto/src/pkix/PkixNameConstraintValidator.cs rename to src/BouncyCastle/pkix/PkixNameConstraintValidator.cs diff --git a/crypto/src/pkix/PkixNameConstraintValidatorException.cs b/src/BouncyCastle/pkix/PkixNameConstraintValidatorException.cs similarity index 100% rename from crypto/src/pkix/PkixNameConstraintValidatorException.cs rename to src/BouncyCastle/pkix/PkixNameConstraintValidatorException.cs diff --git a/crypto/src/pkix/PkixParameters.cs b/src/BouncyCastle/pkix/PkixParameters.cs similarity index 100% rename from crypto/src/pkix/PkixParameters.cs rename to src/BouncyCastle/pkix/PkixParameters.cs diff --git a/crypto/src/pkix/PkixPolicyNode.cs b/src/BouncyCastle/pkix/PkixPolicyNode.cs similarity index 100% rename from crypto/src/pkix/PkixPolicyNode.cs rename to src/BouncyCastle/pkix/PkixPolicyNode.cs diff --git a/crypto/src/pkix/ReasonsMask.cs b/src/BouncyCastle/pkix/ReasonsMask.cs similarity index 100% rename from crypto/src/pkix/ReasonsMask.cs rename to src/BouncyCastle/pkix/ReasonsMask.cs diff --git a/crypto/src/pkix/Rfc3280CertPathUtilities.cs b/src/BouncyCastle/pkix/Rfc3280CertPathUtilities.cs similarity index 100% rename from crypto/src/pkix/Rfc3280CertPathUtilities.cs rename to src/BouncyCastle/pkix/Rfc3280CertPathUtilities.cs diff --git a/crypto/src/pkix/Rfc3281CertPathUtilities.cs b/src/BouncyCastle/pkix/Rfc3281CertPathUtilities.cs similarity index 100% rename from crypto/src/pkix/Rfc3281CertPathUtilities.cs rename to src/BouncyCastle/pkix/Rfc3281CertPathUtilities.cs diff --git a/crypto/src/pkix/TrustAnchor.cs b/src/BouncyCastle/pkix/TrustAnchor.cs similarity index 100% rename from crypto/src/pkix/TrustAnchor.cs rename to src/BouncyCastle/pkix/TrustAnchor.cs diff --git a/crypto/src/security/AgreementUtilities.cs b/src/BouncyCastle/security/AgreementUtilities.cs similarity index 100% rename from crypto/src/security/AgreementUtilities.cs rename to src/BouncyCastle/security/AgreementUtilities.cs diff --git a/crypto/src/security/CipherUtilities.cs b/src/BouncyCastle/security/CipherUtilities.cs similarity index 100% rename from crypto/src/security/CipherUtilities.cs rename to src/BouncyCastle/security/CipherUtilities.cs diff --git a/crypto/src/security/DigestUtilities.cs b/src/BouncyCastle/security/DigestUtilities.cs similarity index 100% rename from crypto/src/security/DigestUtilities.cs rename to src/BouncyCastle/security/DigestUtilities.cs diff --git a/crypto/src/security/DotNetUtilities.cs b/src/BouncyCastle/security/DotNetUtilities.cs similarity index 100% rename from crypto/src/security/DotNetUtilities.cs rename to src/BouncyCastle/security/DotNetUtilities.cs diff --git a/crypto/src/security/GeneralSecurityException.cs b/src/BouncyCastle/security/GeneralSecurityException.cs similarity index 100% rename from crypto/src/security/GeneralSecurityException.cs rename to src/BouncyCastle/security/GeneralSecurityException.cs diff --git a/crypto/src/security/GeneratorUtilities.cs b/src/BouncyCastle/security/GeneratorUtilities.cs similarity index 100% rename from crypto/src/security/GeneratorUtilities.cs rename to src/BouncyCastle/security/GeneratorUtilities.cs diff --git a/crypto/src/security/InvalidKeyException.cs b/src/BouncyCastle/security/InvalidKeyException.cs similarity index 100% rename from crypto/src/security/InvalidKeyException.cs rename to src/BouncyCastle/security/InvalidKeyException.cs diff --git a/crypto/src/security/InvalidParameterException.cs b/src/BouncyCastle/security/InvalidParameterException.cs similarity index 100% rename from crypto/src/security/InvalidParameterException.cs rename to src/BouncyCastle/security/InvalidParameterException.cs diff --git a/crypto/src/security/KeyException.cs b/src/BouncyCastle/security/KeyException.cs similarity index 100% rename from crypto/src/security/KeyException.cs rename to src/BouncyCastle/security/KeyException.cs diff --git a/crypto/src/security/MacUtilities.cs b/src/BouncyCastle/security/MacUtilities.cs similarity index 100% rename from crypto/src/security/MacUtilities.cs rename to src/BouncyCastle/security/MacUtilities.cs diff --git a/crypto/src/security/NoSuchAlgorithmException.cs b/src/BouncyCastle/security/NoSuchAlgorithmException.cs similarity index 100% rename from crypto/src/security/NoSuchAlgorithmException.cs rename to src/BouncyCastle/security/NoSuchAlgorithmException.cs diff --git a/crypto/src/security/ParameterUtilities.cs b/src/BouncyCastle/security/ParameterUtilities.cs similarity index 100% rename from crypto/src/security/ParameterUtilities.cs rename to src/BouncyCastle/security/ParameterUtilities.cs diff --git a/crypto/src/security/PbeUtilities.cs b/src/BouncyCastle/security/PbeUtilities.cs similarity index 100% rename from crypto/src/security/PbeUtilities.cs rename to src/BouncyCastle/security/PbeUtilities.cs diff --git a/crypto/src/security/PrivateKeyFactory.cs b/src/BouncyCastle/security/PrivateKeyFactory.cs similarity index 100% rename from crypto/src/security/PrivateKeyFactory.cs rename to src/BouncyCastle/security/PrivateKeyFactory.cs diff --git a/crypto/src/security/PublicKeyFactory.cs b/src/BouncyCastle/security/PublicKeyFactory.cs similarity index 100% rename from crypto/src/security/PublicKeyFactory.cs rename to src/BouncyCastle/security/PublicKeyFactory.cs diff --git a/crypto/src/security/SecureRandom.cs b/src/BouncyCastle/security/SecureRandom.cs similarity index 100% rename from crypto/src/security/SecureRandom.cs rename to src/BouncyCastle/security/SecureRandom.cs diff --git a/crypto/src/security/SecurityUtilityException.cs b/src/BouncyCastle/security/SecurityUtilityException.cs similarity index 100% rename from crypto/src/security/SecurityUtilityException.cs rename to src/BouncyCastle/security/SecurityUtilityException.cs diff --git a/crypto/src/security/SignatureException.cs b/src/BouncyCastle/security/SignatureException.cs similarity index 100% rename from crypto/src/security/SignatureException.cs rename to src/BouncyCastle/security/SignatureException.cs diff --git a/crypto/src/security/SignerUtilities.cs b/src/BouncyCastle/security/SignerUtilities.cs similarity index 100% rename from crypto/src/security/SignerUtilities.cs rename to src/BouncyCastle/security/SignerUtilities.cs diff --git a/crypto/src/security/WrapperUtilities.cs b/src/BouncyCastle/security/WrapperUtilities.cs similarity index 100% rename from crypto/src/security/WrapperUtilities.cs rename to src/BouncyCastle/security/WrapperUtilities.cs diff --git a/crypto/src/security/cert/CertificateEncodingException.cs b/src/BouncyCastle/security/cert/CertificateEncodingException.cs similarity index 100% rename from crypto/src/security/cert/CertificateEncodingException.cs rename to src/BouncyCastle/security/cert/CertificateEncodingException.cs diff --git a/crypto/src/security/cert/CertificateException.cs b/src/BouncyCastle/security/cert/CertificateException.cs similarity index 100% rename from crypto/src/security/cert/CertificateException.cs rename to src/BouncyCastle/security/cert/CertificateException.cs diff --git a/crypto/src/security/cert/CertificateExpiredException.cs b/src/BouncyCastle/security/cert/CertificateExpiredException.cs similarity index 100% rename from crypto/src/security/cert/CertificateExpiredException.cs rename to src/BouncyCastle/security/cert/CertificateExpiredException.cs diff --git a/crypto/src/security/cert/CertificateNotYetValidException.cs b/src/BouncyCastle/security/cert/CertificateNotYetValidException.cs similarity index 100% rename from crypto/src/security/cert/CertificateNotYetValidException.cs rename to src/BouncyCastle/security/cert/CertificateNotYetValidException.cs diff --git a/crypto/src/security/cert/CertificateParsingException.cs b/src/BouncyCastle/security/cert/CertificateParsingException.cs similarity index 100% rename from crypto/src/security/cert/CertificateParsingException.cs rename to src/BouncyCastle/security/cert/CertificateParsingException.cs diff --git a/crypto/src/security/cert/CrlException.cs b/src/BouncyCastle/security/cert/CrlException.cs similarity index 100% rename from crypto/src/security/cert/CrlException.cs rename to src/BouncyCastle/security/cert/CrlException.cs diff --git a/crypto/src/tsp/GenTimeAccuracy.cs b/src/BouncyCastle/tsp/GenTimeAccuracy.cs similarity index 100% rename from crypto/src/tsp/GenTimeAccuracy.cs rename to src/BouncyCastle/tsp/GenTimeAccuracy.cs diff --git a/crypto/src/tsp/TSPAlgorithms.cs b/src/BouncyCastle/tsp/TSPAlgorithms.cs similarity index 100% rename from crypto/src/tsp/TSPAlgorithms.cs rename to src/BouncyCastle/tsp/TSPAlgorithms.cs diff --git a/crypto/src/tsp/TSPException.cs b/src/BouncyCastle/tsp/TSPException.cs similarity index 100% rename from crypto/src/tsp/TSPException.cs rename to src/BouncyCastle/tsp/TSPException.cs diff --git a/crypto/src/tsp/TSPUtil.cs b/src/BouncyCastle/tsp/TSPUtil.cs similarity index 100% rename from crypto/src/tsp/TSPUtil.cs rename to src/BouncyCastle/tsp/TSPUtil.cs diff --git a/crypto/src/tsp/TSPValidationException.cs b/src/BouncyCastle/tsp/TSPValidationException.cs similarity index 100% rename from crypto/src/tsp/TSPValidationException.cs rename to src/BouncyCastle/tsp/TSPValidationException.cs diff --git a/crypto/src/tsp/TimeStampRequest.cs b/src/BouncyCastle/tsp/TimeStampRequest.cs similarity index 100% rename from crypto/src/tsp/TimeStampRequest.cs rename to src/BouncyCastle/tsp/TimeStampRequest.cs diff --git a/crypto/src/tsp/TimeStampRequestGenerator.cs b/src/BouncyCastle/tsp/TimeStampRequestGenerator.cs similarity index 100% rename from crypto/src/tsp/TimeStampRequestGenerator.cs rename to src/BouncyCastle/tsp/TimeStampRequestGenerator.cs diff --git a/crypto/src/tsp/TimeStampResponse.cs b/src/BouncyCastle/tsp/TimeStampResponse.cs similarity index 100% rename from crypto/src/tsp/TimeStampResponse.cs rename to src/BouncyCastle/tsp/TimeStampResponse.cs diff --git a/crypto/src/tsp/TimeStampResponseGenerator.cs b/src/BouncyCastle/tsp/TimeStampResponseGenerator.cs similarity index 100% rename from crypto/src/tsp/TimeStampResponseGenerator.cs rename to src/BouncyCastle/tsp/TimeStampResponseGenerator.cs diff --git a/crypto/src/tsp/TimeStampToken.cs b/src/BouncyCastle/tsp/TimeStampToken.cs similarity index 100% rename from crypto/src/tsp/TimeStampToken.cs rename to src/BouncyCastle/tsp/TimeStampToken.cs diff --git a/crypto/src/tsp/TimeStampTokenGenerator.cs b/src/BouncyCastle/tsp/TimeStampTokenGenerator.cs similarity index 100% rename from crypto/src/tsp/TimeStampTokenGenerator.cs rename to src/BouncyCastle/tsp/TimeStampTokenGenerator.cs diff --git a/crypto/src/tsp/TimeStampTokenInfo.cs b/src/BouncyCastle/tsp/TimeStampTokenInfo.cs similarity index 100% rename from crypto/src/tsp/TimeStampTokenInfo.cs rename to src/BouncyCastle/tsp/TimeStampTokenInfo.cs diff --git a/crypto/src/util/Arrays.cs b/src/BouncyCastle/util/Arrays.cs similarity index 100% rename from crypto/src/util/Arrays.cs rename to src/BouncyCastle/util/Arrays.cs diff --git a/crypto/src/util/BigIntegers.cs b/src/BouncyCastle/util/BigIntegers.cs similarity index 100% rename from crypto/src/util/BigIntegers.cs rename to src/BouncyCastle/util/BigIntegers.cs diff --git a/crypto/src/util/Enums.cs b/src/BouncyCastle/util/Enums.cs similarity index 100% rename from crypto/src/util/Enums.cs rename to src/BouncyCastle/util/Enums.cs diff --git a/crypto/src/util/IMemoable.cs b/src/BouncyCastle/util/IMemoable.cs similarity index 100% rename from crypto/src/util/IMemoable.cs rename to src/BouncyCastle/util/IMemoable.cs diff --git a/crypto/src/util/Integers.cs b/src/BouncyCastle/util/Integers.cs similarity index 100% rename from crypto/src/util/Integers.cs rename to src/BouncyCastle/util/Integers.cs diff --git a/crypto/src/util/MemoableResetException.cs b/src/BouncyCastle/util/MemoableResetException.cs similarity index 100% rename from crypto/src/util/MemoableResetException.cs rename to src/BouncyCastle/util/MemoableResetException.cs diff --git a/crypto/src/util/Platform.cs b/src/BouncyCastle/util/Platform.cs similarity index 100% rename from crypto/src/util/Platform.cs rename to src/BouncyCastle/util/Platform.cs diff --git a/crypto/src/util/Strings.cs b/src/BouncyCastle/util/Strings.cs similarity index 100% rename from crypto/src/util/Strings.cs rename to src/BouncyCastle/util/Strings.cs diff --git a/crypto/src/util/Times.cs b/src/BouncyCastle/util/Times.cs similarity index 100% rename from crypto/src/util/Times.cs rename to src/BouncyCastle/util/Times.cs diff --git a/crypto/src/util/TypeExtensions.cs b/src/BouncyCastle/util/TypeExtensions.cs similarity index 100% rename from crypto/src/util/TypeExtensions.cs rename to src/BouncyCastle/util/TypeExtensions.cs diff --git a/crypto/src/util/collections/CollectionUtilities.cs b/src/BouncyCastle/util/collections/CollectionUtilities.cs similarity index 100% rename from crypto/src/util/collections/CollectionUtilities.cs rename to src/BouncyCastle/util/collections/CollectionUtilities.cs diff --git a/crypto/src/util/collections/EmptyEnumerable.cs b/src/BouncyCastle/util/collections/EmptyEnumerable.cs similarity index 100% rename from crypto/src/util/collections/EmptyEnumerable.cs rename to src/BouncyCastle/util/collections/EmptyEnumerable.cs diff --git a/crypto/src/util/collections/EnumerableProxy.cs b/src/BouncyCastle/util/collections/EnumerableProxy.cs similarity index 100% rename from crypto/src/util/collections/EnumerableProxy.cs rename to src/BouncyCastle/util/collections/EnumerableProxy.cs diff --git a/crypto/src/util/collections/HashSet.cs b/src/BouncyCastle/util/collections/HashSet.cs similarity index 100% rename from crypto/src/util/collections/HashSet.cs rename to src/BouncyCastle/util/collections/HashSet.cs diff --git a/crypto/src/util/collections/ISet.cs b/src/BouncyCastle/util/collections/ISet.cs similarity index 100% rename from crypto/src/util/collections/ISet.cs rename to src/BouncyCastle/util/collections/ISet.cs diff --git a/crypto/src/util/collections/LinkedDictionary.cs b/src/BouncyCastle/util/collections/LinkedDictionary.cs similarity index 100% rename from crypto/src/util/collections/LinkedDictionary.cs rename to src/BouncyCastle/util/collections/LinkedDictionary.cs diff --git a/crypto/src/util/collections/UnmodifiableDictionary.cs b/src/BouncyCastle/util/collections/UnmodifiableDictionary.cs similarity index 100% rename from crypto/src/util/collections/UnmodifiableDictionary.cs rename to src/BouncyCastle/util/collections/UnmodifiableDictionary.cs diff --git a/crypto/src/util/collections/UnmodifiableDictionaryProxy.cs b/src/BouncyCastle/util/collections/UnmodifiableDictionaryProxy.cs similarity index 100% rename from crypto/src/util/collections/UnmodifiableDictionaryProxy.cs rename to src/BouncyCastle/util/collections/UnmodifiableDictionaryProxy.cs diff --git a/crypto/src/util/collections/UnmodifiableList.cs b/src/BouncyCastle/util/collections/UnmodifiableList.cs similarity index 100% rename from crypto/src/util/collections/UnmodifiableList.cs rename to src/BouncyCastle/util/collections/UnmodifiableList.cs diff --git a/crypto/src/util/collections/UnmodifiableListProxy.cs b/src/BouncyCastle/util/collections/UnmodifiableListProxy.cs similarity index 100% rename from crypto/src/util/collections/UnmodifiableListProxy.cs rename to src/BouncyCastle/util/collections/UnmodifiableListProxy.cs diff --git a/crypto/src/util/collections/UnmodifiableSet.cs b/src/BouncyCastle/util/collections/UnmodifiableSet.cs similarity index 100% rename from crypto/src/util/collections/UnmodifiableSet.cs rename to src/BouncyCastle/util/collections/UnmodifiableSet.cs diff --git a/crypto/src/util/collections/UnmodifiableSetProxy.cs b/src/BouncyCastle/util/collections/UnmodifiableSetProxy.cs similarity index 100% rename from crypto/src/util/collections/UnmodifiableSetProxy.cs rename to src/BouncyCastle/util/collections/UnmodifiableSetProxy.cs diff --git a/crypto/src/util/date/DateTimeObject.cs b/src/BouncyCastle/util/date/DateTimeObject.cs similarity index 100% rename from crypto/src/util/date/DateTimeObject.cs rename to src/BouncyCastle/util/date/DateTimeObject.cs diff --git a/crypto/src/util/date/DateTimeUtilities.cs b/src/BouncyCastle/util/date/DateTimeUtilities.cs similarity index 100% rename from crypto/src/util/date/DateTimeUtilities.cs rename to src/BouncyCastle/util/date/DateTimeUtilities.cs diff --git a/crypto/src/util/encoders/Base64.cs b/src/BouncyCastle/util/encoders/Base64.cs similarity index 100% rename from crypto/src/util/encoders/Base64.cs rename to src/BouncyCastle/util/encoders/Base64.cs diff --git a/crypto/src/util/encoders/Base64Encoder.cs b/src/BouncyCastle/util/encoders/Base64Encoder.cs similarity index 100% rename from crypto/src/util/encoders/Base64Encoder.cs rename to src/BouncyCastle/util/encoders/Base64Encoder.cs diff --git a/crypto/src/util/encoders/BufferedDecoder.cs b/src/BouncyCastle/util/encoders/BufferedDecoder.cs similarity index 100% rename from crypto/src/util/encoders/BufferedDecoder.cs rename to src/BouncyCastle/util/encoders/BufferedDecoder.cs diff --git a/crypto/src/util/encoders/BufferedEncoder.cs b/src/BouncyCastle/util/encoders/BufferedEncoder.cs similarity index 100% rename from crypto/src/util/encoders/BufferedEncoder.cs rename to src/BouncyCastle/util/encoders/BufferedEncoder.cs diff --git a/crypto/src/util/encoders/Hex.cs b/src/BouncyCastle/util/encoders/Hex.cs similarity index 100% rename from crypto/src/util/encoders/Hex.cs rename to src/BouncyCastle/util/encoders/Hex.cs diff --git a/crypto/src/util/encoders/HexEncoder.cs b/src/BouncyCastle/util/encoders/HexEncoder.cs similarity index 100% rename from crypto/src/util/encoders/HexEncoder.cs rename to src/BouncyCastle/util/encoders/HexEncoder.cs diff --git a/crypto/src/util/encoders/HexTranslator.cs b/src/BouncyCastle/util/encoders/HexTranslator.cs similarity index 100% rename from crypto/src/util/encoders/HexTranslator.cs rename to src/BouncyCastle/util/encoders/HexTranslator.cs diff --git a/crypto/src/util/encoders/IEncoder.cs b/src/BouncyCastle/util/encoders/IEncoder.cs similarity index 100% rename from crypto/src/util/encoders/IEncoder.cs rename to src/BouncyCastle/util/encoders/IEncoder.cs diff --git a/crypto/src/util/encoders/Translator.cs b/src/BouncyCastle/util/encoders/Translator.cs similarity index 100% rename from crypto/src/util/encoders/Translator.cs rename to src/BouncyCastle/util/encoders/Translator.cs diff --git a/crypto/src/util/encoders/UrlBase64.cs b/src/BouncyCastle/util/encoders/UrlBase64.cs similarity index 100% rename from crypto/src/util/encoders/UrlBase64.cs rename to src/BouncyCastle/util/encoders/UrlBase64.cs diff --git a/crypto/src/util/encoders/UrlBase64Encoder.cs b/src/BouncyCastle/util/encoders/UrlBase64Encoder.cs similarity index 100% rename from crypto/src/util/encoders/UrlBase64Encoder.cs rename to src/BouncyCastle/util/encoders/UrlBase64Encoder.cs diff --git a/crypto/src/util/io/BaseInputStream.cs b/src/BouncyCastle/util/io/BaseInputStream.cs similarity index 100% rename from crypto/src/util/io/BaseInputStream.cs rename to src/BouncyCastle/util/io/BaseInputStream.cs diff --git a/crypto/src/util/io/BaseOutputStream.cs b/src/BouncyCastle/util/io/BaseOutputStream.cs similarity index 100% rename from crypto/src/util/io/BaseOutputStream.cs rename to src/BouncyCastle/util/io/BaseOutputStream.cs diff --git a/crypto/src/util/io/FilterStream.cs b/src/BouncyCastle/util/io/FilterStream.cs similarity index 100% rename from crypto/src/util/io/FilterStream.cs rename to src/BouncyCastle/util/io/FilterStream.cs diff --git a/crypto/src/util/io/NullOutputStream.cs b/src/BouncyCastle/util/io/NullOutputStream.cs similarity index 100% rename from crypto/src/util/io/NullOutputStream.cs rename to src/BouncyCastle/util/io/NullOutputStream.cs diff --git a/crypto/src/util/io/PushbackStream.cs b/src/BouncyCastle/util/io/PushbackStream.cs similarity index 100% rename from crypto/src/util/io/PushbackStream.cs rename to src/BouncyCastle/util/io/PushbackStream.cs diff --git a/crypto/src/util/io/StreamOverflowException.cs b/src/BouncyCastle/util/io/StreamOverflowException.cs similarity index 100% rename from crypto/src/util/io/StreamOverflowException.cs rename to src/BouncyCastle/util/io/StreamOverflowException.cs diff --git a/crypto/src/util/io/Streams.cs b/src/BouncyCastle/util/io/Streams.cs similarity index 100% rename from crypto/src/util/io/Streams.cs rename to src/BouncyCastle/util/io/Streams.cs diff --git a/crypto/src/util/io/TeeInputStream.cs b/src/BouncyCastle/util/io/TeeInputStream.cs similarity index 100% rename from crypto/src/util/io/TeeInputStream.cs rename to src/BouncyCastle/util/io/TeeInputStream.cs diff --git a/crypto/src/util/io/TeeOutputStream.cs b/src/BouncyCastle/util/io/TeeOutputStream.cs similarity index 100% rename from crypto/src/util/io/TeeOutputStream.cs rename to src/BouncyCastle/util/io/TeeOutputStream.cs diff --git a/crypto/src/util/io/pem/PemGenerationException.cs b/src/BouncyCastle/util/io/pem/PemGenerationException.cs similarity index 100% rename from crypto/src/util/io/pem/PemGenerationException.cs rename to src/BouncyCastle/util/io/pem/PemGenerationException.cs diff --git a/crypto/src/util/io/pem/PemHeader.cs b/src/BouncyCastle/util/io/pem/PemHeader.cs similarity index 100% rename from crypto/src/util/io/pem/PemHeader.cs rename to src/BouncyCastle/util/io/pem/PemHeader.cs diff --git a/crypto/src/util/io/pem/PemObject.cs b/src/BouncyCastle/util/io/pem/PemObject.cs similarity index 100% rename from crypto/src/util/io/pem/PemObject.cs rename to src/BouncyCastle/util/io/pem/PemObject.cs diff --git a/crypto/src/util/io/pem/PemObjectGenerator.cs b/src/BouncyCastle/util/io/pem/PemObjectGenerator.cs similarity index 100% rename from crypto/src/util/io/pem/PemObjectGenerator.cs rename to src/BouncyCastle/util/io/pem/PemObjectGenerator.cs diff --git a/crypto/src/util/io/pem/PemObjectParser.cs b/src/BouncyCastle/util/io/pem/PemObjectParser.cs similarity index 100% rename from crypto/src/util/io/pem/PemObjectParser.cs rename to src/BouncyCastle/util/io/pem/PemObjectParser.cs diff --git a/crypto/src/util/io/pem/PemReader.cs b/src/BouncyCastle/util/io/pem/PemReader.cs similarity index 100% rename from crypto/src/util/io/pem/PemReader.cs rename to src/BouncyCastle/util/io/pem/PemReader.cs diff --git a/crypto/src/util/io/pem/PemWriter.cs b/src/BouncyCastle/util/io/pem/PemWriter.cs similarity index 100% rename from crypto/src/util/io/pem/PemWriter.cs rename to src/BouncyCastle/util/io/pem/PemWriter.cs diff --git a/crypto/src/util/net/IPAddress.cs b/src/BouncyCastle/util/net/IPAddress.cs similarity index 100% rename from crypto/src/util/net/IPAddress.cs rename to src/BouncyCastle/util/net/IPAddress.cs diff --git a/crypto/src/util/zlib/Adler32.cs b/src/BouncyCastle/util/zlib/Adler32.cs similarity index 100% rename from crypto/src/util/zlib/Adler32.cs rename to src/BouncyCastle/util/zlib/Adler32.cs diff --git a/crypto/src/util/zlib/Deflate.cs b/src/BouncyCastle/util/zlib/Deflate.cs similarity index 100% rename from crypto/src/util/zlib/Deflate.cs rename to src/BouncyCastle/util/zlib/Deflate.cs diff --git a/crypto/src/util/zlib/InfBlocks.cs b/src/BouncyCastle/util/zlib/InfBlocks.cs similarity index 100% rename from crypto/src/util/zlib/InfBlocks.cs rename to src/BouncyCastle/util/zlib/InfBlocks.cs diff --git a/crypto/src/util/zlib/InfCodes.cs b/src/BouncyCastle/util/zlib/InfCodes.cs similarity index 100% rename from crypto/src/util/zlib/InfCodes.cs rename to src/BouncyCastle/util/zlib/InfCodes.cs diff --git a/crypto/src/util/zlib/InfTree.cs b/src/BouncyCastle/util/zlib/InfTree.cs similarity index 100% rename from crypto/src/util/zlib/InfTree.cs rename to src/BouncyCastle/util/zlib/InfTree.cs diff --git a/crypto/src/util/zlib/Inflate.cs b/src/BouncyCastle/util/zlib/Inflate.cs similarity index 100% rename from crypto/src/util/zlib/Inflate.cs rename to src/BouncyCastle/util/zlib/Inflate.cs diff --git a/crypto/src/util/zlib/JZlib.cs b/src/BouncyCastle/util/zlib/JZlib.cs similarity index 100% rename from crypto/src/util/zlib/JZlib.cs rename to src/BouncyCastle/util/zlib/JZlib.cs diff --git a/crypto/src/util/zlib/StaticTree.cs b/src/BouncyCastle/util/zlib/StaticTree.cs similarity index 100% rename from crypto/src/util/zlib/StaticTree.cs rename to src/BouncyCastle/util/zlib/StaticTree.cs diff --git a/crypto/src/util/zlib/Tree.cs b/src/BouncyCastle/util/zlib/Tree.cs similarity index 100% rename from crypto/src/util/zlib/Tree.cs rename to src/BouncyCastle/util/zlib/Tree.cs diff --git a/crypto/src/util/zlib/ZDeflaterOutputStream.cs b/src/BouncyCastle/util/zlib/ZDeflaterOutputStream.cs similarity index 100% rename from crypto/src/util/zlib/ZDeflaterOutputStream.cs rename to src/BouncyCastle/util/zlib/ZDeflaterOutputStream.cs diff --git a/crypto/src/util/zlib/ZInflaterInputStream.cs b/src/BouncyCastle/util/zlib/ZInflaterInputStream.cs similarity index 100% rename from crypto/src/util/zlib/ZInflaterInputStream.cs rename to src/BouncyCastle/util/zlib/ZInflaterInputStream.cs diff --git a/crypto/src/util/zlib/ZInputStream.cs b/src/BouncyCastle/util/zlib/ZInputStream.cs similarity index 100% rename from crypto/src/util/zlib/ZInputStream.cs rename to src/BouncyCastle/util/zlib/ZInputStream.cs diff --git a/crypto/src/util/zlib/ZOutputStream.cs b/src/BouncyCastle/util/zlib/ZOutputStream.cs similarity index 100% rename from crypto/src/util/zlib/ZOutputStream.cs rename to src/BouncyCastle/util/zlib/ZOutputStream.cs diff --git a/crypto/src/util/zlib/ZStream.cs b/src/BouncyCastle/util/zlib/ZStream.cs similarity index 100% rename from crypto/src/util/zlib/ZStream.cs rename to src/BouncyCastle/util/zlib/ZStream.cs diff --git a/crypto/src/x509/AttributeCertificateHolder.cs b/src/BouncyCastle/x509/AttributeCertificateHolder.cs similarity index 100% rename from crypto/src/x509/AttributeCertificateHolder.cs rename to src/BouncyCastle/x509/AttributeCertificateHolder.cs diff --git a/crypto/src/x509/AttributeCertificateIssuer.cs b/src/BouncyCastle/x509/AttributeCertificateIssuer.cs similarity index 100% rename from crypto/src/x509/AttributeCertificateIssuer.cs rename to src/BouncyCastle/x509/AttributeCertificateIssuer.cs diff --git a/crypto/src/x509/IX509AttributeCertificate.cs b/src/BouncyCastle/x509/IX509AttributeCertificate.cs similarity index 100% rename from crypto/src/x509/IX509AttributeCertificate.cs rename to src/BouncyCastle/x509/IX509AttributeCertificate.cs diff --git a/crypto/src/x509/IX509Extension.cs b/src/BouncyCastle/x509/IX509Extension.cs similarity index 100% rename from crypto/src/x509/IX509Extension.cs rename to src/BouncyCastle/x509/IX509Extension.cs diff --git a/crypto/src/x509/PEMParser.cs b/src/BouncyCastle/x509/PEMParser.cs similarity index 100% rename from crypto/src/x509/PEMParser.cs rename to src/BouncyCastle/x509/PEMParser.cs diff --git a/crypto/src/x509/PrincipalUtil.cs b/src/BouncyCastle/x509/PrincipalUtil.cs similarity index 100% rename from crypto/src/x509/PrincipalUtil.cs rename to src/BouncyCastle/x509/PrincipalUtil.cs diff --git a/crypto/src/x509/SubjectPublicKeyInfoFactory.cs b/src/BouncyCastle/x509/SubjectPublicKeyInfoFactory.cs similarity index 100% rename from crypto/src/x509/SubjectPublicKeyInfoFactory.cs rename to src/BouncyCastle/x509/SubjectPublicKeyInfoFactory.cs diff --git a/crypto/src/x509/X509AttrCertParser.cs b/src/BouncyCastle/x509/X509AttrCertParser.cs similarity index 100% rename from crypto/src/x509/X509AttrCertParser.cs rename to src/BouncyCastle/x509/X509AttrCertParser.cs diff --git a/crypto/src/x509/X509Attribute.cs b/src/BouncyCastle/x509/X509Attribute.cs similarity index 100% rename from crypto/src/x509/X509Attribute.cs rename to src/BouncyCastle/x509/X509Attribute.cs diff --git a/crypto/src/x509/X509CertPairParser.cs b/src/BouncyCastle/x509/X509CertPairParser.cs similarity index 100% rename from crypto/src/x509/X509CertPairParser.cs rename to src/BouncyCastle/x509/X509CertPairParser.cs diff --git a/crypto/src/x509/X509Certificate.cs b/src/BouncyCastle/x509/X509Certificate.cs similarity index 100% rename from crypto/src/x509/X509Certificate.cs rename to src/BouncyCastle/x509/X509Certificate.cs diff --git a/crypto/src/x509/X509CertificatePair.cs b/src/BouncyCastle/x509/X509CertificatePair.cs similarity index 100% rename from crypto/src/x509/X509CertificatePair.cs rename to src/BouncyCastle/x509/X509CertificatePair.cs diff --git a/crypto/src/x509/X509CertificateParser.cs b/src/BouncyCastle/x509/X509CertificateParser.cs similarity index 100% rename from crypto/src/x509/X509CertificateParser.cs rename to src/BouncyCastle/x509/X509CertificateParser.cs diff --git a/crypto/src/x509/X509Crl.cs b/src/BouncyCastle/x509/X509Crl.cs similarity index 100% rename from crypto/src/x509/X509Crl.cs rename to src/BouncyCastle/x509/X509Crl.cs diff --git a/crypto/src/x509/X509CrlEntry.cs b/src/BouncyCastle/x509/X509CrlEntry.cs similarity index 100% rename from crypto/src/x509/X509CrlEntry.cs rename to src/BouncyCastle/x509/X509CrlEntry.cs diff --git a/crypto/src/x509/X509CrlParser.cs b/src/BouncyCastle/x509/X509CrlParser.cs similarity index 100% rename from crypto/src/x509/X509CrlParser.cs rename to src/BouncyCastle/x509/X509CrlParser.cs diff --git a/crypto/src/x509/X509ExtensionBase.cs b/src/BouncyCastle/x509/X509ExtensionBase.cs similarity index 100% rename from crypto/src/x509/X509ExtensionBase.cs rename to src/BouncyCastle/x509/X509ExtensionBase.cs diff --git a/crypto/src/x509/X509KeyUsage.cs b/src/BouncyCastle/x509/X509KeyUsage.cs similarity index 100% rename from crypto/src/x509/X509KeyUsage.cs rename to src/BouncyCastle/x509/X509KeyUsage.cs diff --git a/crypto/src/x509/X509SignatureUtil.cs b/src/BouncyCastle/x509/X509SignatureUtil.cs similarity index 100% rename from crypto/src/x509/X509SignatureUtil.cs rename to src/BouncyCastle/x509/X509SignatureUtil.cs diff --git a/crypto/src/x509/X509Utilities.cs b/src/BouncyCastle/x509/X509Utilities.cs similarity index 100% rename from crypto/src/x509/X509Utilities.cs rename to src/BouncyCastle/x509/X509Utilities.cs diff --git a/crypto/src/x509/X509V1CertificateGenerator.cs b/src/BouncyCastle/x509/X509V1CertificateGenerator.cs similarity index 100% rename from crypto/src/x509/X509V1CertificateGenerator.cs rename to src/BouncyCastle/x509/X509V1CertificateGenerator.cs diff --git a/crypto/src/x509/X509V2AttributeCertificate.cs b/src/BouncyCastle/x509/X509V2AttributeCertificate.cs similarity index 100% rename from crypto/src/x509/X509V2AttributeCertificate.cs rename to src/BouncyCastle/x509/X509V2AttributeCertificate.cs diff --git a/crypto/src/x509/X509V2AttributeCertificateGenerator.cs b/src/BouncyCastle/x509/X509V2AttributeCertificateGenerator.cs similarity index 100% rename from crypto/src/x509/X509V2AttributeCertificateGenerator.cs rename to src/BouncyCastle/x509/X509V2AttributeCertificateGenerator.cs diff --git a/crypto/src/x509/X509V2CRLGenerator.cs b/src/BouncyCastle/x509/X509V2CRLGenerator.cs similarity index 100% rename from crypto/src/x509/X509V2CRLGenerator.cs rename to src/BouncyCastle/x509/X509V2CRLGenerator.cs diff --git a/crypto/src/x509/X509V3CertificateGenerator.cs b/src/BouncyCastle/x509/X509V3CertificateGenerator.cs similarity index 100% rename from crypto/src/x509/X509V3CertificateGenerator.cs rename to src/BouncyCastle/x509/X509V3CertificateGenerator.cs diff --git a/crypto/src/x509/extension/AuthorityKeyIdentifierStructure.cs b/src/BouncyCastle/x509/extension/AuthorityKeyIdentifierStructure.cs similarity index 100% rename from crypto/src/x509/extension/AuthorityKeyIdentifierStructure.cs rename to src/BouncyCastle/x509/extension/AuthorityKeyIdentifierStructure.cs diff --git a/crypto/src/x509/extension/SubjectKeyIdentifierStructure.cs b/src/BouncyCastle/x509/extension/SubjectKeyIdentifierStructure.cs similarity index 100% rename from crypto/src/x509/extension/SubjectKeyIdentifierStructure.cs rename to src/BouncyCastle/x509/extension/SubjectKeyIdentifierStructure.cs diff --git a/crypto/src/x509/extension/X509ExtensionUtil.cs b/src/BouncyCastle/x509/extension/X509ExtensionUtil.cs similarity index 100% rename from crypto/src/x509/extension/X509ExtensionUtil.cs rename to src/BouncyCastle/x509/extension/X509ExtensionUtil.cs diff --git a/crypto/src/x509/store/IX509Selector.cs b/src/BouncyCastle/x509/store/IX509Selector.cs similarity index 100% rename from crypto/src/x509/store/IX509Selector.cs rename to src/BouncyCastle/x509/store/IX509Selector.cs diff --git a/crypto/src/x509/store/IX509Store.cs b/src/BouncyCastle/x509/store/IX509Store.cs similarity index 100% rename from crypto/src/x509/store/IX509Store.cs rename to src/BouncyCastle/x509/store/IX509Store.cs diff --git a/crypto/src/x509/store/IX509StoreParameters.cs b/src/BouncyCastle/x509/store/IX509StoreParameters.cs similarity index 100% rename from crypto/src/x509/store/IX509StoreParameters.cs rename to src/BouncyCastle/x509/store/IX509StoreParameters.cs diff --git a/crypto/src/x509/store/NoSuchStoreException.cs b/src/BouncyCastle/x509/store/NoSuchStoreException.cs similarity index 100% rename from crypto/src/x509/store/NoSuchStoreException.cs rename to src/BouncyCastle/x509/store/NoSuchStoreException.cs diff --git a/crypto/src/x509/store/X509AttrCertStoreSelector.cs b/src/BouncyCastle/x509/store/X509AttrCertStoreSelector.cs similarity index 100% rename from crypto/src/x509/store/X509AttrCertStoreSelector.cs rename to src/BouncyCastle/x509/store/X509AttrCertStoreSelector.cs diff --git a/crypto/src/x509/store/X509CertPairStoreSelector.cs b/src/BouncyCastle/x509/store/X509CertPairStoreSelector.cs similarity index 100% rename from crypto/src/x509/store/X509CertPairStoreSelector.cs rename to src/BouncyCastle/x509/store/X509CertPairStoreSelector.cs diff --git a/crypto/src/x509/store/X509CertStoreSelector.cs b/src/BouncyCastle/x509/store/X509CertStoreSelector.cs similarity index 100% rename from crypto/src/x509/store/X509CertStoreSelector.cs rename to src/BouncyCastle/x509/store/X509CertStoreSelector.cs diff --git a/crypto/src/x509/store/X509CollectionStore.cs b/src/BouncyCastle/x509/store/X509CollectionStore.cs similarity index 100% rename from crypto/src/x509/store/X509CollectionStore.cs rename to src/BouncyCastle/x509/store/X509CollectionStore.cs diff --git a/crypto/src/x509/store/X509CollectionStoreParameters.cs b/src/BouncyCastle/x509/store/X509CollectionStoreParameters.cs similarity index 100% rename from crypto/src/x509/store/X509CollectionStoreParameters.cs rename to src/BouncyCastle/x509/store/X509CollectionStoreParameters.cs diff --git a/crypto/src/x509/store/X509CrlStoreSelector.cs b/src/BouncyCastle/x509/store/X509CrlStoreSelector.cs similarity index 100% rename from crypto/src/x509/store/X509CrlStoreSelector.cs rename to src/BouncyCastle/x509/store/X509CrlStoreSelector.cs diff --git a/crypto/src/x509/store/X509StoreException.cs b/src/BouncyCastle/x509/store/X509StoreException.cs similarity index 100% rename from crypto/src/x509/store/X509StoreException.cs rename to src/BouncyCastle/x509/store/X509StoreException.cs diff --git a/crypto/src/x509/store/X509StoreFactory.cs b/src/BouncyCastle/x509/store/X509StoreFactory.cs similarity index 100% rename from crypto/src/x509/store/X509StoreFactory.cs rename to src/BouncyCastle/x509/store/X509StoreFactory.cs diff --git a/test/Crypto.NetSdk.NUnitTest/Crypto.NetSdk.NUnitTest.csproj b/test/Crypto.NetSdk.NUnitTest/Crypto.NetSdk.NUnitTest.csproj new file mode 100644 index 0000000000..bebecfffc5 --- /dev/null +++ b/test/Crypto.NetSdk.NUnitTest/Crypto.NetSdk.NUnitTest.csproj @@ -0,0 +1,35 @@ + + + + netcoreapp2.0 + false + TRACE;LIB + false + false + 1701;1702;0618 + + + + 1701;1702;0618;0672 + + + + + + + + + + + %(RecursiveDir)%(Filename)%(Extension) + + + %(RecursiveDir)%(Filename)%(Extension) + + + + + + + + \ No newline at end of file diff --git a/crypto/test/data/PKITS/README.txt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/README.txt similarity index 100% rename from crypto/test/data/PKITS/README.txt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/README.txt diff --git a/crypto/test/data/PKITS/certs/AllCertificatesNoPoliciesTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesNoPoliciesTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/AllCertificatesNoPoliciesTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesNoPoliciesTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/AllCertificatesSamePoliciesTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesSamePoliciesTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/AllCertificatesSamePoliciesTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesSamePoliciesTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/AllCertificatesSamePoliciesTest13EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesSamePoliciesTest13EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/AllCertificatesSamePoliciesTest13EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesSamePoliciesTest13EE.crt diff --git a/crypto/test/data/PKITS/certs/AllCertificatesanyPolicyTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesanyPolicyTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/AllCertificatesanyPolicyTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AllCertificatesanyPolicyTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/AnyPolicyTest14EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AnyPolicyTest14EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/AnyPolicyTest14EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/AnyPolicyTest14EE.crt diff --git a/crypto/test/data/PKITS/certs/BadCRLIssuerNameCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadCRLIssuerNameCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BadCRLIssuerNameCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadCRLIssuerNameCACert.crt diff --git a/crypto/test/data/PKITS/certs/BadCRLSignatureCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadCRLSignatureCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BadCRLSignatureCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadCRLSignatureCACert.crt diff --git a/crypto/test/data/PKITS/certs/BadSignedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadSignedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BadSignedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadSignedCACert.crt diff --git a/crypto/test/data/PKITS/certs/BadnotAfterDateCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadnotAfterDateCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BadnotAfterDateCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadnotAfterDateCACert.crt diff --git a/crypto/test/data/PKITS/certs/BadnotBeforeDateCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadnotBeforeDateCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BadnotBeforeDateCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BadnotBeforeDateCACert.crt diff --git a/crypto/test/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCACert.crt diff --git a/crypto/test/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCRLCert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCRLCert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCRLCert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedCRLSigningKeyCRLCert.crt diff --git a/crypto/test/data/PKITS/certs/BasicSelfIssuedNewKeyCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedNewKeyCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BasicSelfIssuedNewKeyCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedNewKeyCACert.crt diff --git a/crypto/test/data/PKITS/certs/BasicSelfIssuedNewKeyOldWithNewCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedNewKeyOldWithNewCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BasicSelfIssuedNewKeyOldWithNewCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedNewKeyOldWithNewCACert.crt diff --git a/crypto/test/data/PKITS/certs/BasicSelfIssuedOldKeyCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedOldKeyCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BasicSelfIssuedOldKeyCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedOldKeyCACert.crt diff --git a/crypto/test/data/PKITS/certs/BasicSelfIssuedOldKeyNewWithOldCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedOldKeyNewWithOldCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/BasicSelfIssuedOldKeyNewWithOldCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/BasicSelfIssuedOldKeyNewWithOldCACert.crt diff --git a/crypto/test/data/PKITS/certs/CPSPointerQualifierTest20EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/CPSPointerQualifierTest20EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/CPSPointerQualifierTest20EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/CPSPointerQualifierTest20EE.crt diff --git a/crypto/test/data/PKITS/certs/DSACACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DSACACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DSACACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DSACACert.crt diff --git a/crypto/test/data/PKITS/certs/DSAParametersInheritedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DSAParametersInheritedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DSAParametersInheritedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DSAParametersInheritedCACert.crt diff --git a/crypto/test/data/PKITS/certs/DifferentPoliciesTest12EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest12EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DifferentPoliciesTest12EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest12EE.crt diff --git a/crypto/test/data/PKITS/certs/DifferentPoliciesTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DifferentPoliciesTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/DifferentPoliciesTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DifferentPoliciesTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/DifferentPoliciesTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DifferentPoliciesTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/DifferentPoliciesTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DifferentPoliciesTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/DifferentPoliciesTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DifferentPoliciesTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/DifferentPoliciesTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/DifferentPoliciesTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/DifferentPoliciesTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/GeneralizedTimeCRLnextUpdateCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GeneralizedTimeCRLnextUpdateCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/GeneralizedTimeCRLnextUpdateCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GeneralizedTimeCRLnextUpdateCACert.crt diff --git a/crypto/test/data/PKITS/certs/GoodCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GoodCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/GoodCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GoodCACert.crt diff --git a/crypto/test/data/PKITS/certs/GoodsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GoodsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/GoodsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GoodsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/GoodsubCAPanyPolicyMapping1to2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GoodsubCAPanyPolicyMapping1to2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/GoodsubCAPanyPolicyMapping1to2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/GoodsubCAPanyPolicyMapping1to2CACert.crt diff --git a/crypto/test/data/PKITS/certs/InvalidBadCRLIssuerNameTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBadCRLIssuerNameTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidBadCRLIssuerNameTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBadCRLIssuerNameTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidBadCRLSignatureTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBadCRLSignatureTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidBadCRLSignatureTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBadCRLSignatureTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedCRLSigningKeyTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedNewWithOldTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedNewWithOldTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedNewWithOldTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedNewWithOldTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedOldWithNewTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedOldWithNewTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidBasicSelfIssuedOldWithNewTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidBasicSelfIssuedOldWithNewTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidCASignatureTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidCASignatureTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidCASignatureTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidCASignatureTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidCAnotAfterDateTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidCAnotAfterDateTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidCAnotAfterDateTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidCAnotAfterDateTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidCAnotBeforeDateTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidCAnotBeforeDateTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidCAnotBeforeDateTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidCAnotBeforeDateTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNSnameConstraintsTest31EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNSnameConstraintsTest31EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNSnameConstraintsTest31EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNSnameConstraintsTest31EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNSnameConstraintsTest33EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNSnameConstraintsTest33EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNSnameConstraintsTest33EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNSnameConstraintsTest33EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNSnameConstraintsTest38EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNSnameConstraintsTest38EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNSnameConstraintsTest38EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNSnameConstraintsTest38EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest28EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest28EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest28EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest28EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest29EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest29EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest29EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNandRFC822nameConstraintsTest29EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest12EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest12EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest12EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest12EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest13EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest13EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest13EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest13EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest15EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest15EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest15EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest15EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest16EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest16EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest16EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest16EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest17EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest17EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest17EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest17EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest20EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest20EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest20EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest20EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDNnameConstraintsTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDNnameConstraintsTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidDSASignatureTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDSASignatureTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidDSASignatureTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidDSASignatureTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidEESignatureTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidEESignatureTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidEESignatureTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidEESignatureTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidEEnotAfterDateTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidEEnotAfterDateTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidEEnotAfterDateTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidEEnotAfterDateTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidEEnotBeforeDateTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidEEnotBeforeDateTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidEEnotBeforeDateTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidEEnotBeforeDateTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidIDPwithindirectCRLTest23EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidIDPwithindirectCRLTest23EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidIDPwithindirectCRLTest23EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidIDPwithindirectCRLTest23EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidIDPwithindirectCRLTest26EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidIDPwithindirectCRLTest26EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidIDPwithindirectCRLTest26EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidIDPwithindirectCRLTest26EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidLongSerialNumberTest18EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidLongSerialNumberTest18EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidLongSerialNumberTest18EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidLongSerialNumberTest18EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidMappingFromanyPolicyTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMappingFromanyPolicyTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidMappingFromanyPolicyTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMappingFromanyPolicyTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidMappingToanyPolicyTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMappingToanyPolicyTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidMappingToanyPolicyTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMappingToanyPolicyTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidMissingCRLTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMissingCRLTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidMissingCRLTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMissingCRLTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidMissingbasicConstraintsTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMissingbasicConstraintsTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidMissingbasicConstraintsTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidMissingbasicConstraintsTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidNameChainingOrderTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidNameChainingOrderTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidNameChainingOrderTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidNameChainingOrderTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidNameChainingTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidNameChainingTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidNameChainingTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidNameChainingTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidNegativeSerialNumberTest15EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidNegativeSerialNumberTest15EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidNegativeSerialNumberTest15EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidNegativeSerialNumberTest15EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidOldCRLnextUpdateTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidOldCRLnextUpdateTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidOldCRLnextUpdateTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidOldCRLnextUpdateTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidPolicyMappingTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidPolicyMappingTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidPolicyMappingTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidPolicyMappingTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidPolicyMappingTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidPolicyMappingTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidPolicyMappingTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidPolicyMappingTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidPolicyMappingTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidPolicyMappingTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidPolicyMappingTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidPolicyMappingTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidRFC822nameConstraintsTest22EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRFC822nameConstraintsTest22EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidRFC822nameConstraintsTest22EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRFC822nameConstraintsTest22EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidRFC822nameConstraintsTest24EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRFC822nameConstraintsTest24EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidRFC822nameConstraintsTest24EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRFC822nameConstraintsTest24EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidRFC822nameConstraintsTest26EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRFC822nameConstraintsTest26EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidRFC822nameConstraintsTest26EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRFC822nameConstraintsTest26EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidRevokedCATest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRevokedCATest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidRevokedCATest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRevokedCATest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidRevokedEETest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRevokedEETest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidRevokedEETest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidRevokedEETest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitAnyPolicyTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedinhibitPolicyMappingTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedpathLenConstraintTest16EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedpathLenConstraintTest16EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedpathLenConstraintTest16EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedpathLenConstraintTest16EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSelfIssuedrequireExplicitPolicyTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest20EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest20EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest20EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest20EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest21EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest21EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest21EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidSeparateCertificateandCRLKeysTest21EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidURInameConstraintsTest35EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidURInameConstraintsTest35EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidURInameConstraintsTest35EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidURInameConstraintsTest35EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidURInameConstraintsTest37EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidURInameConstraintsTest37EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidURInameConstraintsTest37EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidURInameConstraintsTest37EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidUnknownCRLEntryExtensionTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCRLEntryExtensionTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidUnknownCRLEntryExtensionTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCRLEntryExtensionTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidUnknownCRLExtensionTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCRLExtensionTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidUnknownCRLExtensionTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCRLExtensionTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidUnknownCRLExtensionTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCRLExtensionTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidUnknownCRLExtensionTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCRLExtensionTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidUnknownCriticalCertificateExtensionTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCriticalCertificateExtensionTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidUnknownCriticalCertificateExtensionTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidUnknownCriticalCertificateExtensionTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidWrongCRLTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidWrongCRLTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidWrongCRLTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidWrongCRLTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidcAFalseTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcAFalseTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidcAFalseTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcAFalseTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidcAFalseTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcAFalseTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidcAFalseTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcAFalseTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidcRLIssuerTest27EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest27EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidcRLIssuerTest27EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest27EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidcRLIssuerTest31EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest31EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidcRLIssuerTest31EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest31EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidcRLIssuerTest32EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest32EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidcRLIssuerTest32EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest32EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidcRLIssuerTest34EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest34EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidcRLIssuerTest34EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest34EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidcRLIssuerTest35EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest35EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidcRLIssuerTest35EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidcRLIssuerTest35EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddeltaCRLIndicatorNoBaseTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLIndicatorNoBaseTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddeltaCRLIndicatorNoBaseTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLIndicatorNoBaseTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddeltaCRLTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddeltaCRLTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddeltaCRLTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddeltaCRLTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddeltaCRLTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddeltaCRLTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddeltaCRLTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddeltaCRLTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddeltaCRLTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddeltaCRLTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddeltaCRLTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddistributionPointTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddistributionPointTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddistributionPointTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddistributionPointTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddistributionPointTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddistributionPointTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddistributionPointTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddistributionPointTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/InvaliddistributionPointTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvaliddistributionPointTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvaliddistributionPointTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitAnyPolicyTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitAnyPolicyTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidinhibitPolicyMappingTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidinhibitPolicyMappingTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidkeyUsageCriticalcRLSignFalseTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageCriticalcRLSignFalseTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidkeyUsageCriticalcRLSignFalseTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageCriticalcRLSignFalseTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageCriticalkeyCertSignFalseTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageNotCriticalcRLSignFalseTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidkeyUsageNotCriticalkeyCertSignFalseTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlyContainsAttributeCertsTest14EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlyContainsAttributeCertsTest14EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlyContainsAttributeCertsTest14EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlyContainsAttributeCertsTest14EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlyContainsCACertsTest12EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlyContainsCACertsTest12EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlyContainsCACertsTest12EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlyContainsCACertsTest12EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlyContainsUserCertsTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlyContainsUserCertsTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlyContainsUserCertsTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlyContainsUserCertsTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest15EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest15EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest15EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest15EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest16EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest16EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest16EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest16EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest17EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest17EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest17EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest17EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest20EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest20EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest20EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest20EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest21EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest21EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidonlySomeReasonsTest21EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidonlySomeReasonsTest21EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest12EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest12EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest12EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest12EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidpathLenConstraintTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidpathLenConstraintTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/Invalidpre2000CRLnextUpdateTest12EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Invalidpre2000CRLnextUpdateTest12EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/Invalidpre2000CRLnextUpdateTest12EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Invalidpre2000CRLnextUpdateTest12EE.crt diff --git a/crypto/test/data/PKITS/certs/Invalidpre2000UTCEEnotAfterDateTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Invalidpre2000UTCEEnotAfterDateTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/Invalidpre2000UTCEEnotAfterDateTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Invalidpre2000UTCEEnotAfterDateTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidrequireExplicitPolicyTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidrequireExplicitPolicyTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidrequireExplicitPolicyTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidrequireExplicitPolicyTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/InvalidrequireExplicitPolicyTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidrequireExplicitPolicyTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/InvalidrequireExplicitPolicyTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/InvalidrequireExplicitPolicyTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/LongSerialNumberCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/LongSerialNumberCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/LongSerialNumberCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/LongSerialNumberCACert.crt diff --git a/crypto/test/data/PKITS/certs/Mapping1to2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Mapping1to2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/Mapping1to2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Mapping1to2CACert.crt diff --git a/crypto/test/data/PKITS/certs/MappingFromanyPolicyCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/MappingFromanyPolicyCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/MappingFromanyPolicyCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/MappingFromanyPolicyCACert.crt diff --git a/crypto/test/data/PKITS/certs/MappingToanyPolicyCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/MappingToanyPolicyCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/MappingToanyPolicyCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/MappingToanyPolicyCACert.crt diff --git a/crypto/test/data/PKITS/certs/MissingbasicConstraintsCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/MissingbasicConstraintsCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/MissingbasicConstraintsCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/MissingbasicConstraintsCACert.crt diff --git a/crypto/test/data/PKITS/certs/NameOrderingCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NameOrderingCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/NameOrderingCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NameOrderingCACert.crt diff --git a/crypto/test/data/PKITS/certs/NegativeSerialNumberCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NegativeSerialNumberCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/NegativeSerialNumberCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NegativeSerialNumberCACert.crt diff --git a/crypto/test/data/PKITS/certs/NoCRLCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NoCRLCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/NoCRLCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NoCRLCACert.crt diff --git a/crypto/test/data/PKITS/certs/NoPoliciesCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NoPoliciesCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/NoPoliciesCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NoPoliciesCACert.crt diff --git a/crypto/test/data/PKITS/certs/NoissuingDistributionPointCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NoissuingDistributionPointCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/NoissuingDistributionPointCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/NoissuingDistributionPointCACert.crt diff --git a/crypto/test/data/PKITS/certs/OldCRLnextUpdateCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/OldCRLnextUpdateCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/OldCRLnextUpdateCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/OldCRLnextUpdateCACert.crt diff --git a/crypto/test/data/PKITS/certs/OverlappingPoliciesTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/OverlappingPoliciesTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/OverlappingPoliciesTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/OverlappingPoliciesTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/P12Mapping1to3CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P12Mapping1to3CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/P12Mapping1to3CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P12Mapping1to3CACert.crt diff --git a/crypto/test/data/PKITS/certs/P12Mapping1to3subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P12Mapping1to3subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/P12Mapping1to3subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P12Mapping1to3subCACert.crt diff --git a/crypto/test/data/PKITS/certs/P12Mapping1to3subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P12Mapping1to3subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/P12Mapping1to3subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P12Mapping1to3subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/P1Mapping1to234CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P1Mapping1to234CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/P1Mapping1to234CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P1Mapping1to234CACert.crt diff --git a/crypto/test/data/PKITS/certs/P1Mapping1to234subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P1Mapping1to234subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/P1Mapping1to234subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P1Mapping1to234subCACert.crt diff --git a/crypto/test/data/PKITS/certs/P1anyPolicyMapping1to2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P1anyPolicyMapping1to2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/P1anyPolicyMapping1to2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/P1anyPolicyMapping1to2CACert.crt diff --git a/crypto/test/data/PKITS/certs/PanyPolicyMapping1to2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PanyPolicyMapping1to2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PanyPolicyMapping1to2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PanyPolicyMapping1to2CACert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP1234CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP1234CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP1234CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP1234CACert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP1234subCAP123Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP1234subCAP123Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP1234subCAP123Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP1234subCAP123Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP1234subsubCAP123P12Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP1234subsubCAP123P12Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP1234subsubCAP123P12Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP1234subsubCAP123P12Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP123CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP123CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123CACert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP123subCAP12Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subCAP12Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP123subCAP12Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subCAP12Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP123subsubCAP12P1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subsubCAP12P1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP123subsubCAP12P1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subsubCAP12P1Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP123subsubCAP12P2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subsubCAP12P2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP123subsubCAP12P2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subsubCAP12P2Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP123subsubsubCAP12P2P1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subsubsubCAP12P2P1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP123subsubsubCAP12P2P1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP123subsubsubCAP12P2P1Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP12CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP12CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP12CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP12CACert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP12subCAP1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP12subCAP1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP12subCAP1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP12subCAP1Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP12subsubCAP1P2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP12subsubCAP1P2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP12subsubCAP1P2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP12subsubCAP1P2Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP2subCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP2subCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP2subCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP2subCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP2subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP2subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP2subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP2subCACert.crt diff --git a/crypto/test/data/PKITS/certs/PoliciesP3CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP3CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/PoliciesP3CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/PoliciesP3CACert.crt diff --git a/crypto/test/data/PKITS/certs/RFC3280MandatoryAttributeTypesCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RFC3280MandatoryAttributeTypesCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/RFC3280MandatoryAttributeTypesCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RFC3280MandatoryAttributeTypesCACert.crt diff --git a/crypto/test/data/PKITS/certs/RFC3280OptionalAttributeTypesCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RFC3280OptionalAttributeTypesCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/RFC3280OptionalAttributeTypesCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RFC3280OptionalAttributeTypesCACert.crt diff --git a/crypto/test/data/PKITS/certs/RevokedsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RevokedsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/RevokedsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RevokedsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/RolloverfromPrintableStringtoUTF8StringCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RolloverfromPrintableStringtoUTF8StringCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/RolloverfromPrintableStringtoUTF8StringCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/RolloverfromPrintableStringtoUTF8StringCACert.crt diff --git a/crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CRLSigningCert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CRLSigningCert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CRLSigningCert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CRLSigningCert.crt diff --git a/crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCA2CertificateSigningCACert.crt diff --git a/crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCRLSigningCert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCRLSigningCert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCRLSigningCert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCRLSigningCert.crt diff --git a/crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCertificateSigningCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCertificateSigningCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/SeparateCertificateandCRLKeysCertificateSigningCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/SeparateCertificateandCRLKeysCertificateSigningCACert.crt diff --git a/crypto/test/data/PKITS/certs/TrustAnchorRootCertificate.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/TrustAnchorRootCertificate.crt similarity index 100% rename from crypto/test/data/PKITS/certs/TrustAnchorRootCertificate.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/TrustAnchorRootCertificate.crt diff --git a/crypto/test/data/PKITS/certs/TwoCRLsCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/TwoCRLsCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/TwoCRLsCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/TwoCRLsCACert.crt diff --git a/crypto/test/data/PKITS/certs/UIDCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UIDCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UIDCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UIDCACert.crt diff --git a/crypto/test/data/PKITS/certs/UTF8StringCaseInsensitiveMatchCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UTF8StringCaseInsensitiveMatchCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UTF8StringCaseInsensitiveMatchCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UTF8StringCaseInsensitiveMatchCACert.crt diff --git a/crypto/test/data/PKITS/certs/UTF8StringEncodedNamesCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UTF8StringEncodedNamesCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UTF8StringEncodedNamesCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UTF8StringEncodedNamesCACert.crt diff --git a/crypto/test/data/PKITS/certs/UnknownCRLEntryExtensionCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UnknownCRLEntryExtensionCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UnknownCRLEntryExtensionCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UnknownCRLEntryExtensionCACert.crt diff --git a/crypto/test/data/PKITS/certs/UnknownCRLExtensionCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UnknownCRLExtensionCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UnknownCRLExtensionCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UnknownCRLExtensionCACert.crt diff --git a/crypto/test/data/PKITS/certs/UserNoticeQualifierTest15EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest15EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UserNoticeQualifierTest15EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest15EE.crt diff --git a/crypto/test/data/PKITS/certs/UserNoticeQualifierTest16EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest16EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UserNoticeQualifierTest16EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest16EE.crt diff --git a/crypto/test/data/PKITS/certs/UserNoticeQualifierTest17EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest17EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UserNoticeQualifierTest17EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest17EE.crt diff --git a/crypto/test/data/PKITS/certs/UserNoticeQualifierTest18EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest18EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UserNoticeQualifierTest18EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest18EE.crt diff --git a/crypto/test/data/PKITS/certs/UserNoticeQualifierTest19EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest19EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/UserNoticeQualifierTest19EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/UserNoticeQualifierTest19EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidBasicSelfIssuedCRLSigningKeyTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedCRLSigningKeyTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidBasicSelfIssuedCRLSigningKeyTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedCRLSigningKeyTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedNewWithOldTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidBasicSelfIssuedOldWithNewTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedOldWithNewTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidBasicSelfIssuedOldWithNewTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidBasicSelfIssuedOldWithNewTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidCertificatePathTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidCertificatePathTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidCertificatePathTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidCertificatePathTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNSnameConstraintsTest30EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNSnameConstraintsTest30EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNSnameConstraintsTest30EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNSnameConstraintsTest30EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNSnameConstraintsTest32EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNSnameConstraintsTest32EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNSnameConstraintsTest32EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNSnameConstraintsTest32EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNandRFC822nameConstraintsTest27EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNandRFC822nameConstraintsTest27EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNandRFC822nameConstraintsTest27EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNandRFC822nameConstraintsTest27EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest14EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest14EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest14EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest14EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest18EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest18EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest18EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest18EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest19EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest19EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest19EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest19EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDNnameConstraintsTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDNnameConstraintsTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDSAParameterInheritanceTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDSAParameterInheritanceTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDSAParameterInheritanceTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDSAParameterInheritanceTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidDSASignaturesTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDSASignaturesTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidDSASignaturesTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidDSASignaturesTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidGeneralizedTimeCRLnextUpdateTest13EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidGeneralizedTimeCRLnextUpdateTest13EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidGeneralizedTimeCRLnextUpdateTest13EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidGeneralizedTimeCRLnextUpdateTest13EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidGeneralizedTimenotAfterDateTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidGeneralizedTimenotAfterDateTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidGeneralizedTimenotAfterDateTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidGeneralizedTimenotAfterDateTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidGeneralizedTimenotBeforeDateTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidGeneralizedTimenotBeforeDateTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidGeneralizedTimenotBeforeDateTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidGeneralizedTimenotBeforeDateTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidIDPwithindirectCRLTest22EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidIDPwithindirectCRLTest22EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidIDPwithindirectCRLTest22EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidIDPwithindirectCRLTest22EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidIDPwithindirectCRLTest24EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidIDPwithindirectCRLTest24EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidIDPwithindirectCRLTest24EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidIDPwithindirectCRLTest24EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidIDPwithindirectCRLTest25EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidIDPwithindirectCRLTest25EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidIDPwithindirectCRLTest25EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidIDPwithindirectCRLTest25EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidLongSerialNumberTest16EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidLongSerialNumberTest16EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidLongSerialNumberTest16EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidLongSerialNumberTest16EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidLongSerialNumberTest17EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidLongSerialNumberTest17EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidLongSerialNumberTest17EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidLongSerialNumberTest17EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidNameChainingCapitalizationTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameChainingCapitalizationTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidNameChainingCapitalizationTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameChainingCapitalizationTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidNameChainingWhitespaceTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameChainingWhitespaceTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidNameChainingWhitespaceTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameChainingWhitespaceTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidNameChainingWhitespaceTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameChainingWhitespaceTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidNameChainingWhitespaceTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameChainingWhitespaceTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidNameUIDsTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameUIDsTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidNameUIDsTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNameUIDsTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidNegativeSerialNumberTest14EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNegativeSerialNumberTest14EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidNegativeSerialNumberTest14EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNegativeSerialNumberTest14EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidNoissuingDistributionPointTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNoissuingDistributionPointTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidNoissuingDistributionPointTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidNoissuingDistributionPointTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest12EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest12EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest12EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest12EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest13EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest13EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest13EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest13EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest14EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest14EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest14EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest14EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidPolicyMappingTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidPolicyMappingTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidPolicyMappingTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidRFC3280MandatoryAttributeTypesTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC3280MandatoryAttributeTypesTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidRFC3280MandatoryAttributeTypesTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC3280MandatoryAttributeTypesTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidRFC3280OptionalAttributeTypesTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC3280OptionalAttributeTypesTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidRFC3280OptionalAttributeTypesTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC3280OptionalAttributeTypesTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidRFC822nameConstraintsTest21EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC822nameConstraintsTest21EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidRFC822nameConstraintsTest21EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC822nameConstraintsTest21EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidRFC822nameConstraintsTest23EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC822nameConstraintsTest23EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidRFC822nameConstraintsTest23EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC822nameConstraintsTest23EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidRFC822nameConstraintsTest25EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC822nameConstraintsTest25EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidRFC822nameConstraintsTest25EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRFC822nameConstraintsTest25EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidRolloverfromPrintableStringtoUTF8StringTest10EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedinhibitAnyPolicyTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidSelfIssuedinhibitPolicyMappingTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedinhibitPolicyMappingTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidSelfIssuedinhibitPolicyMappingTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedinhibitPolicyMappingTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest15EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest15EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest15EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest15EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest17EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest17EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest17EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedpathLenConstraintTest17EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidSelfIssuedrequireExplicitPolicyTest6EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedrequireExplicitPolicyTest6EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidSelfIssuedrequireExplicitPolicyTest6EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSelfIssuedrequireExplicitPolicyTest6EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidSeparateCertificateandCRLKeysTest19EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSeparateCertificateandCRLKeysTest19EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidSeparateCertificateandCRLKeysTest19EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidSeparateCertificateandCRLKeysTest19EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidTwoCRLsTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidTwoCRLsTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidTwoCRLsTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidTwoCRLsTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidURInameConstraintsTest34EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidURInameConstraintsTest34EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidURInameConstraintsTest34EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidURInameConstraintsTest34EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidURInameConstraintsTest36EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidURInameConstraintsTest36EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidURInameConstraintsTest36EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidURInameConstraintsTest36EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidUTF8StringCaseInsensitiveMatchTest11EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidUTF8StringCaseInsensitiveMatchTest11EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidUTF8StringCaseInsensitiveMatchTest11EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidUTF8StringCaseInsensitiveMatchTest11EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidUTF8StringEncodedNamesTest9EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidUTF8StringEncodedNamesTest9EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidUTF8StringEncodedNamesTest9EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidUTF8StringEncodedNamesTest9EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidUnknownNotCriticalCertificateExtensionTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidUnknownNotCriticalCertificateExtensionTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidUnknownNotCriticalCertificateExtensionTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidUnknownNotCriticalCertificateExtensionTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidbasicConstraintsNotCriticalTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidbasicConstraintsNotCriticalTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidbasicConstraintsNotCriticalTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidbasicConstraintsNotCriticalTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidcRLIssuerTest28EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest28EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidcRLIssuerTest28EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest28EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidcRLIssuerTest29EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest29EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidcRLIssuerTest29EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest29EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidcRLIssuerTest30EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest30EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidcRLIssuerTest30EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest30EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidcRLIssuerTest33EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest33EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidcRLIssuerTest33EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidcRLIssuerTest33EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddeltaCRLTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddeltaCRLTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddeltaCRLTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddeltaCRLTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddeltaCRLTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddeltaCRLTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddeltaCRLTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddeltaCRLTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddeltaCRLTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddistributionPointTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddistributionPointTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddistributionPointTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddistributionPointTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddistributionPointTest5EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest5EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddistributionPointTest5EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest5EE.crt diff --git a/crypto/test/data/PKITS/certs/ValiddistributionPointTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValiddistributionPointTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValiddistributionPointTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidinhibitAnyPolicyTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidinhibitAnyPolicyTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidinhibitAnyPolicyTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidinhibitAnyPolicyTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidinhibitPolicyMappingTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidinhibitPolicyMappingTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidinhibitPolicyMappingTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidinhibitPolicyMappingTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidinhibitPolicyMappingTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidinhibitPolicyMappingTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidinhibitPolicyMappingTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidinhibitPolicyMappingTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidkeyUsageNotCriticalTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidkeyUsageNotCriticalTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidkeyUsageNotCriticalTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidkeyUsageNotCriticalTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidonlyContainsCACertsTest13EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidonlyContainsCACertsTest13EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidonlyContainsCACertsTest13EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidonlyContainsCACertsTest13EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidonlySomeReasonsTest18EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidonlySomeReasonsTest18EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidonlySomeReasonsTest18EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidonlySomeReasonsTest18EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidonlySomeReasonsTest19EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidonlySomeReasonsTest19EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidonlySomeReasonsTest19EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidonlySomeReasonsTest19EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidpathLenConstraintTest13EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest13EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidpathLenConstraintTest13EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest13EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidpathLenConstraintTest14EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest14EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidpathLenConstraintTest14EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest14EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidpathLenConstraintTest7EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest7EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidpathLenConstraintTest7EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest7EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidpathLenConstraintTest8EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest8EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidpathLenConstraintTest8EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidpathLenConstraintTest8EE.crt diff --git a/crypto/test/data/PKITS/certs/Validpre2000UTCnotBeforeDateTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Validpre2000UTCnotBeforeDateTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/Validpre2000UTCnotBeforeDateTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/Validpre2000UTCnotBeforeDateTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidrequireExplicitPolicyTest1EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidrequireExplicitPolicyTest1EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidrequireExplicitPolicyTest1EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidrequireExplicitPolicyTest1EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidrequireExplicitPolicyTest2EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidrequireExplicitPolicyTest2EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidrequireExplicitPolicyTest2EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidrequireExplicitPolicyTest2EE.crt diff --git a/crypto/test/data/PKITS/certs/ValidrequireExplicitPolicyTest4EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidrequireExplicitPolicyTest4EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/ValidrequireExplicitPolicyTest4EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/ValidrequireExplicitPolicyTest4EE.crt diff --git a/crypto/test/data/PKITS/certs/WrongCRLCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/WrongCRLCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/WrongCRLCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/WrongCRLCACert.crt diff --git a/crypto/test/data/PKITS/certs/anyPolicyCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/anyPolicyCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/anyPolicyCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/anyPolicyCACert.crt diff --git a/crypto/test/data/PKITS/certs/basicConstraintsCriticalcAFalseCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/basicConstraintsCriticalcAFalseCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/basicConstraintsCriticalcAFalseCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/basicConstraintsCriticalcAFalseCACert.crt diff --git a/crypto/test/data/PKITS/certs/basicConstraintsNotCriticalCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/basicConstraintsNotCriticalCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/basicConstraintsNotCriticalCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/basicConstraintsNotCriticalCACert.crt diff --git a/crypto/test/data/PKITS/certs/basicConstraintsNotCriticalcAFalseCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/basicConstraintsNotCriticalcAFalseCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/basicConstraintsNotCriticalcAFalseCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/basicConstraintsNotCriticalcAFalseCACert.crt diff --git a/crypto/test/data/PKITS/certs/deltaCRLCA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLCA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/deltaCRLCA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLCA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/deltaCRLCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/deltaCRLCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/deltaCRLCA3Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLCA3Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/deltaCRLCA3Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLCA3Cert.crt diff --git a/crypto/test/data/PKITS/certs/deltaCRLIndicatorNoBaseCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLIndicatorNoBaseCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/deltaCRLIndicatorNoBaseCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/deltaCRLIndicatorNoBaseCACert.crt diff --git a/crypto/test/data/PKITS/certs/distributionPoint1CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/distributionPoint1CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/distributionPoint1CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/distributionPoint1CACert.crt diff --git a/crypto/test/data/PKITS/certs/distributionPoint2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/distributionPoint2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/distributionPoint2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/distributionPoint2CACert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA3Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA3Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA3Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA3Cert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA3cRLIssuerCert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA3cRLIssuerCert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA3cRLIssuerCert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA3cRLIssuerCert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA4Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA4Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA4Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA4Cert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA4cRLIssuerCert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA4cRLIssuerCert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA4cRLIssuerCert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA4cRLIssuerCert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA5Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA5Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA5Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA5Cert.crt diff --git a/crypto/test/data/PKITS/certs/indirectCRLCA6Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA6Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/indirectCRLCA6Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/indirectCRLCA6Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy0CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy0CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy0CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy0CACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy1CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy1CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1CACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedsubCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedsubCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedsubCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1SelfIssuedsubCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy1subCA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subCA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy1subCA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subCA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy1subCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy1subCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy1subCAIAP5Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subCAIAP5Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy1subCAIAP5Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subCAIAP5Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy1subsubCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subsubCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy1subsubCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy1subsubCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy5CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy5CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy5CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy5CACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy5subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy5subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy5subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy5subCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicy5subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy5subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicy5subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicy5subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitAnyPolicyTest3EE.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicyTest3EE.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitAnyPolicyTest3EE.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitAnyPolicyTest3EE.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping0CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping0CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping0CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping0CACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping0subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping0subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping0subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping0subCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12CACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subCAIPM5Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subCAIPM5Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subCAIPM5Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subCAIPM5Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subsubCAIPM5Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subsubCAIPM5Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P12subsubCAIPM5Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P12subsubCAIPM5Cert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1CACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1SelfIssuedsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1subCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping1P1subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping1P1subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping5CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping5CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5CACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping5subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping5subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5subCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping5subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping5subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/inhibitPolicyMapping5subsubsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5subsubsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/inhibitPolicyMapping5subsubsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/inhibitPolicyMapping5subsubsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/keyUsageCriticalcRLSignFalseCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageCriticalcRLSignFalseCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/keyUsageCriticalcRLSignFalseCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageCriticalcRLSignFalseCACert.crt diff --git a/crypto/test/data/PKITS/certs/keyUsageCriticalkeyCertSignFalseCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageCriticalkeyCertSignFalseCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/keyUsageCriticalkeyCertSignFalseCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageCriticalkeyCertSignFalseCACert.crt diff --git a/crypto/test/data/PKITS/certs/keyUsageNotCriticalCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageNotCriticalCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/keyUsageNotCriticalCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageNotCriticalCACert.crt diff --git a/crypto/test/data/PKITS/certs/keyUsageNotCriticalcRLSignFalseCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageNotCriticalcRLSignFalseCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/keyUsageNotCriticalcRLSignFalseCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageNotCriticalcRLSignFalseCACert.crt diff --git a/crypto/test/data/PKITS/certs/keyUsageNotCriticalkeyCertSignFalseCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageNotCriticalkeyCertSignFalseCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/keyUsageNotCriticalkeyCertSignFalseCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/keyUsageNotCriticalkeyCertSignFalseCACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN1CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN1CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN1SelfIssuedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1SelfIssuedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN1SelfIssuedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1SelfIssuedCACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN1subCA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1subCA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN1subCA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1subCA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN1subCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1subCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN1subCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1subCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN1subCA3Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1subCA3Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN1subCA3Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN1subCA3Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN2CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN3CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN3CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN3CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN3CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN3subCA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN3subCA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN3subCA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN3subCA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN3subCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN3subCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN3subCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN3subCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN4CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN4CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN4CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN4CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDN5CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN5CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDN5CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDN5CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDNS1CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDNS1CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDNS1CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDNS1CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsDNS2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDNS2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsDNS2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsDNS2CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsRFC822CA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsRFC822CA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsRFC822CA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsRFC822CA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsRFC822CA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsRFC822CA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsRFC822CA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsRFC822CA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsRFC822CA3Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsRFC822CA3Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsRFC822CA3Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsRFC822CA3Cert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsURI1CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsURI1CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsURI1CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsURI1CACert.crt diff --git a/crypto/test/data/PKITS/certs/nameConstraintsURI2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsURI2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/nameConstraintsURI2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/nameConstraintsURI2CACert.crt diff --git a/crypto/test/data/PKITS/certs/onlyContainsAttributeCertsCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlyContainsAttributeCertsCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/onlyContainsAttributeCertsCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlyContainsAttributeCertsCACert.crt diff --git a/crypto/test/data/PKITS/certs/onlyContainsCACertsCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlyContainsCACertsCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/onlyContainsCACertsCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlyContainsCACertsCACert.crt diff --git a/crypto/test/data/PKITS/certs/onlyContainsUserCertsCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlyContainsUserCertsCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/onlyContainsUserCertsCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlyContainsUserCertsCACert.crt diff --git a/crypto/test/data/PKITS/certs/onlySomeReasonsCA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/onlySomeReasonsCA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/onlySomeReasonsCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/onlySomeReasonsCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/onlySomeReasonsCA3Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA3Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/onlySomeReasonsCA3Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA3Cert.crt diff --git a/crypto/test/data/PKITS/certs/onlySomeReasonsCA4Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA4Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/onlySomeReasonsCA4Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/onlySomeReasonsCA4Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint0CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint0CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0CACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint0SelfIssuedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0SelfIssuedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint0SelfIssuedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0SelfIssuedCACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint0subCA2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0subCA2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint0subCA2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0subCA2Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint0subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint0subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint0subCACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint1CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint1CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1CACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint1SelfIssuedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1SelfIssuedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint1SelfIssuedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1SelfIssuedCACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint1SelfIssuedsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1SelfIssuedsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint1SelfIssuedsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1SelfIssuedsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint1subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint1subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint1subCACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6CACert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subCA0Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subCA0Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subCA0Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subCA0Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subCA1Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subCA1Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subCA1Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subCA1Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subCA4Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subCA4Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subCA4Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subCA4Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subsubCA00Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubCA00Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subsubCA00Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubCA00Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subsubCA11Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubCA11Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subsubCA11Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubCA11Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subsubCA41Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubCA41Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subsubCA41Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubCA41Cert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subsubsubCA11XCert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubsubCA11XCert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subsubsubCA11XCert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubsubCA11XCert.crt diff --git a/crypto/test/data/PKITS/certs/pathLenConstraint6subsubsubCA41XCert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubsubCA41XCert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pathLenConstraint6subsubsubCA41XCert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pathLenConstraint6subsubsubCA41XCert.crt diff --git a/crypto/test/data/PKITS/certs/pre2000CRLnextUpdateCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pre2000CRLnextUpdateCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/pre2000CRLnextUpdateCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/pre2000CRLnextUpdateCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy0CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy0CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0CACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy0subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy0subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0subCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy0subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy0subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy0subsubsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0subsubsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy0subsubsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy0subsubsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy10CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy10CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10CACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy10subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy10subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10subCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy10subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy10subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy10subsubsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10subsubsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy10subsubsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy10subsubsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy2CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy2CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2CACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy2SelfIssuedCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2SelfIssuedCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy2SelfIssuedCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2SelfIssuedCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy2SelfIssuedsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2SelfIssuedsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy2SelfIssuedsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2SelfIssuedsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy2subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy2subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy2subCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy4CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy4CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4CACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy4subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy4subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4subCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy4subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy4subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy4subsubsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4subsubsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy4subsubsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy4subsubsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy5CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy5CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5CACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy5subCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5subCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy5subCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5subCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy5subsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5subsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy5subsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5subsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy5subsubsubCACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5subsubsubCACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy5subsubsubCACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy5subsubsubCACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy7CACert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7CACert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy7CACert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7CACert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy7subCARE2Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7subCARE2Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy7subCARE2Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7subCARE2Cert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy7subsubCARE2RE4Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7subsubCARE2RE4Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy7subsubCARE2RE4Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7subsubCARE2RE4Cert.crt diff --git a/crypto/test/data/PKITS/certs/requireExplicitPolicy7subsubsubCARE2RE4Cert.crt b/test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7subsubsubCARE2RE4Cert.crt similarity index 100% rename from crypto/test/data/PKITS/certs/requireExplicitPolicy7subsubsubCARE2RE4Cert.crt rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/certs/requireExplicitPolicy7subsubsubCARE2RE4Cert.crt diff --git a/crypto/test/data/PKITS/crls/BadCRLIssuerNameCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadCRLIssuerNameCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BadCRLIssuerNameCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadCRLIssuerNameCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BadCRLSignatureCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadCRLSignatureCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BadCRLSignatureCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadCRLSignatureCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BadSignedCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadSignedCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BadSignedCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadSignedCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BadnotAfterDateCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadnotAfterDateCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BadnotAfterDateCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadnotAfterDateCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BadnotBeforeDateCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadnotBeforeDateCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BadnotBeforeDateCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BadnotBeforeDateCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedCRLSigningKeyCRLCertCRL.crl diff --git a/crypto/test/data/PKITS/crls/BasicSelfIssuedNewKeyCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedNewKeyCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BasicSelfIssuedNewKeyCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedNewKeyCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BasicSelfIssuedOldKeyCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedOldKeyCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BasicSelfIssuedOldKeyCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedOldKeyCACRL.crl diff --git a/crypto/test/data/PKITS/crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/BasicSelfIssuedOldKeySelfIssuedCertCRL.crl diff --git a/crypto/test/data/PKITS/crls/DSACACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/DSACACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/DSACACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/DSACACRL.crl diff --git a/crypto/test/data/PKITS/crls/DSAParametersInheritedCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/DSAParametersInheritedCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/DSAParametersInheritedCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/DSAParametersInheritedCACRL.crl diff --git a/crypto/test/data/PKITS/crls/GeneralizedTimeCRLnextUpdateCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GeneralizedTimeCRLnextUpdateCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/GeneralizedTimeCRLnextUpdateCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GeneralizedTimeCRLnextUpdateCACRL.crl diff --git a/crypto/test/data/PKITS/crls/GoodCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GoodCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/GoodCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GoodCACRL.crl diff --git a/crypto/test/data/PKITS/crls/GoodsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GoodsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/GoodsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GoodsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/GoodsubCAPanyPolicyMapping1to2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GoodsubCAPanyPolicyMapping1to2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/GoodsubCAPanyPolicyMapping1to2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/GoodsubCAPanyPolicyMapping1to2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/LongSerialNumberCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/LongSerialNumberCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/LongSerialNumberCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/LongSerialNumberCACRL.crl diff --git a/crypto/test/data/PKITS/crls/Mapping1to2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/Mapping1to2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/Mapping1to2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/Mapping1to2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/MappingFromanyPolicyCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/MappingFromanyPolicyCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/MappingFromanyPolicyCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/MappingFromanyPolicyCACRL.crl diff --git a/crypto/test/data/PKITS/crls/MappingToanyPolicyCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/MappingToanyPolicyCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/MappingToanyPolicyCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/MappingToanyPolicyCACRL.crl diff --git a/crypto/test/data/PKITS/crls/MissingbasicConstraintsCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/MissingbasicConstraintsCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/MissingbasicConstraintsCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/MissingbasicConstraintsCACRL.crl diff --git a/crypto/test/data/PKITS/crls/NameOrderCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NameOrderCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/NameOrderCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NameOrderCACRL.crl diff --git a/crypto/test/data/PKITS/crls/NegativeSerialNumberCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NegativeSerialNumberCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/NegativeSerialNumberCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NegativeSerialNumberCACRL.crl diff --git a/crypto/test/data/PKITS/crls/NoPoliciesCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NoPoliciesCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/NoPoliciesCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NoPoliciesCACRL.crl diff --git a/crypto/test/data/PKITS/crls/NoissuingDistributionPointCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NoissuingDistributionPointCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/NoissuingDistributionPointCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/NoissuingDistributionPointCACRL.crl diff --git a/crypto/test/data/PKITS/crls/OldCRLnextUpdateCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/OldCRLnextUpdateCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/OldCRLnextUpdateCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/OldCRLnextUpdateCACRL.crl diff --git a/crypto/test/data/PKITS/crls/P12Mapping1to3CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P12Mapping1to3CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/P12Mapping1to3CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P12Mapping1to3CACRL.crl diff --git a/crypto/test/data/PKITS/crls/P12Mapping1to3subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P12Mapping1to3subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/P12Mapping1to3subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P12Mapping1to3subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/P12Mapping1to3subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P12Mapping1to3subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/P12Mapping1to3subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P12Mapping1to3subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/P1Mapping1to234CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P1Mapping1to234CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/P1Mapping1to234CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P1Mapping1to234CACRL.crl diff --git a/crypto/test/data/PKITS/crls/P1Mapping1to234subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P1Mapping1to234subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/P1Mapping1to234subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P1Mapping1to234subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/P1anyPolicyMapping1to2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P1anyPolicyMapping1to2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/P1anyPolicyMapping1to2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/P1anyPolicyMapping1to2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/PanyPolicyMapping1to2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PanyPolicyMapping1to2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PanyPolicyMapping1to2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PanyPolicyMapping1to2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP1234CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP1234CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP1234CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP1234CACRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP1234subCAP123CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP1234subCAP123CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP1234subCAP123CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP1234subCAP123CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP1234subsubCAP123P12CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP1234subsubCAP123P12CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP1234subsubCAP123P12CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP1234subsubCAP123P12CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP123CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP123CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123CACRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP123subCAP12CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subCAP12CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP123subCAP12CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subCAP12CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP123subsubCAP12P1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subsubCAP12P1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP123subsubCAP12P1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subsubCAP12P1CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP123subsubCAP2P2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subsubCAP2P2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP123subsubCAP2P2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subsubCAP2P2CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP123subsubsubCAP12P2P1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subsubsubCAP12P2P1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP123subsubsubCAP12P2P1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP123subsubsubCAP12P2P1CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP12CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP12CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP12CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP12CACRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP12subCAP1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP12subCAP1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP12subCAP1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP12subCAP1CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP12subsubCAP1P2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP12subsubCAP1P2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP12subsubCAP1P2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP12subsubCAP1P2CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP2subCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP2subCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP2subCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP2subCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP2subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP2subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP2subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP2subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/PoliciesP3CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP3CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/PoliciesP3CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/PoliciesP3CACRL.crl diff --git a/crypto/test/data/PKITS/crls/RFC3280MandatoryAttributeTypesCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RFC3280MandatoryAttributeTypesCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/RFC3280MandatoryAttributeTypesCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RFC3280MandatoryAttributeTypesCACRL.crl diff --git a/crypto/test/data/PKITS/crls/RFC3280OptionalAttributeTypesCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RFC3280OptionalAttributeTypesCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/RFC3280OptionalAttributeTypesCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RFC3280OptionalAttributeTypesCACRL.crl diff --git a/crypto/test/data/PKITS/crls/RevokedsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RevokedsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/RevokedsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RevokedsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/RolloverfromPrintableStringtoUTF8StringCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RolloverfromPrintableStringtoUTF8StringCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/RolloverfromPrintableStringtoUTF8StringCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/RolloverfromPrintableStringtoUTF8StringCACRL.crl diff --git a/crypto/test/data/PKITS/crls/SeparateCertificateandCRLKeysCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/SeparateCertificateandCRLKeysCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/SeparateCertificateandCRLKeysCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/SeparateCertificateandCRLKeysCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/SeparateCertificateandCRLKeysCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/SeparateCertificateandCRLKeysCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/SeparateCertificateandCRLKeysCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/SeparateCertificateandCRLKeysCRL.crl diff --git a/crypto/test/data/PKITS/crls/TrustAnchorRootCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/TrustAnchorRootCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/TrustAnchorRootCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/TrustAnchorRootCRL.crl diff --git a/crypto/test/data/PKITS/crls/TwoCRLsCABadCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/TwoCRLsCABadCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/TwoCRLsCABadCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/TwoCRLsCABadCRL.crl diff --git a/crypto/test/data/PKITS/crls/TwoCRLsCAGoodCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/TwoCRLsCAGoodCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/TwoCRLsCAGoodCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/TwoCRLsCAGoodCRL.crl diff --git a/crypto/test/data/PKITS/crls/UIDCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UIDCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/UIDCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UIDCACRL.crl diff --git a/crypto/test/data/PKITS/crls/UTF8StringCaseInsensitiveMatchCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UTF8StringCaseInsensitiveMatchCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/UTF8StringCaseInsensitiveMatchCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UTF8StringCaseInsensitiveMatchCACRL.crl diff --git a/crypto/test/data/PKITS/crls/UTF8StringEncodedNamesCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UTF8StringEncodedNamesCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/UTF8StringEncodedNamesCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UTF8StringEncodedNamesCACRL.crl diff --git a/crypto/test/data/PKITS/crls/UnknownCRLEntryExtensionCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UnknownCRLEntryExtensionCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/UnknownCRLEntryExtensionCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UnknownCRLEntryExtensionCACRL.crl diff --git a/crypto/test/data/PKITS/crls/UnknownCRLExtensionCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UnknownCRLExtensionCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/UnknownCRLExtensionCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/UnknownCRLExtensionCACRL.crl diff --git a/crypto/test/data/PKITS/crls/WrongCRLCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/WrongCRLCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/WrongCRLCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/WrongCRLCACRL.crl diff --git a/crypto/test/data/PKITS/crls/anyPolicyCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/anyPolicyCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/anyPolicyCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/anyPolicyCACRL.crl diff --git a/crypto/test/data/PKITS/crls/basicConstraintsCriticalcAFalseCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/basicConstraintsCriticalcAFalseCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/basicConstraintsCriticalcAFalseCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/basicConstraintsCriticalcAFalseCACRL.crl diff --git a/crypto/test/data/PKITS/crls/basicConstraintsNotCriticalCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/basicConstraintsNotCriticalCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/basicConstraintsNotCriticalCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/basicConstraintsNotCriticalCACRL.crl diff --git a/crypto/test/data/PKITS/crls/basicConstraintsNotCriticalcAFalseCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/basicConstraintsNotCriticalcAFalseCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/basicConstraintsNotCriticalcAFalseCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/basicConstraintsNotCriticalcAFalseCACRL.crl diff --git a/crypto/test/data/PKITS/crls/deltaCRLCA1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/deltaCRLCA1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA1CRL.crl diff --git a/crypto/test/data/PKITS/crls/deltaCRLCA1deltaCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA1deltaCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/deltaCRLCA1deltaCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA1deltaCRL.crl diff --git a/crypto/test/data/PKITS/crls/deltaCRLCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/deltaCRLCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/deltaCRLCA2deltaCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA2deltaCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/deltaCRLCA2deltaCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA2deltaCRL.crl diff --git a/crypto/test/data/PKITS/crls/deltaCRLCA3CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA3CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/deltaCRLCA3CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA3CRL.crl diff --git a/crypto/test/data/PKITS/crls/deltaCRLCA3deltaCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA3deltaCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/deltaCRLCA3deltaCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLCA3deltaCRL.crl diff --git a/crypto/test/data/PKITS/crls/deltaCRLIndicatorNoBaseCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLIndicatorNoBaseCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/deltaCRLIndicatorNoBaseCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/deltaCRLIndicatorNoBaseCACRL.crl diff --git a/crypto/test/data/PKITS/crls/distributionPoint1CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/distributionPoint1CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/distributionPoint1CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/distributionPoint1CACRL.crl diff --git a/crypto/test/data/PKITS/crls/distributionPoint2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/distributionPoint2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/distributionPoint2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/distributionPoint2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/indirectCRLCA1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/indirectCRLCA1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA1CRL.crl diff --git a/crypto/test/data/PKITS/crls/indirectCRLCA3CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA3CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/indirectCRLCA3CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA3CRL.crl diff --git a/crypto/test/data/PKITS/crls/indirectCRLCA3cRLIssuerCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA3cRLIssuerCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/indirectCRLCA3cRLIssuerCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA3cRLIssuerCRL.crl diff --git a/crypto/test/data/PKITS/crls/indirectCRLCA4cRLIssuerCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA4cRLIssuerCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/indirectCRLCA4cRLIssuerCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA4cRLIssuerCRL.crl diff --git a/crypto/test/data/PKITS/crls/indirectCRLCA5CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA5CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/indirectCRLCA5CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/indirectCRLCA5CRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy0CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy0CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy0CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy0CACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy1CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy1CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1CACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy1subCA1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subCA1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy1subCA1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subCA1CRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy1subCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy1subCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy1subCAIAP5CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subCAIAP5CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy1subCAIAP5CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subCAIAP5CRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy1subsubCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subsubCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy1subsubCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy1subsubCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy5CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy5CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy5CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy5CACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy5subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy5subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy5subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy5subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitAnyPolicy5subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy5subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitAnyPolicy5subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitAnyPolicy5subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping0CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping0CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping0CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping0CACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping0subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping0subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping0subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping0subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12CACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subCAIPM5CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subCAIPM5CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subCAIPM5CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subCAIPM5CRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P12subsubCAIPM5CRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P1CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P1CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P1CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P1CACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P1subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P1subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P1subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P1subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping1P1subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P1subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping1P1subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping1P1subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping5CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping5CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5CACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping5subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping5subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping5subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping5subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/inhibitPolicyMapping5subsubsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5subsubsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/inhibitPolicyMapping5subsubsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/inhibitPolicyMapping5subsubsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/keyUsageCriticalcRLSignFalseCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageCriticalcRLSignFalseCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/keyUsageCriticalcRLSignFalseCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageCriticalcRLSignFalseCACRL.crl diff --git a/crypto/test/data/PKITS/crls/keyUsageCriticalkeyCertSignFalseCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageCriticalkeyCertSignFalseCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/keyUsageCriticalkeyCertSignFalseCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageCriticalkeyCertSignFalseCACRL.crl diff --git a/crypto/test/data/PKITS/crls/keyUsageNotCriticalCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageNotCriticalCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/keyUsageNotCriticalCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageNotCriticalCACRL.crl diff --git a/crypto/test/data/PKITS/crls/keyUsageNotCriticalcRLSignFalseCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageNotCriticalcRLSignFalseCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/keyUsageNotCriticalcRLSignFalseCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageNotCriticalcRLSignFalseCACRL.crl diff --git a/crypto/test/data/PKITS/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/keyUsageNotCriticalkeyCertSignFalseCACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN1CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN1CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN1subCA1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1subCA1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN1subCA1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1subCA1CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN1subCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1subCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN1subCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1subCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN1subCA3CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1subCA3CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN1subCA3CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN1subCA3CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN3CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN3CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN3CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN3CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN3subCA1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN3subCA1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN3subCA1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN3subCA1CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN3subCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN3subCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN3subCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN3subCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN4CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN4CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN4CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN4CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDN5CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN5CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDN5CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDN5CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDNS1CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDNS1CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDNS1CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDNS1CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsDNS2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDNS2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsDNS2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsDNS2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsRFC822CA1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsRFC822CA1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsRFC822CA1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsRFC822CA1CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsRFC822CA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsRFC822CA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsRFC822CA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsRFC822CA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsRFC822CA3CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsRFC822CA3CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsRFC822CA3CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsRFC822CA3CRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsURI1CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsURI1CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsURI1CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsURI1CACRL.crl diff --git a/crypto/test/data/PKITS/crls/nameConstraintsURI2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsURI2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/nameConstraintsURI2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/nameConstraintsURI2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/onlyContainsAttributeCertsCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlyContainsAttributeCertsCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlyContainsAttributeCertsCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlyContainsAttributeCertsCACRL.crl diff --git a/crypto/test/data/PKITS/crls/onlyContainsCACertsCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlyContainsCACertsCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlyContainsCACertsCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlyContainsCACertsCACRL.crl diff --git a/crypto/test/data/PKITS/crls/onlyContainsUserCertsCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlyContainsUserCertsCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlyContainsUserCertsCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlyContainsUserCertsCACRL.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA1compromiseCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA1compromiseCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA1compromiseCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA1compromiseCRL.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA1otherreasonsCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA1otherreasonsCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA1otherreasonsCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA1otherreasonsCRL.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA2CRL1.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA2CRL1.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA2CRL1.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA2CRL1.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA2CRL2.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA2CRL2.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA2CRL2.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA2CRL2.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA3compromiseCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA3compromiseCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA3compromiseCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA3compromiseCRL.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA3otherreasonsCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA3otherreasonsCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA3otherreasonsCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA3otherreasonsCRL.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA4compromiseCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA4compromiseCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA4compromiseCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA4compromiseCRL.crl diff --git a/crypto/test/data/PKITS/crls/onlySomeReasonsCA4otherreasonsCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA4otherreasonsCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/onlySomeReasonsCA4otherreasonsCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/onlySomeReasonsCA4otherreasonsCRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint0CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint0CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint0CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint0CACRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint0subCA2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint0subCA2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint0subCA2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint0subCA2CRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint0subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint0subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint0subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint0subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint1CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint1CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint1CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint1CACRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint1subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint1subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint1subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint1subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6CACRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subCA0CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subCA0CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subCA0CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subCA0CRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subCA1CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subCA1CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subCA1CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subCA1CRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subCA4CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subCA4CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subCA4CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subCA4CRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subsubCA00CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubCA00CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subsubCA00CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubCA00CRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subsubCA11CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubCA11CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subsubCA11CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubCA11CRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subsubCA41CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubCA41CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subsubCA41CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubCA41CRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subsubsubCA11XCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubsubCA11XCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subsubsubCA11XCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubsubCA11XCRL.crl diff --git a/crypto/test/data/PKITS/crls/pathLenConstraint6subsubsubCA41XCRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubsubCA41XCRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pathLenConstraint6subsubsubCA41XCRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pathLenConstraint6subsubsubCA41XCRL.crl diff --git a/crypto/test/data/PKITS/crls/pre2000CRLnextUpdateCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pre2000CRLnextUpdateCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/pre2000CRLnextUpdateCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/pre2000CRLnextUpdateCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy0CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy0CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0CACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy0subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy0subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy0subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy0subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy0subsubsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0subsubsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy0subsubsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy0subsubsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy10CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy10CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10CACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy10subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy10subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy10subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy10subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy10subsubsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10subsubsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy10subsubsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy10subsubsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy2CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy2CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy2CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy2CACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy2subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy2subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy2subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy2subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy4CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy4CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4CACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy4subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy4subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy4subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy4subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy4subsubsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4subsubsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy4subsubsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy4subsubsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy5CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy5CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5CACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy5subCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5subCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy5subCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5subCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy5subsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5subsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy5subsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5subsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy5subsubsubCACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5subsubsubCACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy5subsubsubCACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy5subsubsubCACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy7CACRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7CACRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy7CACRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7CACRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy7subCARE2CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7subCARE2CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy7subCARE2CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7subCARE2CRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7subsubCARE2RE4CRL.crl diff --git a/crypto/test/data/PKITS/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl b/test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl similarity index 100% rename from crypto/test/data/PKITS/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl rename to test/Crypto.NetSdk.NUnitTest/data/PKITS/crls/requireExplicitPolicy7subsubsubCARE2RE4CRL.crl diff --git a/crypto/test/data/ThawteSGCCA.cer b/test/Crypto.NetSdk.NUnitTest/data/ThawteSGCCA.cer similarity index 100% rename from crypto/test/data/ThawteSGCCA.cer rename to test/Crypto.NetSdk.NUnitTest/data/ThawteSGCCA.cer diff --git a/crypto/test/data/ThawteSGCCA.crl b/test/Crypto.NetSdk.NUnitTest/data/ThawteSGCCA.crl similarity index 100% rename from crypto/test/data/ThawteSGCCA.crl rename to test/Crypto.NetSdk.NUnitTest/data/ThawteSGCCA.crl diff --git a/crypto/test/data/asn1/masterlist-content.data b/test/Crypto.NetSdk.NUnitTest/data/asn1/masterlist-content.data similarity index 100% rename from crypto/test/data/asn1/masterlist-content.data rename to test/Crypto.NetSdk.NUnitTest/data/asn1/masterlist-content.data diff --git a/crypto/test/data/cert_chain.data b/test/Crypto.NetSdk.NUnitTest/data/cert_chain.data similarity index 98% rename from crypto/test/data/cert_chain.data rename to test/Crypto.NetSdk.NUnitTest/data/cert_chain.data index 00b56dd743..ca372a3255 100644 --- a/crypto/test/data/cert_chain.data +++ b/test/Crypto.NetSdk.NUnitTest/data/cert_chain.data @@ -1,60 +1,60 @@ ------BEGIN CERTIFICATE----- -MIIE+TCCAuGgAwIBAgIVAIb1Te5/365tZJu71WN94Kh2FpSoMA0GCSqGSIb3DQEB -DQUAMBUxEzARBgNVBAsTClJvb3QgVEUgQ0EwHhcNMTUwNzAyMTU1MDA4WhcNMzUw -NzA3MTU1MDA4WjAvMRQwEgYDVQQDEwsxMC4yMTEuNTUuMzEXMBUGA1UECxMOVEUg -Uk1JIEhvc3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCU85zq -Kwn80yW/QZjafyTnDiaPOr8X5u8OwTe+dbQPK2xSdT7d6FqEM8rmY9njGhue5XLH -xKcUweVMt6E9h581qMrf39sldWMyoHxZiquPfs0t3zfMa3hYF5AONH5I3zdTZQj4 -+5SD0mJugeM7YQ6eRs8qBdKLN/FwRWRAWQwDe3gF1gW5mgXfuo4Z3ufVscbJziJr -L9gnYaqCfmI8MaDWeDNkB9biTYPXGh0oacUSpWUHyyrTlzodaKhd+m5FAgDUFlV4 -I9iv7YO4DT9sJmxmNFMrTN+c5HZjl1QL9J74HED1B1emWvxOAQvMuSfnBkR8G70E -D9qd1YnrEmM84FRrYgGtC2POJGnE25Fpvb/DZOuZXpFFTvQ5yuTJqcWLEgPZu45P -2Wigpf1j523dkA15kwhY8+r58HTCULAsqfHedrFz1YXF8BXzecH7SzpXH2hlA36m -oEGjFXrqAQe9YfLGLRnUrNgC12DWX2UzTqMuM5Q8Byj8SIE2oBkKXb5aW1zXkkJX -U2pzzIglljQB8kjpkw4zTzZpEeoJwAMAQ4K73TkkV9YQOEdVJvqWYz5gWQI17qbm -2gwrkYtA50+vhuO0wrIi9cJMZBOm46owBVDcMdDePgC5SURvnNjH+j1sx23IINXV -ipViuv9t+YLNqO+8cPaAz225Yg7snCBnOO3RGwIDAQABoyYwJDAOBgNVHQ8BAf8E -BAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQ0FAAOCAgEALWmm -s3Z8cqtzpDJFZAsceNfnhgcYl1xkWbisoMe4K7hXTcp7EKlH2gsVl3YgATR5wWBw -YlMc0rOqwIVdz5a5bY0QYrioxe1KyXZyhp4R/NvDMKQZ/p/wREI4smiAnEDwIN2R -MS42SuKl2nIytJ4mIEAcNipGpk5sHQZqhQyipZ2hN3bEdZAGLH2/PpdaihHc0Jfj -lBRpL1ewwORVbx9Jy6IvZoFfuzj5egalAp+VZlrXU3pBv0a+Zovo/7Q+M5tjBuIg -MLr0R7n0J3FKIHxCwt1CHWTQ8R/QsLzhJDa1kf+SLTztHrUXqGJ/YAfpWDJh9pb2 -boGf7RBT0lFJhFOBpv2cEqTYP+1jWtlwGmUnfHI9bMCwO6B29bk4Xdlh57yGV6RF -3VZ8dlN6ZBUc45vMYcWr1tLTRUzgArztMlEbloRb7n4x/UJpPV8zjracc8PyB/tl -tlI2DZP/f+Gf0/Vv0M+tMu6DHjz1lSR+VNRadZ5yDRNPBh24qpPNSJ15HD26IwX+ -UQ44zVBtDxL0Y6ZMjhdSznz67eoymxYdlNHTYvw/zrg/+txje4M08i5PFFsSYN/m -cEV5nSgJl14AEaXe+pS0hZgvDoLXMrqgruvCp06tO3LwNkDH3oGJOGP19jNCWGyd -z7eQbiXNsCJGoeLKhxLj9IsVWyrLCCNZpojJdj0= ------END CERTIFICATE----- - ------BEGIN CERTIFICATE----- -MIIEyzCCArOgAwIBAgIBATANBgkqhkiG9w0BAQ0FADAVMRMwEQYDVQQLEwpSb290 -IFRFIENBMB4XDTE1MDcwMTE1NTAwOFoXDTM1MDcwODE1NTAwOFowFTETMBEGA1UE -CxMKUm9vdCBURSBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIim -2EeomY2b5zVgomN5EheGud1NfPbaH5h5MOrsu8c0JyaUIn3gBtJazuD4x2EJNObA -NMigdJebc+yKP3fL8Z0fcj2JOwlrNS8ZcGWRucytYHr0ZEC1ZrkE2AysoXX8inw5 -ABnWzdXAW0WBfa5r1UQvZtU3oldk0UutvJ2Gc4mKhQRVsSf1QxDyZMkso/9DWJG/ -0aDLx7dAdosP7FNICpvJZp7mUoWgNvEBMXlirM0VOmoSaGmy7C75g+GhybpmBT9d -UtDceWzBqH5nfR3vIIthbjdzX8szCtb307RN273zYE1n6RTPNdM54LGO4L6E6R2N -3FMJS8H8zn5HnwjgDlKGG8OzFsmK3o+HvpEDc4p++bgm3Gc9gxjb971qOjlPQieD -3jpmpSMPwg8qMuge16vbSwOOEru8vfi8c1Y9VJEZnD7rRxyDffyd9AZPnB+8sDND -ZZv0Z4vsocSLsJjyqjRhDijbHQx6d5W6y/9ATyIz+sgg7r9B3d4IduxPRCNm7+T7 -9dg9NokwUJwfJrKTXDC/OofBzsGYo9TTmIdjbe01ZD9va1U2VVm87N4+J+xDdsod -0eyp9CJ4z3ivm7NSplt56jYtkZ4J+kFzAIjU13zKxLVGqb0GTjISi1gwa5v5JGRX -RTz7zEv4FDJj5A9XuxDkAVNxeEn5cBqS2xDZQTpDAgMBAAGjJjAkMA4GA1UdDwEB -/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgECMA0GCSqGSIb3DQEBDQUAA4ICAQB/ -S9WHn3nBNl/PkRObDWIYutOI89IQQf9A7CRU2ndZH60Xy+eM59/CXbjU4vG2e9e6 -JcgrtSr6W+v+GLHCoVxOTI7IxM1+gjjLoHFfHNg97bXWRuHPLMSthTmSmiGC2q1r -fJ/cTfs2/+cJ8gzm2CZ0hKs3GrSxQezKZ+ZJBSC1wff8VT+8giALd76I7kvywC+u -4TnsoOzUCAC3mCR+laoIs8kmW+TBnZfgrskr0TjPdu5zCfZmK/SJSa8hOewYvrSc -mUmTQeAhR4NroT9fLrKlsQglIgckhp1KgUedcJp8HmWQcaRSWsAvy9WeQaftv9TQ -lWjEEjgdDwZ21qfl+o3wPAavC3il8pW8r8QWS5iFdzCpljYL3yfB5qbdhHfsEWD+ -oNWE4LCu+tq1PqgTNeSi1ff5RJCk3+sRJXDDK2Z6pCLhzUlmLSWlA1PmL3qLb3EM -dXdPmpsuevs3MFIxfUOiZ65BeKLCKjY87fr/Z4a3cwu9AZebv9K4/Nt07EOhbTCv -uAH7JcHDmRENPxUxrHIb/WIDhnPYUES+Vxr2oGVwSeNej9+22AGYxTgr7jY9A5Z4 -O+Sqfjbz818LTwYM+BTLGmHzRmgr85ygWpBwj9I2U+uEWKge2OksbCPQD9O3WJ+1 -DX9Bnr69S8ddGJVseNNtYsIvkE80HlyO+BqzASvuXQ== ------END CERTIFICATE----- - - +-----BEGIN CERTIFICATE----- +MIIE+TCCAuGgAwIBAgIVAIb1Te5/365tZJu71WN94Kh2FpSoMA0GCSqGSIb3DQEB +DQUAMBUxEzARBgNVBAsTClJvb3QgVEUgQ0EwHhcNMTUwNzAyMTU1MDA4WhcNMzUw +NzA3MTU1MDA4WjAvMRQwEgYDVQQDEwsxMC4yMTEuNTUuMzEXMBUGA1UECxMOVEUg +Uk1JIEhvc3QgQ0EwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQCU85zq +Kwn80yW/QZjafyTnDiaPOr8X5u8OwTe+dbQPK2xSdT7d6FqEM8rmY9njGhue5XLH +xKcUweVMt6E9h581qMrf39sldWMyoHxZiquPfs0t3zfMa3hYF5AONH5I3zdTZQj4 ++5SD0mJugeM7YQ6eRs8qBdKLN/FwRWRAWQwDe3gF1gW5mgXfuo4Z3ufVscbJziJr +L9gnYaqCfmI8MaDWeDNkB9biTYPXGh0oacUSpWUHyyrTlzodaKhd+m5FAgDUFlV4 +I9iv7YO4DT9sJmxmNFMrTN+c5HZjl1QL9J74HED1B1emWvxOAQvMuSfnBkR8G70E +D9qd1YnrEmM84FRrYgGtC2POJGnE25Fpvb/DZOuZXpFFTvQ5yuTJqcWLEgPZu45P +2Wigpf1j523dkA15kwhY8+r58HTCULAsqfHedrFz1YXF8BXzecH7SzpXH2hlA36m +oEGjFXrqAQe9YfLGLRnUrNgC12DWX2UzTqMuM5Q8Byj8SIE2oBkKXb5aW1zXkkJX +U2pzzIglljQB8kjpkw4zTzZpEeoJwAMAQ4K73TkkV9YQOEdVJvqWYz5gWQI17qbm +2gwrkYtA50+vhuO0wrIi9cJMZBOm46owBVDcMdDePgC5SURvnNjH+j1sx23IINXV +ipViuv9t+YLNqO+8cPaAz225Yg7snCBnOO3RGwIDAQABoyYwJDAOBgNVHQ8BAf8E +BAMCAYYwEgYDVR0TAQH/BAgwBgEB/wIBATANBgkqhkiG9w0BAQ0FAAOCAgEALWmm +s3Z8cqtzpDJFZAsceNfnhgcYl1xkWbisoMe4K7hXTcp7EKlH2gsVl3YgATR5wWBw +YlMc0rOqwIVdz5a5bY0QYrioxe1KyXZyhp4R/NvDMKQZ/p/wREI4smiAnEDwIN2R +MS42SuKl2nIytJ4mIEAcNipGpk5sHQZqhQyipZ2hN3bEdZAGLH2/PpdaihHc0Jfj +lBRpL1ewwORVbx9Jy6IvZoFfuzj5egalAp+VZlrXU3pBv0a+Zovo/7Q+M5tjBuIg +MLr0R7n0J3FKIHxCwt1CHWTQ8R/QsLzhJDa1kf+SLTztHrUXqGJ/YAfpWDJh9pb2 +boGf7RBT0lFJhFOBpv2cEqTYP+1jWtlwGmUnfHI9bMCwO6B29bk4Xdlh57yGV6RF +3VZ8dlN6ZBUc45vMYcWr1tLTRUzgArztMlEbloRb7n4x/UJpPV8zjracc8PyB/tl +tlI2DZP/f+Gf0/Vv0M+tMu6DHjz1lSR+VNRadZ5yDRNPBh24qpPNSJ15HD26IwX+ +UQ44zVBtDxL0Y6ZMjhdSznz67eoymxYdlNHTYvw/zrg/+txje4M08i5PFFsSYN/m +cEV5nSgJl14AEaXe+pS0hZgvDoLXMrqgruvCp06tO3LwNkDH3oGJOGP19jNCWGyd +z7eQbiXNsCJGoeLKhxLj9IsVWyrLCCNZpojJdj0= +-----END CERTIFICATE----- + +-----BEGIN CERTIFICATE----- +MIIEyzCCArOgAwIBAgIBATANBgkqhkiG9w0BAQ0FADAVMRMwEQYDVQQLEwpSb290 +IFRFIENBMB4XDTE1MDcwMTE1NTAwOFoXDTM1MDcwODE1NTAwOFowFTETMBEGA1UE +CxMKUm9vdCBURSBDQTCCAiIwDQYJKoZIhvcNAQEBBQADggIPADCCAgoCggIBAIim +2EeomY2b5zVgomN5EheGud1NfPbaH5h5MOrsu8c0JyaUIn3gBtJazuD4x2EJNObA +NMigdJebc+yKP3fL8Z0fcj2JOwlrNS8ZcGWRucytYHr0ZEC1ZrkE2AysoXX8inw5 +ABnWzdXAW0WBfa5r1UQvZtU3oldk0UutvJ2Gc4mKhQRVsSf1QxDyZMkso/9DWJG/ +0aDLx7dAdosP7FNICpvJZp7mUoWgNvEBMXlirM0VOmoSaGmy7C75g+GhybpmBT9d +UtDceWzBqH5nfR3vIIthbjdzX8szCtb307RN273zYE1n6RTPNdM54LGO4L6E6R2N +3FMJS8H8zn5HnwjgDlKGG8OzFsmK3o+HvpEDc4p++bgm3Gc9gxjb971qOjlPQieD +3jpmpSMPwg8qMuge16vbSwOOEru8vfi8c1Y9VJEZnD7rRxyDffyd9AZPnB+8sDND +ZZv0Z4vsocSLsJjyqjRhDijbHQx6d5W6y/9ATyIz+sgg7r9B3d4IduxPRCNm7+T7 +9dg9NokwUJwfJrKTXDC/OofBzsGYo9TTmIdjbe01ZD9va1U2VVm87N4+J+xDdsod +0eyp9CJ4z3ivm7NSplt56jYtkZ4J+kFzAIjU13zKxLVGqb0GTjISi1gwa5v5JGRX +RTz7zEv4FDJj5A9XuxDkAVNxeEn5cBqS2xDZQTpDAgMBAAGjJjAkMA4GA1UdDwEB +/wQEAwIBhjASBgNVHRMBAf8ECDAGAQH/AgECMA0GCSqGSIb3DQEBDQUAA4ICAQB/ +S9WHn3nBNl/PkRObDWIYutOI89IQQf9A7CRU2ndZH60Xy+eM59/CXbjU4vG2e9e6 +JcgrtSr6W+v+GLHCoVxOTI7IxM1+gjjLoHFfHNg97bXWRuHPLMSthTmSmiGC2q1r +fJ/cTfs2/+cJ8gzm2CZ0hKs3GrSxQezKZ+ZJBSC1wff8VT+8giALd76I7kvywC+u +4TnsoOzUCAC3mCR+laoIs8kmW+TBnZfgrskr0TjPdu5zCfZmK/SJSa8hOewYvrSc +mUmTQeAhR4NroT9fLrKlsQglIgckhp1KgUedcJp8HmWQcaRSWsAvy9WeQaftv9TQ +lWjEEjgdDwZ21qfl+o3wPAavC3il8pW8r8QWS5iFdzCpljYL3yfB5qbdhHfsEWD+ +oNWE4LCu+tq1PqgTNeSi1ff5RJCk3+sRJXDDK2Z6pCLhzUlmLSWlA1PmL3qLb3EM +dXdPmpsuevs3MFIxfUOiZ65BeKLCKjY87fr/Z4a3cwu9AZebv9K4/Nt07EOhbTCv +uAH7JcHDmRENPxUxrHIb/WIDhnPYUES+Vxr2oGVwSeNej9+22AGYxTgr7jY9A5Z4 +O+Sqfjbz818LTwYM+BTLGmHzRmgr85ygWpBwj9I2U+uEWKge2OksbCPQD9O3WJ+1 +DX9Bnr69S8ddGJVseNNtYsIvkE80HlyO+BqzASvuXQ== +-----END CERTIFICATE----- + + diff --git a/crypto/test/data/cert_chain_nl.data b/test/Crypto.NetSdk.NUnitTest/data/cert_chain_nl.data similarity index 100% rename from crypto/test/data/cert_chain_nl.data rename to test/Crypto.NetSdk.NUnitTest/data/cert_chain_nl.data diff --git a/crypto/test/data/cms/sigs/PSSSignData.data b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignData.data similarity index 100% rename from crypto/test/data/cms/sigs/PSSSignData.data rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignData.data diff --git a/crypto/test/data/cms/sigs/PSSSignDataSHA1.sig b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA1.sig similarity index 100% rename from crypto/test/data/cms/sigs/PSSSignDataSHA1.sig rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA1.sig diff --git a/crypto/test/data/cms/sigs/PSSSignDataSHA1Enc.sig b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA1Enc.sig similarity index 100% rename from crypto/test/data/cms/sigs/PSSSignDataSHA1Enc.sig rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA1Enc.sig diff --git a/crypto/test/data/cms/sigs/PSSSignDataSHA256.sig b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA256.sig similarity index 100% rename from crypto/test/data/cms/sigs/PSSSignDataSHA256.sig rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA256.sig diff --git a/crypto/test/data/cms/sigs/PSSSignDataSHA256Enc.sig b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA256Enc.sig similarity index 100% rename from crypto/test/data/cms/sigs/PSSSignDataSHA256Enc.sig rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA256Enc.sig diff --git a/crypto/test/data/cms/sigs/PSSSignDataSHA512.sig b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA512.sig similarity index 100% rename from crypto/test/data/cms/sigs/PSSSignDataSHA512.sig rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA512.sig diff --git a/crypto/test/data/cms/sigs/PSSSignDataSHA512Enc.sig b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA512Enc.sig similarity index 100% rename from crypto/test/data/cms/sigs/PSSSignDataSHA512Enc.sig rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/PSSSignDataSHA512Enc.sig diff --git a/crypto/test/data/cms/sigs/SignedMSPkcs7.sig b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/SignedMSPkcs7.sig similarity index 100% rename from crypto/test/data/cms/sigs/SignedMSPkcs7.sig rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/SignedMSPkcs7.sig diff --git a/crypto/test/data/cms/sigs/counterSig.p7m b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/counterSig.p7m similarity index 100% rename from crypto/test/data/cms/sigs/counterSig.p7m rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/counterSig.p7m diff --git a/crypto/test/data/cms/sigs/rawsha256nonull.p7m b/test/Crypto.NetSdk.NUnitTest/data/cms/sigs/rawsha256nonull.p7m similarity index 100% rename from crypto/test/data/cms/sigs/rawsha256nonull.p7m rename to test/Crypto.NetSdk.NUnitTest/data/cms/sigs/rawsha256nonull.p7m diff --git a/crypto/test/data/crypto/SHA3TestVectors.txt b/test/Crypto.NetSdk.NUnitTest/data/crypto/SHA3TestVectors.txt similarity index 100% rename from crypto/test/data/crypto/SHA3TestVectors.txt rename to test/Crypto.NetSdk.NUnitTest/data/crypto/SHA3TestVectors.txt diff --git a/crypto/test/data/crypto/SHAKETestVectors.txt b/test/Crypto.NetSdk.NUnitTest/data/crypto/SHAKETestVectors.txt similarity index 100% rename from crypto/test/data/crypto/SHAKETestVectors.txt rename to test/Crypto.NetSdk.NUnitTest/data/crypto/SHAKETestVectors.txt diff --git a/crypto/test/data/hc256/hc128/ecrypt_HC-128.txt b/test/Crypto.NetSdk.NUnitTest/data/hc256/hc128/ecrypt_HC-128.txt similarity index 100% rename from crypto/test/data/hc256/hc128/ecrypt_HC-128.txt rename to test/Crypto.NetSdk.NUnitTest/data/hc256/hc128/ecrypt_HC-128.txt diff --git a/crypto/test/data/hc256/hc256/ecrypt_HC-256_128K_128IV.txt b/test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_128K_128IV.txt similarity index 100% rename from crypto/test/data/hc256/hc256/ecrypt_HC-256_128K_128IV.txt rename to test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_128K_128IV.txt diff --git a/crypto/test/data/hc256/hc256/ecrypt_HC-256_128K_256IV.txt b/test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_128K_256IV.txt similarity index 100% rename from crypto/test/data/hc256/hc256/ecrypt_HC-256_128K_256IV.txt rename to test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_128K_256IV.txt diff --git a/crypto/test/data/hc256/hc256/ecrypt_HC-256_256K_128IV.txt b/test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_256K_128IV.txt similarity index 100% rename from crypto/test/data/hc256/hc256/ecrypt_HC-256_256K_128IV.txt rename to test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_256K_128IV.txt diff --git a/crypto/test/data/hc256/hc256/ecrypt_HC-256_256K_256IV.txt b/test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_256K_256IV.txt similarity index 100% rename from crypto/test/data/hc256/hc256/ecrypt_HC-256_256K_256IV.txt rename to test/Crypto.NetSdk.NUnitTest/data/hc256/hc256/ecrypt_HC-256_256K_256IV.txt diff --git a/crypto/test/data/keys/README.txt b/test/Crypto.NetSdk.NUnitTest/data/keys/README.txt similarity index 100% rename from crypto/test/data/keys/README.txt rename to test/Crypto.NetSdk.NUnitTest/data/keys/README.txt diff --git a/crypto/test/data/keys/pbes1/pbeWithMD2AndDES_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD2AndDES_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbeWithMD2AndDES_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD2AndDES_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbeWithMD2AndRC2_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD2AndRC2_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbeWithMD2AndRC2_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD2AndRC2_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbeWithMD5AndDES_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD5AndDES_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbeWithMD5AndDES_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD5AndDES_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbeWithMD5AndRC2_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD5AndRC2_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbeWithMD5AndRC2_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithMD5AndRC2_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbeWithSHA1AndDES_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithSHA1AndDES_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbeWithSHA1AndDES_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithSHA1AndDES_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbeWithSHA1AndRC2_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithSHA1AndRC2_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbeWithSHA1AndRC2_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbeWithSHA1AndRC2_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbe_WithSHA1And128BitRC2_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And128BitRC2_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbe_WithSHA1And128BitRC2_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And128BitRC2_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbe_WithSHA1And128BitRC4.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And128BitRC4.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbe_WithSHA1And128BitRC4.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And128BitRC4.key diff --git a/crypto/test/data/keys/pbes1/pbe_WithSHA1And2_Key_TripleDES_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And2_Key_TripleDES_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbe_WithSHA1And2_Key_TripleDES_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And2_Key_TripleDES_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbe_WithSHA1And3_Key_TripleDES_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And3_Key_TripleDES_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbe_WithSHA1And3_Key_TripleDES_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And3_Key_TripleDES_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbe_WithSHA1And40BitRC2_CBC.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And40BitRC2_CBC.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbe_WithSHA1And40BitRC2_CBC.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And40BitRC2_CBC.key diff --git a/crypto/test/data/keys/pbes1/pbe_WithSHA1And40BitRC4.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And40BitRC4.key similarity index 100% rename from crypto/test/data/keys/pbes1/pbe_WithSHA1And40BitRC4.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes1/pbe_WithSHA1And40BitRC4.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-128-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-128-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-128-cfb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cfb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-128-cfb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cfb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-128-cfb1.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cfb1.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-128-cfb1.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cfb1.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-128-cfb8.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cfb8.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-128-cfb8.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-cfb8.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-128-ecb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-ecb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-128-ecb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-ecb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-128-ofb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-ofb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-128-ofb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-128-ofb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-192-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-192-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-192-cfb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cfb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-192-cfb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cfb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-192-cfb1.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cfb1.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-192-cfb1.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cfb1.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-192-cfb8.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cfb8.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-192-cfb8.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-cfb8.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-192-ecb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-ecb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-192-ecb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-ecb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-192-ofb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-ofb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-192-ofb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-192-ofb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-256-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-256-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-256-cfb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cfb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-256-cfb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cfb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-256-cfb1.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cfb1.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-256-cfb1.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cfb1.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-256-cfb8.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cfb8.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-256-cfb8.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-cfb8.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-256-ecb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-ecb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-256-ecb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-ecb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes-256-ofb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-ofb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes-256-ofb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes-256-ofb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes128.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes128.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes128.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes128.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes192.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes192.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes192.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes192.key diff --git a/crypto/test/data/keys/pbes2/pbes2.aes256.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes256.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.aes256.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.aes256.key diff --git a/crypto/test/data/keys/pbes2/pbes2.bf-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.bf-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.bf-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.bf-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.bf.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.bf.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.bf.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.bf.key diff --git a/crypto/test/data/keys/pbes2/pbes2.blowfish.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.blowfish.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.blowfish.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.blowfish.key diff --git a/crypto/test/data/keys/pbes2/pbes2.cast-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.cast-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.cast-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.cast-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.cast.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.cast.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.cast.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.cast.key diff --git a/crypto/test/data/keys/pbes2/pbes2.cast5-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.cast5-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.cast5-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.cast5-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-cfb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cfb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-cfb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cfb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-cfb1.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cfb1.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-cfb1.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cfb1.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-cfb8.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cfb8.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-cfb8.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-cfb8.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-ecb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ecb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-ecb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ecb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-ede.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ede.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-ede.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ede.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-ede3-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ede3-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-ede3-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ede3-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des-ofb.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ofb.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des-ofb.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des-ofb.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des.key diff --git a/crypto/test/data/keys/pbes2/pbes2.des3.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des3.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.des3.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.des3.key diff --git a/crypto/test/data/keys/pbes2/pbes2.rc2-40-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2-40-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.rc2-40-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2-40-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.rc2-64-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2-64-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.rc2-64-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2-64-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.rc2-cbc.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2-cbc.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.rc2-cbc.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2-cbc.key diff --git a/crypto/test/data/keys/pbes2/pbes2.rc2.key b/test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2.key similarity index 100% rename from crypto/test/data/keys/pbes2/pbes2.rc2.key rename to test/Crypto.NetSdk.NUnitTest/data/keys/pbes2/pbes2.rc2.key diff --git a/crypto/test/data/openpgp/bigpub.asc b/test/Crypto.NetSdk.NUnitTest/data/openpgp/bigpub.asc similarity index 100% rename from crypto/test/data/openpgp/bigpub.asc rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/bigpub.asc diff --git a/crypto/test/data/openpgp/dsa/README.txt b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/README.txt similarity index 100% rename from crypto/test/data/openpgp/dsa/README.txt rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/README.txt diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-1024-160.pub b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-1024-160.pub similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-1024-160.pub rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-1024-160.pub diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-1024-160.sec b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-1024-160.sec similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-1024-160.sec rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-1024-160.sec diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-15360-512.pub b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-15360-512.pub similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-15360-512.pub rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-15360-512.pub diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-15360-512.sec b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-15360-512.sec similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-15360-512.sec rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-15360-512.sec diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-2048-224.pub b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-2048-224.pub similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-2048-224.pub rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-2048-224.pub diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-2048-224.sec b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-2048-224.sec similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-2048-224.sec rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-2048-224.sec diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-3072-256.pub b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-3072-256.pub similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-3072-256.pub rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-3072-256.pub diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-3072-256.sec b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-3072-256.sec similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-3072-256.sec rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-3072-256.sec diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-7680-384.pub b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-7680-384.pub similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-7680-384.pub rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-7680-384.pub diff --git a/crypto/test/data/openpgp/dsa/keys/DSA-7680-384.sec b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-7680-384.sec similarity index 100% rename from crypto/test/data/openpgp/dsa/keys/DSA-7680-384.sec rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/keys/DSA-7680-384.sec diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-1024-160-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-160-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-1024-160-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-160-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-1024-224-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-224-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-1024-224-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-224-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-1024-256-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-256-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-1024-256-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-256-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-1024-384-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-384-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-1024-384-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-384-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-1024-512-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-512-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-1024-512-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-1024-512-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-15360-512-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-15360-512-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-15360-512-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-15360-512-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-2048-224-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-2048-224-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-2048-224-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-2048-224-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-3072-256-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-3072-256-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-3072-256-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-3072-256-sign.gpg diff --git a/crypto/test/data/openpgp/dsa/sigs/dsa-7680-384-sign.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-7680-384-sign.gpg similarity index 100% rename from crypto/test/data/openpgp/dsa/sigs/dsa-7680-384-sign.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/dsa/sigs/dsa-7680-384-sign.gpg diff --git a/crypto/test/data/openpgp/longSigSubPack.asc b/test/Crypto.NetSdk.NUnitTest/data/openpgp/longSigSubPack.asc similarity index 100% rename from crypto/test/data/openpgp/longSigSubPack.asc rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/longSigSubPack.asc diff --git a/crypto/test/data/openpgp/unicode/passphrase_cyr.txt b/test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/passphrase_cyr.txt similarity index 100% rename from crypto/test/data/openpgp/unicode/passphrase_cyr.txt rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/passphrase_cyr.txt diff --git a/crypto/test/data/openpgp/unicode/passphrase_for_test.txt b/test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/passphrase_for_test.txt similarity index 100% rename from crypto/test/data/openpgp/unicode/passphrase_for_test.txt rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/passphrase_for_test.txt diff --git a/crypto/test/data/openpgp/unicode/secring.gpg b/test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/secring.gpg similarity index 100% rename from crypto/test/data/openpgp/unicode/secring.gpg rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/secring.gpg diff --git a/crypto/test/data/openpgp/unicode/test.asc b/test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/test.asc similarity index 100% rename from crypto/test/data/openpgp/unicode/test.asc rename to test/Crypto.NetSdk.NUnitTest/data/openpgp/unicode/test.asc diff --git a/crypto/test/data/openssl/README.txt b/test/Crypto.NetSdk.NUnitTest/data/openssl/README.txt similarity index 100% rename from crypto/test/data/openssl/README.txt rename to test/Crypto.NetSdk.NUnitTest/data/openssl/README.txt diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes128_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes128_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes128_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes128_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes128_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes128_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes128_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes128_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes128_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes192_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes192_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes192_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes192_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes192_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes192_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes192_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes192_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes192_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes256_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes256_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes256_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes256_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes256_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes256_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_aes256_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_aes256_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_aes256_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_blowfish_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_blowfish_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_blowfish_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_blowfish_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_blowfish_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_blowfish_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_blowfish_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_blowfish_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_blowfish_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des1_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des1_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des1_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des1_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des1_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des1_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des1_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des1_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des1_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des2_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des2_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des2_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des2_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des2_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des2_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des2_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des2_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des2_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des3_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des3_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des3_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des3_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des3_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des3_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_des3_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_des3_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_des3_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_cfb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_cfb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_ecb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_ecb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_ofb.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_rc2_128_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_128_ofb.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_rc2_40_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_40_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_rc2_40_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_40_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_rc2_64_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_64_cbc.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_rc2_64_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_rc2_64_cbc.pem diff --git a/crypto/test/data/openssl/dsa/openssl_dsa_unencrypted.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_unencrypted.pem similarity index 100% rename from crypto/test/data/openssl/dsa/openssl_dsa_unencrypted.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/dsa/openssl_dsa_unencrypted.pem diff --git a/crypto/test/data/openssl/eckey.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/eckey.pem similarity index 100% rename from crypto/test/data/openssl/eckey.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/eckey.pem diff --git a/crypto/test/data/openssl/enckey.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/enckey.pem similarity index 100% rename from crypto/test/data/openssl/enckey.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/enckey.pem diff --git a/crypto/test/data/openssl/pkcs7.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs7.pem similarity index 100% rename from crypto/test/data/openssl/pkcs7.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs7.pem diff --git a/crypto/test/data/openssl/pkcs8/openssl_pkcs8_rsa.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs8/openssl_pkcs8_rsa.pem similarity index 100% rename from crypto/test/data/openssl/pkcs8/openssl_pkcs8_rsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs8/openssl_pkcs8_rsa.pem diff --git a/crypto/test/data/openssl/pkcs8/openssl_pkcs8_rsa_enc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs8/openssl_pkcs8_rsa_enc.pem similarity index 100% rename from crypto/test/data/openssl/pkcs8/openssl_pkcs8_rsa_enc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs8/openssl_pkcs8_rsa_enc.pem diff --git a/crypto/test/data/openssl/pkcs8test.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs8test.pem similarity index 100% rename from crypto/test/data/openssl/pkcs8test.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/pkcs8test.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes128_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes128_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes128_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes128_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes128_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes128_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes128_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes128_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes128_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes192_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes192_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes192_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes192_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes192_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes192_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes192_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes192_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes192_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes256_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes256_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes256_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes256_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes256_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes256_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_aes256_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_aes256_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_aes256_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_blowfish_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_blowfish_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_blowfish_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_blowfish_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_blowfish_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_blowfish_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_blowfish_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_blowfish_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_blowfish_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des1_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des1_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des1_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des1_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des1_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des1_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des1_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des1_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des1_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des2_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des2_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des2_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des2_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des2_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des2_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des2_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des2_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des2_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des3_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des3_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des3_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des3_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des3_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des3_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_des3_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_des3_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_des3_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_cfb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_cfb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_cfb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_cfb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_ecb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_ecb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_ecb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_ecb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_ofb.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_ofb.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_rc2_128_ofb.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_128_ofb.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_rc2_40_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_40_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_rc2_40_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_40_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_rc2_64_cbc.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_64_cbc.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_rc2_64_cbc.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_rc2_64_cbc.pem diff --git a/crypto/test/data/openssl/rsa/openssl_rsa_unencrypted.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_unencrypted.pem similarity index 100% rename from crypto/test/data/openssl/rsa/openssl_rsa_unencrypted.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/rsa/openssl_rsa_unencrypted.pem diff --git a/crypto/test/data/openssl/test.pem b/test/Crypto.NetSdk.NUnitTest/data/openssl/test.pem similarity index 100% rename from crypto/test/data/openssl/test.pem rename to test/Crypto.NetSdk.NUnitTest/data/openssl/test.pem diff --git a/crypto/test/data/qvRooCa3.crt b/test/Crypto.NetSdk.NUnitTest/data/qvRooCa3.crt similarity index 98% rename from crypto/test/data/qvRooCa3.crt rename to test/Crypto.NetSdk.NUnitTest/data/qvRooCa3.crt index 969322b95e..bda7b1aa59 100644 --- a/crypto/test/data/qvRooCa3.crt +++ b/test/Crypto.NetSdk.NUnitTest/data/qvRooCa3.crt @@ -1,38 +1,38 @@ ------BEGIN CERTIFICATE----- -MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x -GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv -b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV -BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W -YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM -V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB -4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr -H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd -8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv -vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT -mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe -btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc -T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt -WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ -c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A -4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD -VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG -CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0 -aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 -aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu -dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw -czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G -A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC -TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg -Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0 -7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem -d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd -+LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B -4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN -t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x -DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57 -k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s -zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j -Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT -mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK -4SVhM7JZG+Ju1zdXtg2pEto= ------END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIGnTCCBIWgAwIBAgICBcYwDQYJKoZIhvcNAQEFBQAwRTELMAkGA1UEBhMCQk0x +GTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZBgNVBAMTElF1b1ZhZGlzIFJv +b3QgQ0EgMzAeFw0wNjExMjQxOTExMjNaFw0zMTExMjQxOTA2NDRaMEUxCzAJBgNV +BAYTAkJNMRkwFwYDVQQKExBRdW9WYWRpcyBMaW1pdGVkMRswGQYDVQQDExJRdW9W +YWRpcyBSb290IENBIDMwggIiMA0GCSqGSIb3DQEBAQUAA4ICDwAwggIKAoICAQDM +V0IWVJzmmNPTTe7+7cefQzlKZbPoFog02w1ZkXTPkrgEQK0CSzGrvI2RaNggDhoB +4hp7Thdd4oq3P5kazethq8Jlph+3t723j/z9cI8LoGe+AaJZz3HmDyl2/7FWeUUr +H556VOijKTVopAFPD6QuN+8bv+OPEKhyq1hX51SGyMnzW9os2l2ObjyjPtr7guXd +8lyyBTNvijbO0BNO/79KDDRMpsMhvVAEVeuxu537RR5kFd5VAYwCdrXLoT9Cabwv +vWhDFlaJKjdhkf2mrk7AyxRllDdLkgbvBNDInIjbC3uBr7E9KsRlOni27tyAsdLT +mZw67mtaa7ONt9XOnMK+pUsvFrGeaDsGb659n/je7Mwpp5ijJUMv7/FfJuGITfhe +btfZFG4ZM2mnO4SJk8RTVROhUXhA+LjJou57ulJCg54U7QVSWllWp5f8nT8KKdjc +T5EOE7zelaTfi5m+rJsziO+1ga8bxiJTyPbH7pcUsMV8eFLI8M5ud2CEpukqdiDt +WAEXMJPpGovgc2PZapKUSU60rUqFxKMiMPwJ7Wgic6aIDFUhWMXhOp8q3crhkODZ +c6tsgLjoC2SToJyMGf+z0gzskSaHirOi4XCPLArlzW1oUevaPwV/izLmE1xr/l9A +4iLItLRkT9a6fUg+qGkM17uGcclzuD87nSVL2v9A6wIDAQABo4IBlTCCAZEwDwYD +VR0TAQH/BAUwAwEB/zCB4QYDVR0gBIHZMIHWMIHTBgkrBgEEAb5YAAMwgcUwgZMG +CCsGAQUFBwICMIGGGoGDQW55IHVzZSBvZiB0aGlzIENlcnRpZmljYXRlIGNvbnN0 +aXR1dGVzIGFjY2VwdGFuY2Ugb2YgdGhlIFF1b1ZhZGlzIFJvb3QgQ0EgMyBDZXJ0 +aWZpY2F0ZSBQb2xpY3kgLyBDZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVu +dC4wLQYIKwYBBQUHAgEWIWh0dHA6Ly93d3cucXVvdmFkaXNnbG9iYWwuY29tL2Nw +czALBgNVHQ8EBAMCAQYwHQYDVR0OBBYEFPLAE+CCQz777i9nMpY1XNu4ywLQMG4G +A1UdIwRnMGWAFPLAE+CCQz777i9nMpY1XNu4ywLQoUmkRzBFMQswCQYDVQQGEwJC +TTEZMBcGA1UEChMQUXVvVmFkaXMgTGltaXRlZDEbMBkGA1UEAxMSUXVvVmFkaXMg +Um9vdCBDQSAzggIFxjANBgkqhkiG9w0BAQUFAAOCAgEAT62gLEz6wPJv92ZVqyM0 +7ucp2sNbtrCD2dDQ4iH782CnO11gUyeim/YIIirnv6By5ZwkajGxkHon24QRiSem +d1o417+shvzuXYO8BsbRd2sPbSQvS3pspweWyuOEn62Iix2rFo1bZhfZFvSLgNLd ++LJ2w/w4E6oM3kJpK27zPOuAJ9v1pkQNn1pVWQvVDVJIxa6f8i+AxeoyUDUSly7B +4f/xI4hROJ/yZlZ25w9Rl6VSDE1JUZU2Pb+iSwwQHYaZTKrzchGT5Or2m9qoXadN +t54CrnMAyNojA+j56hl0YgCUyyIgvpSnWbWCar6ZeXqp8kokUvd0/bpO5qgdAm6x +DYBEwa7TIzdfu4V8K5Iu6H6li92Z4b8nby1dqnuH/grdS/yO9SbkbnBCbjPsMZ57 +k8HkyWkaPcBrTiJt7qtYTcbQQcEr6k8Sh17rRdhs9ZgC06DYVYoGmRmioHfRMJ6s +zHXug/WwYjnPbFfiTNKRCw51KBuav/0aQ/HKd/s7j2G4aSgWQgRecCocIdiP4b0j +Wy10QJLZYxkNc91pvGJHvOB0K7Lrfb5BG7XARsWhIstfTsEokt4YutUqKLsRixeT +mJlglFwjz1onl14LBQaTNx47aTbrqZ5hHY8y2o4M1nQ+ewkk2gF3R8Q7zTSMmfXK +4SVhM7JZG+Ju1zdXtg2pEto= +-----END CERTIFICATE----- diff --git a/crypto/test/data/rfc4134/3.1.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/3.1.bin similarity index 100% rename from crypto/test/data/rfc4134/3.1.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/3.1.bin diff --git a/crypto/test/data/rfc4134/3.2.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/3.2.bin similarity index 100% rename from crypto/test/data/rfc4134/3.2.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/3.2.bin diff --git a/crypto/test/data/rfc4134/4.1.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.1.bin similarity index 100% rename from crypto/test/data/rfc4134/4.1.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.1.bin diff --git a/crypto/test/data/rfc4134/4.10.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.10.bin similarity index 100% rename from crypto/test/data/rfc4134/4.10.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.10.bin diff --git a/crypto/test/data/rfc4134/4.11.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.11.bin similarity index 100% rename from crypto/test/data/rfc4134/4.11.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.11.bin diff --git a/crypto/test/data/rfc4134/4.2.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.2.bin similarity index 100% rename from crypto/test/data/rfc4134/4.2.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.2.bin diff --git a/crypto/test/data/rfc4134/4.3.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.3.bin similarity index 100% rename from crypto/test/data/rfc4134/4.3.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.3.bin diff --git a/crypto/test/data/rfc4134/4.4.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.4.bin similarity index 100% rename from crypto/test/data/rfc4134/4.4.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.4.bin diff --git a/crypto/test/data/rfc4134/4.5.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.5.bin similarity index 100% rename from crypto/test/data/rfc4134/4.5.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.5.bin diff --git a/crypto/test/data/rfc4134/4.6.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.6.bin similarity index 100% rename from crypto/test/data/rfc4134/4.6.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.6.bin diff --git a/crypto/test/data/rfc4134/4.7.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.7.bin similarity index 100% rename from crypto/test/data/rfc4134/4.7.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.7.bin diff --git a/crypto/test/data/rfc4134/4.8.eml b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.8.eml similarity index 100% rename from crypto/test/data/rfc4134/4.8.eml rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.8.eml diff --git a/crypto/test/data/rfc4134/4.9.eml b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.9.eml similarity index 100% rename from crypto/test/data/rfc4134/4.9.eml rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/4.9.eml diff --git a/crypto/test/data/rfc4134/5.1.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/5.1.bin similarity index 100% rename from crypto/test/data/rfc4134/5.1.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/5.1.bin diff --git a/crypto/test/data/rfc4134/5.2.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/5.2.bin similarity index 100% rename from crypto/test/data/rfc4134/5.2.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/5.2.bin diff --git a/crypto/test/data/rfc4134/5.3.eml b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/5.3.eml similarity index 100% rename from crypto/test/data/rfc4134/5.3.eml rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/5.3.eml diff --git a/crypto/test/data/rfc4134/6.0.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/6.0.bin similarity index 100% rename from crypto/test/data/rfc4134/6.0.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/6.0.bin diff --git a/crypto/test/data/rfc4134/7.1.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/7.1.bin similarity index 100% rename from crypto/test/data/rfc4134/7.1.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/7.1.bin diff --git a/crypto/test/data/rfc4134/7.2.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/7.2.bin similarity index 100% rename from crypto/test/data/rfc4134/7.2.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/7.2.bin diff --git a/crypto/test/data/rfc4134/AliceDSSSignByCarlNoInherit.cer b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/AliceDSSSignByCarlNoInherit.cer similarity index 100% rename from crypto/test/data/rfc4134/AliceDSSSignByCarlNoInherit.cer rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/AliceDSSSignByCarlNoInherit.cer diff --git a/crypto/test/data/rfc4134/AlicePrivDSSSign.pri b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/AlicePrivDSSSign.pri similarity index 100% rename from crypto/test/data/rfc4134/AlicePrivDSSSign.pri rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/AlicePrivDSSSign.pri diff --git a/crypto/test/data/rfc4134/AlicePrivRSASign.pri b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/AlicePrivRSASign.pri similarity index 100% rename from crypto/test/data/rfc4134/AlicePrivRSASign.pri rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/AlicePrivRSASign.pri diff --git a/crypto/test/data/rfc4134/AliceRSASignByCarl.cer b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/AliceRSASignByCarl.cer similarity index 100% rename from crypto/test/data/rfc4134/AliceRSASignByCarl.cer rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/AliceRSASignByCarl.cer diff --git a/crypto/test/data/rfc4134/BobPrivRSAEncrypt.pri b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/BobPrivRSAEncrypt.pri similarity index 100% rename from crypto/test/data/rfc4134/BobPrivRSAEncrypt.pri rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/BobPrivRSAEncrypt.pri diff --git a/crypto/test/data/rfc4134/BobRSASignByCarl.cer b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/BobRSASignByCarl.cer similarity index 100% rename from crypto/test/data/rfc4134/BobRSASignByCarl.cer rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/BobRSASignByCarl.cer diff --git a/crypto/test/data/rfc4134/CarlDSSCRLEmpty.crl b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSCRLEmpty.crl similarity index 100% rename from crypto/test/data/rfc4134/CarlDSSCRLEmpty.crl rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSCRLEmpty.crl diff --git a/crypto/test/data/rfc4134/CarlDSSCRLForAll.crl b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSCRLForAll.crl similarity index 100% rename from crypto/test/data/rfc4134/CarlDSSCRLForAll.crl rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSCRLForAll.crl diff --git a/crypto/test/data/rfc4134/CarlDSSCRLForCarl.crl b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSCRLForCarl.crl similarity index 100% rename from crypto/test/data/rfc4134/CarlDSSCRLForCarl.crl rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSCRLForCarl.crl diff --git a/crypto/test/data/rfc4134/CarlDSSSelf.cer b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSSelf.cer similarity index 100% rename from crypto/test/data/rfc4134/CarlDSSSelf.cer rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlDSSSelf.cer diff --git a/crypto/test/data/rfc4134/CarlPrivDSSSign.pri b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlPrivDSSSign.pri similarity index 100% rename from crypto/test/data/rfc4134/CarlPrivDSSSign.pri rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlPrivDSSSign.pri diff --git a/crypto/test/data/rfc4134/CarlPrivRSASign.pri b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlPrivRSASign.pri similarity index 100% rename from crypto/test/data/rfc4134/CarlPrivRSASign.pri rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlPrivRSASign.pri diff --git a/crypto/test/data/rfc4134/CarlRSACRLEmpty.crl b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSACRLEmpty.crl similarity index 100% rename from crypto/test/data/rfc4134/CarlRSACRLEmpty.crl rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSACRLEmpty.crl diff --git a/crypto/test/data/rfc4134/CarlRSACRLForAll.crl b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSACRLForAll.crl similarity index 100% rename from crypto/test/data/rfc4134/CarlRSACRLForAll.crl rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSACRLForAll.crl diff --git a/crypto/test/data/rfc4134/CarlRSACRLForCarl.crl b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSACRLForCarl.crl similarity index 100% rename from crypto/test/data/rfc4134/CarlRSACRLForCarl.crl rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSACRLForCarl.crl diff --git a/crypto/test/data/rfc4134/CarlRSASelf.cer b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSASelf.cer similarity index 100% rename from crypto/test/data/rfc4134/CarlRSASelf.cer rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/CarlRSASelf.cer diff --git a/crypto/test/data/rfc4134/DianeDSSSignByCarlInherit.cer b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianeDSSSignByCarlInherit.cer similarity index 100% rename from crypto/test/data/rfc4134/DianeDSSSignByCarlInherit.cer rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianeDSSSignByCarlInherit.cer diff --git a/crypto/test/data/rfc4134/DianePrivDSSSign.pri b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianePrivDSSSign.pri similarity index 100% rename from crypto/test/data/rfc4134/DianePrivDSSSign.pri rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianePrivDSSSign.pri diff --git a/crypto/test/data/rfc4134/DianePrivRSASignEncrypt.pri b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianePrivRSASignEncrypt.pri similarity index 100% rename from crypto/test/data/rfc4134/DianePrivRSASignEncrypt.pri rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianePrivRSASignEncrypt.pri diff --git a/crypto/test/data/rfc4134/DianeRSASignByCarl.cer b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianeRSASignByCarl.cer similarity index 100% rename from crypto/test/data/rfc4134/DianeRSASignByCarl.cer rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/DianeRSASignByCarl.cer diff --git a/crypto/test/data/rfc4134/ExContent.bin b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/ExContent.bin similarity index 100% rename from crypto/test/data/rfc4134/ExContent.bin rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/ExContent.bin diff --git a/crypto/test/data/rfc4134/rfc4134.txt b/test/Crypto.NetSdk.NUnitTest/data/rfc4134/rfc4134.txt similarity index 100% rename from crypto/test/data/rfc4134/rfc4134.txt rename to test/Crypto.NetSdk.NUnitTest/data/rfc4134/rfc4134.txt diff --git a/crypto/test/data/rsa3/self-testcase-A.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-A.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-A.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-A.p12 diff --git a/crypto/test/data/rsa3/self-testcase-A.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-A.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-A.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-A.pem diff --git a/crypto/test/data/rsa3/self-testcase-B.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-B.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-B.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-B.p12 diff --git a/crypto/test/data/rsa3/self-testcase-B.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-B.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-B.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-B.pem diff --git a/crypto/test/data/rsa3/self-testcase-C.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-C.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-C.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-C.p12 diff --git a/crypto/test/data/rsa3/self-testcase-C.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-C.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-C.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-C.pem diff --git a/crypto/test/data/rsa3/self-testcase-D.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-D.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-D.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-D.p12 diff --git a/crypto/test/data/rsa3/self-testcase-D.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-D.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-D.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-D.pem diff --git a/crypto/test/data/rsa3/self-testcase-E.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-E.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-E.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-E.p12 diff --git a/crypto/test/data/rsa3/self-testcase-E.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-E.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-E.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-E.pem diff --git a/crypto/test/data/rsa3/self-testcase-F.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-F.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-F.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-F.p12 diff --git a/crypto/test/data/rsa3/self-testcase-F.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-F.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-F.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-F.pem diff --git a/crypto/test/data/rsa3/self-testcase-G.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-G.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-G.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-G.p12 diff --git a/crypto/test/data/rsa3/self-testcase-G.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-G.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-G.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-G.pem diff --git a/crypto/test/data/rsa3/self-testcase-H.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-H.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-H.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-H.p12 diff --git a/crypto/test/data/rsa3/self-testcase-H.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-H.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-H.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-H.pem diff --git a/crypto/test/data/rsa3/self-testcase-I.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-I.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-I.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-I.p12 diff --git a/crypto/test/data/rsa3/self-testcase-I.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-I.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-I.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-I.pem diff --git a/crypto/test/data/rsa3/self-testcase-J.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-J.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-J.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-J.p12 diff --git a/crypto/test/data/rsa3/self-testcase-J.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-J.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-J.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-J.pem diff --git a/crypto/test/data/rsa3/self-testcase-L.p12 b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-L.p12 similarity index 100% rename from crypto/test/data/rsa3/self-testcase-L.p12 rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-L.p12 diff --git a/crypto/test/data/rsa3/self-testcase-L.pem b/test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-L.pem similarity index 100% rename from crypto/test/data/rsa3/self-testcase-L.pem rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/self-testcase-L.pem diff --git a/crypto/test/data/rsa3/testcases.README b/test/Crypto.NetSdk.NUnitTest/data/rsa3/testcases.README similarity index 67% rename from crypto/test/data/rsa3/testcases.README rename to test/Crypto.NetSdk.NUnitTest/data/rsa3/testcases.README index 6485740276..70d33e075c 100644 Binary files a/crypto/test/data/rsa3/testcases.README and b/test/Crypto.NetSdk.NUnitTest/data/rsa3/testcases.README differ diff --git a/crypto/test/data/scrypt/TestVectors.txt b/test/Crypto.NetSdk.NUnitTest/data/scrypt/TestVectors.txt similarity index 100% rename from crypto/test/data/scrypt/TestVectors.txt rename to test/Crypto.NetSdk.NUnitTest/data/scrypt/TestVectors.txt diff --git a/crypto/test/data/suvaEE.crt b/test/Crypto.NetSdk.NUnitTest/data/suvaEE.crt similarity index 98% rename from crypto/test/data/suvaEE.crt rename to test/Crypto.NetSdk.NUnitTest/data/suvaEE.crt index cc8e8ac8a3..14075427a6 100644 --- a/crypto/test/data/suvaEE.crt +++ b/test/Crypto.NetSdk.NUnitTest/data/suvaEE.crt @@ -1,32 +1,32 @@ ------BEGIN CERTIFICATE----- -MIIFfjCCA2agAwIBAgIIBHTrx4eZAPkwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UE -BhMCQ0gxDzANBgNVBAgTBkx1emVybjEPMA0GA1UEBxMGTHV6ZXJuMQ0wCwYDVQQK -EwRTdXZhMQswCQYDVQQLEwJJRjEjMCEGA1UEAxMaU3V2YSBTZWN1cmUgTWFpbCBJ -Q0EgMSAoMSkwHhcNMTQwODA0MTE0OTIxWhcNMTYwODAzMTI0OTIxWjCBhTELMAkG -A1UEBhMCQ0gxDzANBgNVBAgMBkx1emVybjEPMA0GA1UEBwwGTHV6ZXJuMQ0wCwYD -VQQKDARTdXZhMQswCQYDVQQLDAJJRjEUMBIGA1UEAwwLTmljbyBNYXJpdHoxIjAg -BgkqhkiG9w0BCQEWE25pY28ubWFyaXR6QHN1dmEuY2gwggEiMA0GCSqGSIb3DQEB -AQUAA4IBDwAwggEKAoIBAQCweUvvHneU32sriCJJBl18xKqUE9DrGUFDhNCpgKLd -OhLKZJRgG/rpD1qn9gMI7KnnubbWpW3HCW+6nXT8wPpqMBNpjVgDwL/gb0eKMRvk -QcOs9kvaIt142MGCMZIlLBL/7/JTJhRi9tysJq8wacymqTDIh4MsejatsmXzRCx4 -tUIuNgFfObDGz0viSUplDz2xlVElRYQ5GRVVRvZF2lAlA0ymhbJwPvKRuf9ou7dh -wlG7nDgUMQnt4a+88sFTIogN11u7H5TiHgDArI8ovJjHFT7SZw/XgMsSM5NVcv1J -cSoGP4xQ1VdScr80HaVK+GIaJIiG9VcGMw4t/vwBSrBZAgMBAAGjggEEMIIBADAT -BgNVHSUEDDAKBggrBgEFBQcDBDALBgNVHQ8EBAMCBPAwHQYDVR0OBBYEFMuyfXI4 -PH87MolGzEoxWg4YMwKmMB8GA1UdIwQYMBaAFHrwc1/OwXgGLLVN2K5T/IQtgWYo -MCEGCWCGSAGG+EIBDQQUExJTdXZhIFNlY3VyZSBFLU1haWwwHgYDVR0RBBcwFYET -bmljby5tYXJpdHpAc3V2YS5jaDAMBgNVHRMBAf8EAjAAMBEGCWCGSAGG+EIBAQQE -AwIFIDA4BgNVHR8EMTAvMC2gK6AphidodHRwOi8vcGtpLnN1dmEuY2gvY3JsL3N1 -dmFtaWNhMSgxKS5jcmwwDQYJKoZIhvcNAQEFBQADggIBADCszfdfxrt+LTgh3MMp -R+7Yt8GZT5svQDLmpmUqkDcY5dHIvfSu/YBF/wVDKz+wbegTjonwr1do9Msc8lRl -BAHfFk23os6MZJr4efpuBaJXFKJN23T6U9nZgphDAroA5MreF0MVkTnQQMvLL+tu -rXAPFQb0XKl5K4xWDcn5wKdcA7UZsLW2guZm7LiWuPYiNVk5QXg3Z9awZfquFGXw -1uOCfhIv5IlfVwXf94kok6sy3tnk3IDuYLBfaAVHpAMgyocgn1XU/aAy7y+bUUHe -AosKkV6AZ/5pirZv8yDuB37sIEAiOfMc3cCYk/ACbw+C18XcGXUKxWNBG+LUiJ/n -lvxnqCWOAS4/U52I0bmbXYMZ9Iz8dYoMe19iG2sQHMhw4S25O/oKhllzmren1BNd -EA/EZdbmqjmGDfvY6ELQpyeTUz6u/4Hfcdd/8IavcYXfBo0kpPJFm6epjMBSw2Bi -D1r1U+8oGNwoTce++Ch30eEjuxyMFTDOXzJObJHsZmcPP1fxKch5yGX+cF2oDWju -GOvviu9YxVTC4m+vwAwmmKSl7XylrVcJmXCh7u92wvgw8kXqA0R/P/gn8QQtQ5Ge -/a6vJRyhDVEP8wWmyebLZYlHZDrosD191d92SKaMRg7HDAH0nZ6wtlgxD20JyDO0 -FIIJq/d36mNrHPbd7Y4SxiAX ------END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIFfjCCA2agAwIBAgIIBHTrx4eZAPkwDQYJKoZIhvcNAQEFBQAwcDELMAkGA1UE +BhMCQ0gxDzANBgNVBAgTBkx1emVybjEPMA0GA1UEBxMGTHV6ZXJuMQ0wCwYDVQQK +EwRTdXZhMQswCQYDVQQLEwJJRjEjMCEGA1UEAxMaU3V2YSBTZWN1cmUgTWFpbCBJ +Q0EgMSAoMSkwHhcNMTQwODA0MTE0OTIxWhcNMTYwODAzMTI0OTIxWjCBhTELMAkG +A1UEBhMCQ0gxDzANBgNVBAgMBkx1emVybjEPMA0GA1UEBwwGTHV6ZXJuMQ0wCwYD +VQQKDARTdXZhMQswCQYDVQQLDAJJRjEUMBIGA1UEAwwLTmljbyBNYXJpdHoxIjAg +BgkqhkiG9w0BCQEWE25pY28ubWFyaXR6QHN1dmEuY2gwggEiMA0GCSqGSIb3DQEB +AQUAA4IBDwAwggEKAoIBAQCweUvvHneU32sriCJJBl18xKqUE9DrGUFDhNCpgKLd +OhLKZJRgG/rpD1qn9gMI7KnnubbWpW3HCW+6nXT8wPpqMBNpjVgDwL/gb0eKMRvk +QcOs9kvaIt142MGCMZIlLBL/7/JTJhRi9tysJq8wacymqTDIh4MsejatsmXzRCx4 +tUIuNgFfObDGz0viSUplDz2xlVElRYQ5GRVVRvZF2lAlA0ymhbJwPvKRuf9ou7dh +wlG7nDgUMQnt4a+88sFTIogN11u7H5TiHgDArI8ovJjHFT7SZw/XgMsSM5NVcv1J +cSoGP4xQ1VdScr80HaVK+GIaJIiG9VcGMw4t/vwBSrBZAgMBAAGjggEEMIIBADAT +BgNVHSUEDDAKBggrBgEFBQcDBDALBgNVHQ8EBAMCBPAwHQYDVR0OBBYEFMuyfXI4 +PH87MolGzEoxWg4YMwKmMB8GA1UdIwQYMBaAFHrwc1/OwXgGLLVN2K5T/IQtgWYo +MCEGCWCGSAGG+EIBDQQUExJTdXZhIFNlY3VyZSBFLU1haWwwHgYDVR0RBBcwFYET +bmljby5tYXJpdHpAc3V2YS5jaDAMBgNVHRMBAf8EAjAAMBEGCWCGSAGG+EIBAQQE +AwIFIDA4BgNVHR8EMTAvMC2gK6AphidodHRwOi8vcGtpLnN1dmEuY2gvY3JsL3N1 +dmFtaWNhMSgxKS5jcmwwDQYJKoZIhvcNAQEFBQADggIBADCszfdfxrt+LTgh3MMp +R+7Yt8GZT5svQDLmpmUqkDcY5dHIvfSu/YBF/wVDKz+wbegTjonwr1do9Msc8lRl +BAHfFk23os6MZJr4efpuBaJXFKJN23T6U9nZgphDAroA5MreF0MVkTnQQMvLL+tu +rXAPFQb0XKl5K4xWDcn5wKdcA7UZsLW2guZm7LiWuPYiNVk5QXg3Z9awZfquFGXw +1uOCfhIv5IlfVwXf94kok6sy3tnk3IDuYLBfaAVHpAMgyocgn1XU/aAy7y+bUUHe +AosKkV6AZ/5pirZv8yDuB37sIEAiOfMc3cCYk/ACbw+C18XcGXUKxWNBG+LUiJ/n +lvxnqCWOAS4/U52I0bmbXYMZ9Iz8dYoMe19iG2sQHMhw4S25O/oKhllzmren1BNd +EA/EZdbmqjmGDfvY6ELQpyeTUz6u/4Hfcdd/8IavcYXfBo0kpPJFm6epjMBSw2Bi +D1r1U+8oGNwoTce++Ch30eEjuxyMFTDOXzJObJHsZmcPP1fxKch5yGX+cF2oDWju +GOvviu9YxVTC4m+vwAwmmKSl7XylrVcJmXCh7u92wvgw8kXqA0R/P/gn8QQtQ5Ge +/a6vJRyhDVEP8wWmyebLZYlHZDrosD191d92SKaMRg7HDAH0nZ6wtlgxD20JyDO0 +FIIJq/d36mNrHPbd7Y4SxiAX +-----END CERTIFICATE----- diff --git a/crypto/test/data/suvaEmail1.crt b/test/Crypto.NetSdk.NUnitTest/data/suvaEmail1.crt similarity index 98% rename from crypto/test/data/suvaEmail1.crt rename to test/Crypto.NetSdk.NUnitTest/data/suvaEmail1.crt index a7bcfdd6c9..8463c4dbbf 100644 --- a/crypto/test/data/suvaEmail1.crt +++ b/test/Crypto.NetSdk.NUnitTest/data/suvaEmail1.crt @@ -1,39 +1,39 @@ ------BEGIN CERTIFICATE----- -MIIG5DCCBMygAwIBAgIKF/12kwABAAACGDANBgkqhkiG9w0BAQUFADBGMQswCQYD -VQQGEwJDSDEPMA0GA1UECBMGTHV6ZXJuMQ0wCwYDVQQKEwRTdXZhMRcwFQYDVQQD -Ew5TdXZhIFJvb3QgQ0EgMTAeFw0xNDA1MTcwODAwNDJaFw0yNDA1MDcxMzEyMDNa -MHAxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy -bjENMAsGA1UEChMEU3V2YTELMAkGA1UECxMCSUYxIzAhBgNVBAMTGlN1dmEgU2Vj -dXJlIE1haWwgSUNBIDEgKDEpMIICIDANBgkqhkiG9w0BAQEFAAOCAg0AMIICCAKC -AgEAueI8pNseKiE5+3adL3ZBQQ5g6ajOAY0KI3TCV5YKt8OjFbNviV+ja9mwrhMP -hx+QaTQruyCbi6FcNQlLxhilrjKX30//J3GvPc65t8Vcs2XsyC8u6KJaaQG8kl89 -j1/F76Ary/MiFU5ZaZuyj9vwDuHjRK2Vq8PxlHNRwGQFXI5y1LJPd/DUM6hY/sub -x//rknAJYPELKj5skFGz+prQR4ZgXegjN/9F1mmGFUEdCjoROV5m91asp3KFcK3L -DyQ5WC3JVm1zSvUTpGHKVqKXX+6WvG8wbv2AIvf8XLVI92bNB6xXpV2Tq05mLx48 -txfPVez4gfGkjhAK8StFKPEJs8CIvGV1XGUGM79VSw86rN6qT/A6kpGU1FsNwHv8 -HP3BArQLR3L+mQEnlulXhKE4K6hbx9seOhufhTORoW3F2QDW71SFWag5KV+r64zC -uE9aHy20seLs6rK4+lgV1SLMsew5Ot3AKfXbCVl2SG6gwE1M6V0DYRM787tdEVo/ -CMzP1FrWj96DX2aAU6BiRC36Jjd1HrJuIVmuXvVsE6YmfRIzSYKZBT/ZR/7knl13 -fTuR6K1kiWZs4Alq6mrVXxqcXOXR8k8NzNK9RI+XiYOuSAGHu2uX4pDXiEro7AFd -o/jqIZozuLZ2C7B7Yigf39I2WEEM4zILqSbIthLGcOJn0/0CAQOjggGqMIIBpjAS -BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUevBz -X87BeAYstU3YrlP8hC2BZigwHwYDVR0jBBgwFoAUPFQUaTyz0/rgxsL2+kdFRxXK -KmowQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3BraS5zdXZhLmNoL2NybC9TdXZh -JTIwUm9vdCUyMENBJTIwMSgxKS5jcmwwcwYIKwYBBQUHAQEEZzBlMCMGCCsGAQUF -BzABhhdodHRwOi8vcGtpLnN1dmEuY2gvb2NzcDA+BggrBgEFBQcwAoYyaHR0cDov -L3BraS5zdXZhLmNoL2NydC9TdXZhJTIwUm9vdCUyMENBJTIwMSgxKS5jcnQwPAYJ -KwYBBAGCNxUHBC8wLQYlKwYBBAGCNxUIxZdWhpShU4LRlzCD+65khNfBO0aHve1v -hcKqLQIBZAIBBzAeBgNVHSUEFzAVBggrBgEFBQcDBAYJKwYBBAGCNxUFMCgGCSsG -AQQBgjcVCgQbMBkwCgYIKwYBBQUHAwQwCwYJKwYBBAGCNxUFMA0GCSqGSIb3DQEB -BQUAA4ICAQDeAhIR0DCUS4tHJCJAPgHH/uMQcgV3qKNkZznmaKQ0kRl2JISbojrv -6WnIr+gcyoBPbI01QNbe7Dh73mMK/ezUZ04B9z9UBUvV5l7rCOL28Hnz/zmZZX+T -q3jxtQJPV4w2b9tuo8/vEUirEySmkmN6IGbu1epAhp9mCKUNjC6Oe3JwsMX/ouZN -Op2PPQ82fjVk8zlUpVX9qfRc9XmW992JrUe/npWqdJYYSJY1vFB9b6gMGiwOms1H -oXuDz0BQXp0m0D+7VjY8qi8vN7N8/Zy6EC/453ogal20nhMEiihGkvD68RyBjQO6 -kEWcjUizcC0vjcH6W+EyQeJ5VDTxv/GlSA2SHZWFJ7/T1dY+bHBjHr7aqptQzZeU -cWv0BfFdlEMkzZgOLRrmHKdTCGa/11vi3T12SzISwyGakPKrA8IaJCzNQO3/6dc8 -DBX8p9RO54VrSDsDSfTueofMnBpUJABMe1Eohqsj0sZv0n8cK85A6utQPuSxmgV2 -IAXdJMJcGAZ6PDKKCJYVVdHOeFEdUMh/fh6QGd1Iz0QMfMeiZODTo92loHnW0HPL -aVTdoQmn3K1yVFUrdYp/OJz4UDWFb2k4Du6GeQl1jqc2VREPohvvbDSJ9pgE3Oh2 -DEN7RZ7zK/FwLZeo8Qgo4yguznSzp3zLrUwLTewRNU1QbEiy9tIclQ== ------END CERTIFICATE----- +-----BEGIN CERTIFICATE----- +MIIG5DCCBMygAwIBAgIKF/12kwABAAACGDANBgkqhkiG9w0BAQUFADBGMQswCQYD +VQQGEwJDSDEPMA0GA1UECBMGTHV6ZXJuMQ0wCwYDVQQKEwRTdXZhMRcwFQYDVQQD +Ew5TdXZhIFJvb3QgQ0EgMTAeFw0xNDA1MTcwODAwNDJaFw0yNDA1MDcxMzEyMDNa +MHAxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDzANBgNVBAcTBkx1emVy +bjENMAsGA1UEChMEU3V2YTELMAkGA1UECxMCSUYxIzAhBgNVBAMTGlN1dmEgU2Vj +dXJlIE1haWwgSUNBIDEgKDEpMIICIDANBgkqhkiG9w0BAQEFAAOCAg0AMIICCAKC +AgEAueI8pNseKiE5+3adL3ZBQQ5g6ajOAY0KI3TCV5YKt8OjFbNviV+ja9mwrhMP +hx+QaTQruyCbi6FcNQlLxhilrjKX30//J3GvPc65t8Vcs2XsyC8u6KJaaQG8kl89 +j1/F76Ary/MiFU5ZaZuyj9vwDuHjRK2Vq8PxlHNRwGQFXI5y1LJPd/DUM6hY/sub +x//rknAJYPELKj5skFGz+prQR4ZgXegjN/9F1mmGFUEdCjoROV5m91asp3KFcK3L +DyQ5WC3JVm1zSvUTpGHKVqKXX+6WvG8wbv2AIvf8XLVI92bNB6xXpV2Tq05mLx48 +txfPVez4gfGkjhAK8StFKPEJs8CIvGV1XGUGM79VSw86rN6qT/A6kpGU1FsNwHv8 +HP3BArQLR3L+mQEnlulXhKE4K6hbx9seOhufhTORoW3F2QDW71SFWag5KV+r64zC +uE9aHy20seLs6rK4+lgV1SLMsew5Ot3AKfXbCVl2SG6gwE1M6V0DYRM787tdEVo/ +CMzP1FrWj96DX2aAU6BiRC36Jjd1HrJuIVmuXvVsE6YmfRIzSYKZBT/ZR/7knl13 +fTuR6K1kiWZs4Alq6mrVXxqcXOXR8k8NzNK9RI+XiYOuSAGHu2uX4pDXiEro7AFd +o/jqIZozuLZ2C7B7Yigf39I2WEEM4zILqSbIthLGcOJn0/0CAQOjggGqMIIBpjAS +BgNVHRMBAf8ECDAGAQH/AgEAMA4GA1UdDwEB/wQEAwIBBjAdBgNVHQ4EFgQUevBz +X87BeAYstU3YrlP8hC2BZigwHwYDVR0jBBgwFoAUPFQUaTyz0/rgxsL2+kdFRxXK +KmowQwYDVR0fBDwwOjA4oDagNIYyaHR0cDovL3BraS5zdXZhLmNoL2NybC9TdXZh +JTIwUm9vdCUyMENBJTIwMSgxKS5jcmwwcwYIKwYBBQUHAQEEZzBlMCMGCCsGAQUF +BzABhhdodHRwOi8vcGtpLnN1dmEuY2gvb2NzcDA+BggrBgEFBQcwAoYyaHR0cDov +L3BraS5zdXZhLmNoL2NydC9TdXZhJTIwUm9vdCUyMENBJTIwMSgxKS5jcnQwPAYJ +KwYBBAGCNxUHBC8wLQYlKwYBBAGCNxUIxZdWhpShU4LRlzCD+65khNfBO0aHve1v +hcKqLQIBZAIBBzAeBgNVHSUEFzAVBggrBgEFBQcDBAYJKwYBBAGCNxUFMCgGCSsG +AQQBgjcVCgQbMBkwCgYIKwYBBQUHAwQwCwYJKwYBBAGCNxUFMA0GCSqGSIb3DQEB +BQUAA4ICAQDeAhIR0DCUS4tHJCJAPgHH/uMQcgV3qKNkZznmaKQ0kRl2JISbojrv +6WnIr+gcyoBPbI01QNbe7Dh73mMK/ezUZ04B9z9UBUvV5l7rCOL28Hnz/zmZZX+T +q3jxtQJPV4w2b9tuo8/vEUirEySmkmN6IGbu1epAhp9mCKUNjC6Oe3JwsMX/ouZN +Op2PPQ82fjVk8zlUpVX9qfRc9XmW992JrUe/npWqdJYYSJY1vFB9b6gMGiwOms1H +oXuDz0BQXp0m0D+7VjY8qi8vN7N8/Zy6EC/453ogal20nhMEiihGkvD68RyBjQO6 +kEWcjUizcC0vjcH6W+EyQeJ5VDTxv/GlSA2SHZWFJ7/T1dY+bHBjHr7aqptQzZeU +cWv0BfFdlEMkzZgOLRrmHKdTCGa/11vi3T12SzISwyGakPKrA8IaJCzNQO3/6dc8 +DBX8p9RO54VrSDsDSfTueofMnBpUJABMe1Eohqsj0sZv0n8cK85A6utQPuSxmgV2 +IAXdJMJcGAZ6PDKKCJYVVdHOeFEdUMh/fh6QGd1Iz0QMfMeiZODTo92loHnW0HPL +aVTdoQmn3K1yVFUrdYp/OJz4UDWFb2k4Du6GeQl1jqc2VREPohvvbDSJ9pgE3Oh2 +DEN7RZ7zK/FwLZeo8Qgo4yguznSzp3zLrUwLTewRNU1QbEiy9tIclQ== +-----END CERTIFICATE----- diff --git a/crypto/test/data/suvaRoot1.crt b/test/Crypto.NetSdk.NUnitTest/data/suvaRoot1.crt similarity index 98% rename from crypto/test/data/suvaRoot1.crt rename to test/Crypto.NetSdk.NUnitTest/data/suvaRoot1.crt index 83cfe6686c..692482e52b 100644 --- a/crypto/test/data/suvaRoot1.crt +++ b/test/Crypto.NetSdk.NUnitTest/data/suvaRoot1.crt @@ -1,46 +1,46 @@ ------BEGIN CERTIFICATE----- -MIIH4jCCBcqgAwIBAgIUZ6RtH7xmDM0r66IKSlpCZNrlRfYwDQYJKoZIhvcNAQEF -BQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZ -BgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0xNDA1MDcxMzEyMDNaFw0yNDA1 -MDcxMzEyMDNaMEYxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDTALBgNV -BAoTBFN1dmExFzAVBgNVBAMTDlN1dmEgUm9vdCBDQSAxMIICIjANBgkqhkiG9w0B -AQEFAAOCAg8AMIICCgKCAgEA9KfSFwpwbRnrfnMk1DkKQguwEKg6crSLKS31CU9E -ShdmIzMQyo9k4doec6c0cpubk17VlEEE8SmFSqwmLBRo+65kR5c3X4MeI0Fv1ZXH -WV+ZiaK+CVPf4OFNNCNuEFc1qnNxyWGvGVI+KMk1Lmrpda6h5GkMpFdxBRGq4RkU -aw41ljJgY9+UapZTl0b39XEeEgQshY/hKEKPeRZNeTHBFWFTsAZxZBSH0bz35zfh -X1oQLad3b5Q2Nw1utEcai4I9DnTyAQ7wRtius217twXERdpeLdTurKe7TVqHcyBS -ziTpsCewINJ1S69a1E7Z59SNorOEgGIS2Z89fIlwYVQkcW5pLZL+Q5UC1rcD/FWq -m4rIOrjM0AYcLEiScmNYYgLEPrXvh1BVMkc+SIqiQ7JhlzXSDZmMBcqrlVilp2oz -lyuCRlMpGdlUqe0BD3JY/vfOZRm+NHfys4mmLIQhLJgX2vH5UOeAzdQ2pkpFdHNq -1tMLITr108NcZ62updidyVFy+8kbr7NKawmp03MtYjdYqEi2lDNgJcwk17uoxhbv -LEYvSNM+wMc73duO97pOrgbTrIIHeBdgjP/ZqHkW/4ZtxUpxFSxqoBgUVw6IHTn9 -2cYBmouDdhEYhnFhcEVqYP5N0JjT9nFzWL/EU+Lgk8y3x59luxaGJV9tEU9P0MIy -cBUCAwEAAaOCAscwggLDMBIGA1UdEwEB/wQIMAYBAf8CAQEwcwYIKwYBBQUHAQEE -ZzBlMCsGCCsGAQUFBzABhh9odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20v -MDYGCCsGAQUFBzAChipodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2 -cmNhMy5jcnQwgdAGA1UdIASByDCBxTCBwgYMKwYBBAG+WAADhFgAMIGxMIGDBggr -BgEFBQcCAjB3GnVBbnkgdXNlIG9mIHRoaXMgQ2VydGlmaWNhdGUgY29uc3RpdHV0 -ZXMgYWNjZXB0YW5jZSBvZiB0aGUgU3V2YSBDZXJ0aWZpY2F0ZSBQb2xpY3kgLyBD -ZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wKQYIKwYBBQUHAgEWHWh0 -dHA6Ly9wa2kuc3V2YS5jaC9yZXBvc2l0b3J5MGQGA1UdHgRdMFugWTAKgQhAc3V2 -YS5jaDANgQtAc3V2YW5ldC5jaDAPgQ1Ac3V2YW5ldDYyLmNoMA+BDUBzdXZhbmV0 -NzcuY2gwDIEKQHN1dmE2Mi5jaDAMgQpAc3V2YTc3LmNoMA4GA1UdDwEB/wQEAwIB -BjB0BgNVHSUEbTBrBggrBgEFBQcDBAYIKwYBBQUHAwIGCCsGAQUFBwMJBgorBgEE -AYI3CgMEBgorBgEEAYI3FAICBgorBgEEAYI3FAIBBgcrBgEFAgMFBggrBgEFBQgC -AgYJKwYBBAGCNxUFBgkrBgEEAYI3FQYwHwYDVR0jBBgwFoAU8sAT4IJDPvvuL2cy -ljVc27jLAtAwOQYDVR0fBDIwMDAuoCygKoYoaHR0cDovL2NybC5xdW92YWRpc2ds -b2JhbC5jb20vcXZyY2EzLmNybDAdBgNVHQ4EFgQUPFQUaTyz0/rgxsL2+kdFRxXK -KmowDQYJKoZIhvcNAQEFBQADggIBADsk54ImQSM2LcLtwpH5s3NPn/qpua22SUyH -sujqy8vHEAOS0KPbN+Jnq4KpexylTVHQ3ybgHSQt6SZ+/NSBHO8eAAyqZyWjenyk -UCcL7TNO82tD7lkuq+eo+BIsq9AJTI0gGRqG/wFyvNpVssZ0bFdqGNq0aM74NHWD -7LRa6toC1I+YNpvelSlZvGfEpm0G7e04AE3kzFnaemG3RwRY2mUtT5Aby5vpfouh -IbdF4t1NEyC9ExFOkEjZ3P1AAoJgxQC3T7B1Mo6r03pcBdd9LrjjVJidUyj+j/ha -faZo4e1wJeU09UtzVSzGb1GA8QHOJMY7VeA0qLg4qfZdeoDxrCZJKn/pZP2D6dQs -0Za1args4EUJmdVFsuFNc1DsM1EXTD5o9dHkX/cKPv6eMRehP7emNjJgmcIv1rX3 -sotSJA06D+5LW6ZkuWdS2uArCta8YgrVtefRMNj2nhVGafLt7tE819E0fqnaknGR -RgfNRFEMeTIU29RtgvzbpYtCK+O1v7a3x55mt/RbMhtruns3OOVAY+l7nW1y51Xb -A8bPOZc7fREndSacNCpK37Or3AhE4Uneylz+rN25H2hL8OT/xAXxj6IcPRuD2SDH -nvXiM0xeqCQpfDNv/35uNSMdpsA75GZwRpvt0fMc5r0AwtwBFZX7X4KtULoNxLNb -JZxATf23 ------END CERTIFICATE----- - +-----BEGIN CERTIFICATE----- +MIIH4jCCBcqgAwIBAgIUZ6RtH7xmDM0r66IKSlpCZNrlRfYwDQYJKoZIhvcNAQEF +BQAwRTELMAkGA1UEBhMCQk0xGTAXBgNVBAoTEFF1b1ZhZGlzIExpbWl0ZWQxGzAZ +BgNVBAMTElF1b1ZhZGlzIFJvb3QgQ0EgMzAeFw0xNDA1MDcxMzEyMDNaFw0yNDA1 +MDcxMzEyMDNaMEYxCzAJBgNVBAYTAkNIMQ8wDQYDVQQIEwZMdXplcm4xDTALBgNV +BAoTBFN1dmExFzAVBgNVBAMTDlN1dmEgUm9vdCBDQSAxMIICIjANBgkqhkiG9w0B +AQEFAAOCAg8AMIICCgKCAgEA9KfSFwpwbRnrfnMk1DkKQguwEKg6crSLKS31CU9E +ShdmIzMQyo9k4doec6c0cpubk17VlEEE8SmFSqwmLBRo+65kR5c3X4MeI0Fv1ZXH +WV+ZiaK+CVPf4OFNNCNuEFc1qnNxyWGvGVI+KMk1Lmrpda6h5GkMpFdxBRGq4RkU +aw41ljJgY9+UapZTl0b39XEeEgQshY/hKEKPeRZNeTHBFWFTsAZxZBSH0bz35zfh +X1oQLad3b5Q2Nw1utEcai4I9DnTyAQ7wRtius217twXERdpeLdTurKe7TVqHcyBS +ziTpsCewINJ1S69a1E7Z59SNorOEgGIS2Z89fIlwYVQkcW5pLZL+Q5UC1rcD/FWq +m4rIOrjM0AYcLEiScmNYYgLEPrXvh1BVMkc+SIqiQ7JhlzXSDZmMBcqrlVilp2oz +lyuCRlMpGdlUqe0BD3JY/vfOZRm+NHfys4mmLIQhLJgX2vH5UOeAzdQ2pkpFdHNq +1tMLITr108NcZ62updidyVFy+8kbr7NKawmp03MtYjdYqEi2lDNgJcwk17uoxhbv +LEYvSNM+wMc73duO97pOrgbTrIIHeBdgjP/ZqHkW/4ZtxUpxFSxqoBgUVw6IHTn9 +2cYBmouDdhEYhnFhcEVqYP5N0JjT9nFzWL/EU+Lgk8y3x59luxaGJV9tEU9P0MIy +cBUCAwEAAaOCAscwggLDMBIGA1UdEwEB/wQIMAYBAf8CAQEwcwYIKwYBBQUHAQEE +ZzBlMCsGCCsGAQUFBzABhh9odHRwOi8vb2NzcC5xdW92YWRpc2dsb2JhbC5jb20v +MDYGCCsGAQUFBzAChipodHRwOi8vdHJ1c3QucXVvdmFkaXNnbG9iYWwuY29tL3F2 +cmNhMy5jcnQwgdAGA1UdIASByDCBxTCBwgYMKwYBBAG+WAADhFgAMIGxMIGDBggr +BgEFBQcCAjB3GnVBbnkgdXNlIG9mIHRoaXMgQ2VydGlmaWNhdGUgY29uc3RpdHV0 +ZXMgYWNjZXB0YW5jZSBvZiB0aGUgU3V2YSBDZXJ0aWZpY2F0ZSBQb2xpY3kgLyBD +ZXJ0aWZpY2F0aW9uIFByYWN0aWNlIFN0YXRlbWVudC4wKQYIKwYBBQUHAgEWHWh0 +dHA6Ly9wa2kuc3V2YS5jaC9yZXBvc2l0b3J5MGQGA1UdHgRdMFugWTAKgQhAc3V2 +YS5jaDANgQtAc3V2YW5ldC5jaDAPgQ1Ac3V2YW5ldDYyLmNoMA+BDUBzdXZhbmV0 +NzcuY2gwDIEKQHN1dmE2Mi5jaDAMgQpAc3V2YTc3LmNoMA4GA1UdDwEB/wQEAwIB +BjB0BgNVHSUEbTBrBggrBgEFBQcDBAYIKwYBBQUHAwIGCCsGAQUFBwMJBgorBgEE +AYI3CgMEBgorBgEEAYI3FAICBgorBgEEAYI3FAIBBgcrBgEFAgMFBggrBgEFBQgC +AgYJKwYBBAGCNxUFBgkrBgEEAYI3FQYwHwYDVR0jBBgwFoAU8sAT4IJDPvvuL2cy +ljVc27jLAtAwOQYDVR0fBDIwMDAuoCygKoYoaHR0cDovL2NybC5xdW92YWRpc2ds +b2JhbC5jb20vcXZyY2EzLmNybDAdBgNVHQ4EFgQUPFQUaTyz0/rgxsL2+kdFRxXK +KmowDQYJKoZIhvcNAQEFBQADggIBADsk54ImQSM2LcLtwpH5s3NPn/qpua22SUyH +sujqy8vHEAOS0KPbN+Jnq4KpexylTVHQ3ybgHSQt6SZ+/NSBHO8eAAyqZyWjenyk +UCcL7TNO82tD7lkuq+eo+BIsq9AJTI0gGRqG/wFyvNpVssZ0bFdqGNq0aM74NHWD +7LRa6toC1I+YNpvelSlZvGfEpm0G7e04AE3kzFnaemG3RwRY2mUtT5Aby5vpfouh +IbdF4t1NEyC9ExFOkEjZ3P1AAoJgxQC3T7B1Mo6r03pcBdd9LrjjVJidUyj+j/ha +faZo4e1wJeU09UtzVSzGb1GA8QHOJMY7VeA0qLg4qfZdeoDxrCZJKn/pZP2D6dQs +0Za1args4EUJmdVFsuFNc1DsM1EXTD5o9dHkX/cKPv6eMRehP7emNjJgmcIv1rX3 +sotSJA06D+5LW6ZkuWdS2uArCta8YgrVtefRMNj2nhVGafLt7tE819E0fqnaknGR +RgfNRFEMeTIU29RtgvzbpYtCK+O1v7a3x55mt/RbMhtruns3OOVAY+l7nW1y51Xb +A8bPOZc7fREndSacNCpK37Or3AhE4Uneylz+rN25H2hL8OT/xAXxj6IcPRuD2SDH +nvXiM0xeqCQpfDNv/35uNSMdpsA75GZwRpvt0fMc5r0AwtwBFZX7X4KtULoNxLNb +JZxATf23 +-----END CERTIFICATE----- + diff --git a/crypto/test/data/tls/README.txt b/test/Crypto.NetSdk.NUnitTest/data/tls/README.txt similarity index 100% rename from crypto/test/data/tls/README.txt rename to test/Crypto.NetSdk.NUnitTest/data/tls/README.txt diff --git a/crypto/test/data/tls/ca.tmpl b/test/Crypto.NetSdk.NUnitTest/data/tls/ca.tmpl similarity index 100% rename from crypto/test/data/tls/ca.tmpl rename to test/Crypto.NetSdk.NUnitTest/data/tls/ca.tmpl diff --git a/crypto/test/data/tls/client.tmpl b/test/Crypto.NetSdk.NUnitTest/data/tls/client.tmpl similarity index 100% rename from crypto/test/data/tls/client.tmpl rename to test/Crypto.NetSdk.NUnitTest/data/tls/client.tmpl diff --git a/crypto/test/data/tls/keystores/client_store.dsa b/test/Crypto.NetSdk.NUnitTest/data/tls/keystores/client_store.dsa similarity index 100% rename from crypto/test/data/tls/keystores/client_store.dsa rename to test/Crypto.NetSdk.NUnitTest/data/tls/keystores/client_store.dsa diff --git a/crypto/test/data/tls/keystores/client_store.rsa b/test/Crypto.NetSdk.NUnitTest/data/tls/keystores/client_store.rsa similarity index 100% rename from crypto/test/data/tls/keystores/client_store.rsa rename to test/Crypto.NetSdk.NUnitTest/data/tls/keystores/client_store.rsa diff --git a/crypto/test/data/tls/keystores/server_store.dsa b/test/Crypto.NetSdk.NUnitTest/data/tls/keystores/server_store.dsa similarity index 100% rename from crypto/test/data/tls/keystores/server_store.dsa rename to test/Crypto.NetSdk.NUnitTest/data/tls/keystores/server_store.dsa diff --git a/crypto/test/data/tls/keystores/server_store.rsa b/test/Crypto.NetSdk.NUnitTest/data/tls/keystores/server_store.rsa similarity index 100% rename from crypto/test/data/tls/keystores/server_store.rsa rename to test/Crypto.NetSdk.NUnitTest/data/tls/keystores/server_store.rsa diff --git a/crypto/test/data/tls/server.tmpl b/test/Crypto.NetSdk.NUnitTest/data/tls/server.tmpl similarity index 100% rename from crypto/test/data/tls/server.tmpl rename to test/Crypto.NetSdk.NUnitTest/data/tls/server.tmpl diff --git a/crypto/test/data/tls/x509-ca-key.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-ca-key.pem similarity index 100% rename from crypto/test/data/tls/x509-ca-key.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-ca-key.pem diff --git a/crypto/test/data/tls/x509-ca.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-ca.pem similarity index 100% rename from crypto/test/data/tls/x509-ca.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-ca.pem diff --git a/crypto/test/data/tls/x509-client-dsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-dsa.pem similarity index 100% rename from crypto/test/data/tls/x509-client-dsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-dsa.pem diff --git a/crypto/test/data/tls/x509-client-ecdsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-ecdsa.pem similarity index 100% rename from crypto/test/data/tls/x509-client-ecdsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-ecdsa.pem diff --git a/crypto/test/data/tls/x509-client-key-dsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-key-dsa.pem similarity index 100% rename from crypto/test/data/tls/x509-client-key-dsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-key-dsa.pem diff --git a/crypto/test/data/tls/x509-client-key-ecdsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-key-ecdsa.pem similarity index 100% rename from crypto/test/data/tls/x509-client-key-ecdsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-key-ecdsa.pem diff --git a/crypto/test/data/tls/x509-client-key.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-key.pem similarity index 100% rename from crypto/test/data/tls/x509-client-key.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-client-key.pem diff --git a/crypto/test/data/tls/x509-client.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-client.pem similarity index 100% rename from crypto/test/data/tls/x509-client.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-client.pem diff --git a/crypto/test/data/tls/x509-server-dsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-dsa.pem similarity index 100% rename from crypto/test/data/tls/x509-server-dsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-dsa.pem diff --git a/crypto/test/data/tls/x509-server-ecdsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-ecdsa.pem similarity index 100% rename from crypto/test/data/tls/x509-server-ecdsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-ecdsa.pem diff --git a/crypto/test/data/tls/x509-server-key-dsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-key-dsa.pem similarity index 100% rename from crypto/test/data/tls/x509-server-key-dsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-key-dsa.pem diff --git a/crypto/test/data/tls/x509-server-key-ecdsa.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-key-ecdsa.pem similarity index 100% rename from crypto/test/data/tls/x509-server-key-ecdsa.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-key-ecdsa.pem diff --git a/crypto/test/data/tls/x509-server-key.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-key.pem similarity index 100% rename from crypto/test/data/tls/x509-server-key.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-server-key.pem diff --git a/crypto/test/data/tls/x509-server.pem b/test/Crypto.NetSdk.NUnitTest/data/tls/x509-server.pem similarity index 100% rename from crypto/test/data/tls/x509-server.pem rename to test/Crypto.NetSdk.NUnitTest/data/tls/x509-server.pem diff --git a/crypto/test/src/asn1/test/ASN1IntegerTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ASN1IntegerTest.cs similarity index 99% rename from crypto/test/src/asn1/test/ASN1IntegerTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ASN1IntegerTest.cs index 6de3f7507e..9c4db69b03 100644 --- a/crypto/test/src/asn1/test/ASN1IntegerTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ASN1IntegerTest.cs @@ -338,7 +338,7 @@ private void SetAllowUnsafeProperty(bool allowUnsafe) #endif } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Asn1IntegerTest()); diff --git a/crypto/test/src/asn1/test/ASN1SequenceParserTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ASN1SequenceParserTest.cs similarity index 100% rename from crypto/test/src/asn1/test/ASN1SequenceParserTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ASN1SequenceParserTest.cs diff --git a/crypto/test/src/asn1/test/ASN1UnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ASN1UnitTest.cs similarity index 100% rename from crypto/test/src/asn1/test/ASN1UnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ASN1UnitTest.cs diff --git a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdditionalInformationSyntaxUnitTest.cs similarity index 97% rename from crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdditionalInformationSyntaxUnitTest.cs index ac4ff98090..3d68174768 100644 --- a/crypto/test/src/asn1/test/AdditionalInformationSyntaxUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdditionalInformationSyntaxUnitTest.cs @@ -60,7 +60,7 @@ private void checkValues( checkMandatoryField("information", information, syntax.Information); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AdditionalInformationSyntaxUnitTest()); diff --git a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdmissionSyntaxUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdmissionSyntaxUnitTest.cs index 59464d212c..3c6e80ab43 100644 --- a/crypto/test/src/asn1/test/AdmissionSyntaxUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdmissionSyntaxUnitTest.cs @@ -82,7 +82,7 @@ private void checkValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AdmissionSyntaxUnitTest()); diff --git a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdmissionsUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/AdmissionsUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdmissionsUnitTest.cs index edefeb8308..a7321d48ca 100644 --- a/crypto/test/src/asn1/test/AdmissionsUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AdmissionsUnitTest.cs @@ -73,7 +73,7 @@ private void checkValues( checkMandatoryField("namingAuthority", auth, admissions.NamingAuthority); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AdmissionsUnitTest()); diff --git a/crypto/test/src/asn1/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AllTests.cs similarity index 92% rename from crypto/test/src/asn1/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AllTests.cs index 981b5a4df8..41e3d6a9a7 100644 --- a/crypto/test/src/asn1/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AllTests.cs @@ -8,7 +8,7 @@ namespace Org.BouncyCastle.Asn1.Tests { public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/asn1/test/AttributeTableUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AttributeTableUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/AttributeTableUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AttributeTableUnitTest.cs index 5dcf349cc7..a2d3dca4d1 100644 --- a/crypto/test/src/asn1/test/AttributeTableUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/AttributeTableUnitTest.cs @@ -134,7 +134,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AttributeTableUnitTest()); diff --git a/crypto/test/src/asn1/test/BiometricDataUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BiometricDataUnitTest.cs similarity index 99% rename from crypto/test/src/asn1/test/BiometricDataUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BiometricDataUnitTest.cs index a542f71aff..12e4932ded 100644 --- a/crypto/test/src/asn1/test/BiometricDataUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BiometricDataUnitTest.cs @@ -116,7 +116,7 @@ private void CheckValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new BiometricDataUnitTest()); diff --git a/crypto/test/src/asn1/test/BitStringConstantTester.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BitStringConstantTester.cs similarity index 100% rename from crypto/test/src/asn1/test/BitStringConstantTester.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BitStringConstantTester.cs diff --git a/crypto/test/src/asn1/test/BitStringTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BitStringTest.cs similarity index 99% rename from crypto/test/src/asn1/test/BitStringTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BitStringTest.cs index 35b7811bc7..16b6d0ce42 100644 --- a/crypto/test/src/asn1/test/BitStringTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/BitStringTest.cs @@ -159,7 +159,7 @@ public override string Name get { return "BitString"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new BitStringTest()); diff --git a/crypto/test/src/asn1/test/CMSTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CMSTest.cs similarity index 99% rename from crypto/test/src/asn1/test/CMSTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CMSTest.cs index 1afb363afc..d1f5d3b4ed 100644 --- a/crypto/test/src/asn1/test/CMSTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CMSTest.cs @@ -286,7 +286,7 @@ public string Name get { return "CMS"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new CmsTest(); diff --git a/crypto/test/src/asn1/test/CertHashUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CertHashUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/CertHashUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CertHashUnitTest.cs index 1e271a9c0a..7e8a143e01 100644 --- a/crypto/test/src/asn1/test/CertHashUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CertHashUnitTest.cs @@ -76,7 +76,7 @@ private void checkValues( checkMandatoryField("certificateHash", digest, certHash.CertificateHash); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CertHashUnitTest()); diff --git a/crypto/test/src/asn1/test/CertificateTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CertificateTest.cs similarity index 99% rename from crypto/test/src/asn1/test/CertificateTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CertificateTest.cs index 7fcb1fffad..2912351b02 100644 --- a/crypto/test/src/asn1/test/CertificateTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CertificateTest.cs @@ -378,7 +378,7 @@ public override void PerformTest() CheckAttributeCertificate(8, cert8); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CertificateTest()); diff --git a/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CommitmentTypeIndicationUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CommitmentTypeIndicationUnitTest.cs index 20c2d18e37..d64face48e 100644 --- a/crypto/test/src/asn1/test/CommitmentTypeIndicationUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CommitmentTypeIndicationUnitTest.cs @@ -90,7 +90,7 @@ private void CheckStatement( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CommitmentTypeIndicationUnitTest()); diff --git a/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CommitmentTypeQualifierUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CommitmentTypeQualifierUnitTest.cs index 192ac52f6e..fcf7c44726 100644 --- a/crypto/test/src/asn1/test/CommitmentTypeQualifierUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CommitmentTypeQualifierUnitTest.cs @@ -90,7 +90,7 @@ private void CheckStatement( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CommitmentTypeQualifierUnitTest()); diff --git a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ContentHintsUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/ContentHintsUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ContentHintsUnitTest.cs index d7453c27e8..7fbfaefe9c 100644 --- a/crypto/test/src/asn1/test/ContentHintsUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ContentHintsUnitTest.cs @@ -76,7 +76,7 @@ private void checkValues( checkOptionalField("description", description, hints.ContentDescription); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ContentHintsUnitTest()); diff --git a/crypto/test/src/asn1/test/CscaMasterListTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CscaMasterListTest.cs similarity index 97% rename from crypto/test/src/asn1/test/CscaMasterListTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CscaMasterListTest.cs index 814e98b2af..b4b25c64c3 100644 --- a/crypto/test/src/asn1/test/CscaMasterListTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/CscaMasterListTest.cs @@ -40,7 +40,7 @@ private byte[] GetInput(string name) return Streams.ReadAll(SimpleTest.GetTestDataAsStream("asn1." + name)); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CscaMasterListTest()); diff --git a/crypto/test/src/asn1/test/DERApplicationSpecificTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DERApplicationSpecificTest.cs similarity index 99% rename from crypto/test/src/asn1/test/DERApplicationSpecificTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DERApplicationSpecificTest.cs index e505acd9dd..ce83ad2c14 100644 --- a/crypto/test/src/asn1/test/DERApplicationSpecificTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DERApplicationSpecificTest.cs @@ -128,7 +128,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DerApplicationSpecificTest()); diff --git a/crypto/test/src/asn1/test/DERUTF8StringTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DERUTF8StringTest.cs similarity index 98% rename from crypto/test/src/asn1/test/DERUTF8StringTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DERUTF8StringTest.cs index be4dace79b..4e483736dc 100644 --- a/crypto/test/src/asn1/test/DERUTF8StringTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DERUTF8StringTest.cs @@ -93,7 +93,7 @@ public string Name } } - public static void Main( + public static void RunMainTests( string[] args) { DerUtf8StringTest test = new DerUtf8StringTest(); diff --git a/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DataGroupHashUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/DataGroupHashUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DataGroupHashUnitTest.cs index dcebf46706..6f0c582736 100644 --- a/crypto/test/src/asn1/test/DataGroupHashUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DataGroupHashUnitTest.cs @@ -89,7 +89,7 @@ private void CheckValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DataGroupHashUnitTest()); diff --git a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DeclarationOfMajorityUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DeclarationOfMajorityUnitTest.cs index bd1fb5a9e9..74920a3160 100644 --- a/crypto/test/src/asn1/test/DeclarationOfMajorityUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/DeclarationOfMajorityUnitTest.cs @@ -80,7 +80,7 @@ private void checkValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DeclarationOfMajorityUnitTest()); diff --git a/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EncryptedPrivateKeyInfoTest.cs similarity index 99% rename from crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EncryptedPrivateKeyInfoTest.cs index a84df59cc9..0ee2b7fbb4 100644 --- a/crypto/test/src/asn1/test/EncryptedPrivateKeyInfoTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EncryptedPrivateKeyInfoTest.cs @@ -132,7 +132,7 @@ public ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new EncryptedPrivateKeyInfoTest(); diff --git a/crypto/test/src/asn1/test/EnumeratedTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EnumeratedTest.cs similarity index 100% rename from crypto/test/src/asn1/test/EnumeratedTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EnumeratedTest.cs diff --git a/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EqualsAndHashCodeTest.cs similarity index 98% rename from crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EqualsAndHashCodeTest.cs index 91329fbd56..0a68e25928 100644 --- a/crypto/test/src/asn1/test/EqualsAndHashCodeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EqualsAndHashCodeTest.cs @@ -80,7 +80,7 @@ public override string Name get { return "EqualsAndHashCode"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new EqualsAndHashCodeTest()); diff --git a/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EssCertIDv2UnitTest.cs similarity index 96% rename from crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EssCertIDv2UnitTest.cs index 9aac777e1c..15c4282322 100644 --- a/crypto/test/src/asn1/test/EssCertIDv2UnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/EssCertIDv2UnitTest.cs @@ -29,7 +29,7 @@ public override void PerformTest() EssCertIDv2.GetInstance(asn1Object); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new EssCertIDv2UnitTest()); diff --git a/crypto/test/src/asn1/test/GeneralNameTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GeneralNameTest.cs similarity index 98% rename from crypto/test/src/asn1/test/GeneralNameTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GeneralNameTest.cs index e9c3b5861a..40dc8f4e4e 100644 --- a/crypto/test/src/asn1/test/GeneralNameTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GeneralNameTest.cs @@ -99,7 +99,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new GeneralNameTest()); diff --git a/crypto/test/src/asn1/test/GeneralizedTimeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GeneralizedTimeTest.cs similarity index 99% rename from crypto/test/src/asn1/test/GeneralizedTimeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GeneralizedTimeTest.cs index 51995e1953..9263636998 100644 --- a/crypto/test/src/asn1/test/GeneralizedTimeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GeneralizedTimeTest.cs @@ -214,7 +214,7 @@ private string Convert(int time) return time.ToString(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new GeneralizedTimeTest()); diff --git a/crypto/test/src/asn1/test/GenerationTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GenerationTest.cs similarity index 99% rename from crypto/test/src/asn1/test/GenerationTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GenerationTest.cs index 862e66d224..b1551035f3 100644 --- a/crypto/test/src/asn1/test/GenerationTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/GenerationTest.cs @@ -308,7 +308,7 @@ public override string Name get { return "Generation"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new GenerationTest()); diff --git a/crypto/test/src/asn1/test/InputStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/InputStreamTest.cs similarity index 98% rename from crypto/test/src/asn1/test/InputStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/InputStreamTest.cs index 1d92759e02..5bb21e50f0 100644 --- a/crypto/test/src/asn1/test/InputStreamTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/InputStreamTest.cs @@ -68,7 +68,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new InputStreamTest()); diff --git a/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/Iso4217CurrencyCodeUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/Iso4217CurrencyCodeUnitTest.cs index bb6076a93c..62d8f15255 100644 --- a/crypto/test/src/asn1/test/Iso4217CurrencyCodeUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/Iso4217CurrencyCodeUnitTest.cs @@ -139,7 +139,7 @@ private void CheckNumeric( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Iso4217CurrencyCodeUnitTest()); diff --git a/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/IssuingDistributionPointTest.cs similarity index 98% rename from crypto/test/src/asn1/test/IssuingDistributionPointTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/IssuingDistributionPointTest.cs index b5f5c88bb5..d30a3c9bfe 100644 --- a/crypto/test/src/asn1/test/IssuingDistributionPointTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/IssuingDistributionPointTest.cs @@ -116,7 +116,7 @@ private bool isEquiv(object o1, object o2) return o1.Equals(o2); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new IssuingDistributionPointUnitTest()); diff --git a/crypto/test/src/asn1/test/KeyUsageTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/KeyUsageTest.cs similarity index 97% rename from crypto/test/src/asn1/test/KeyUsageTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/KeyUsageTest.cs index d7ed3655d6..fe4c7ae9d4 100644 --- a/crypto/test/src/asn1/test/KeyUsageTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/KeyUsageTest.cs @@ -32,7 +32,7 @@ public override void PerformTest() BitStringConstantTester.testFlagValueCorrect(8, KeyUsage.DecipherOnly); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new KeyUsageTest()); diff --git a/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/LDSSecurityObjectUnitTest.cs similarity index 99% rename from crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/LDSSecurityObjectUnitTest.cs index 914eda0b87..5b0701818a 100644 --- a/crypto/test/src/asn1/test/LDSSecurityObjectUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/LDSSecurityObjectUnitTest.cs @@ -192,7 +192,7 @@ private void CheckStatement( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new LDSSecurityObjectUnitTest()); diff --git a/crypto/test/src/asn1/test/MiscTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MiscTest.cs similarity index 98% rename from crypto/test/src/asn1/test/MiscTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MiscTest.cs index 6b84119967..8bae915a0d 100644 --- a/crypto/test/src/asn1/test/MiscTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MiscTest.cs @@ -131,7 +131,7 @@ public override string Name get { return "Misc"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MiscTest()); diff --git a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MonetaryLimitUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MonetaryLimitUnitTest.cs index cdeb2eca59..aac5f88f4d 100644 --- a/crypto/test/src/asn1/test/MonetaryLimitUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MonetaryLimitUnitTest.cs @@ -76,7 +76,7 @@ private void checkValues( checkMandatoryField("exponent", exponent, limit.Exponent.IntValue); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MonetaryLimitUnitTest()); diff --git a/crypto/test/src/asn1/test/MonetaryValueUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MonetaryValueUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/MonetaryValueUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MonetaryValueUnitTest.cs index c75d745056..8ddf0677cd 100644 --- a/crypto/test/src/asn1/test/MonetaryValueUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/MonetaryValueUnitTest.cs @@ -82,7 +82,7 @@ private void CheckValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MonetaryValueUnitTest()); diff --git a/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NameOrPseudonymUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NameOrPseudonymUnitTest.cs index 45f66613b9..2ad7c8f3dc 100644 --- a/crypto/test/src/asn1/test/NameOrPseudonymUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NameOrPseudonymUnitTest.cs @@ -97,7 +97,7 @@ private void checkValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NameOrPseudonymUnitTest()); diff --git a/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NamingAuthorityUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NamingAuthorityUnitTest.cs index 787b2c32d8..f466c32c60 100644 --- a/crypto/test/src/asn1/test/NamingAuthorityUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NamingAuthorityUnitTest.cs @@ -89,7 +89,7 @@ private void checkValues( checkOptionalField("namingAuthorityText", namingAuthorityText, auth.NamingAuthorityText); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NamingAuthorityUnitTest()); diff --git a/crypto/test/src/asn1/test/NetscapeCertTypeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NetscapeCertTypeTest.cs similarity index 97% rename from crypto/test/src/asn1/test/NetscapeCertTypeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NetscapeCertTypeTest.cs index 8db5d990cc..d4e86991f0 100644 --- a/crypto/test/src/asn1/test/NetscapeCertTypeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/NetscapeCertTypeTest.cs @@ -28,7 +28,7 @@ public override void PerformTest() BitStringConstantTester.testFlagValueCorrect(7, NetscapeCertType.ObjectSigningCA); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NetscapeCertTypeTest()); diff --git a/crypto/test/src/asn1/test/OCSPTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OCSPTest.cs similarity index 99% rename from crypto/test/src/asn1/test/OCSPTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OCSPTest.cs index 13f59d3d19..3fbfdfe3f9 100644 --- a/crypto/test/src/asn1/test/OCSPTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OCSPTest.cs @@ -163,7 +163,7 @@ public string Name get { return "Ocsp"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new OcspTest(); diff --git a/crypto/test/src/asn1/test/OIDTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OIDTest.cs similarity index 98% rename from crypto/test/src/asn1/test/OIDTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OIDTest.cs index b0782db04d..c4d8556aad 100644 --- a/crypto/test/src/asn1/test/OIDTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OIDTest.cs @@ -129,7 +129,7 @@ public override void PerformTest() onCheck("1.1", "1.1.2", true); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new OidTest(); diff --git a/crypto/test/src/asn1/test/OctetStringTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OctetStringTest.cs similarity index 100% rename from crypto/test/src/asn1/test/OctetStringTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OctetStringTest.cs diff --git a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OtherCertIDUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/OtherCertIDUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OtherCertIDUnitTest.cs index a09c18e8ac..cd603f5641 100644 --- a/crypto/test/src/asn1/test/OtherCertIDUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OtherCertIDUnitTest.cs @@ -83,7 +83,7 @@ private void checkValues( checkOptionalField("issuerSerial", issuerSerial, certID.IssuerSerial); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new OtherCertIDUnitTest()); diff --git a/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OtherSigningCertificateUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OtherSigningCertificateUnitTest.cs index 4410d8e4cd..56b5221371 100644 --- a/crypto/test/src/asn1/test/OtherSigningCertificateUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/OtherSigningCertificateUnitTest.cs @@ -77,7 +77,7 @@ private void checkValues( checkMandatoryField("GetCerts()[0]", otherCertID, otherCert.GetCerts()[0]); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new OtherSigningCertificateUnitTest()); diff --git a/crypto/test/src/asn1/test/PKCS10Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKCS10Test.cs similarity index 98% rename from crypto/test/src/asn1/test/PKCS10Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKCS10Test.cs index 28736b8167..4f8bfe9908 100644 --- a/crypto/test/src/asn1/test/PKCS10Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKCS10Test.cs @@ -75,7 +75,7 @@ public ITestResult Perform() return BasicPkcs10Test("Universal CR", req2); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Pkcs10Test(); diff --git a/crypto/test/src/asn1/test/PKCS12Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKCS12Test.cs similarity index 99% rename from crypto/test/src/asn1/test/PKCS12Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKCS12Test.cs index c20fa8cc64..171f359dea 100644 --- a/crypto/test/src/asn1/test/PKCS12Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKCS12Test.cs @@ -193,7 +193,7 @@ public override string Name get { return "Pkcs12"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Pkcs12Test()); diff --git a/crypto/test/src/asn1/test/PKIFailureInfoTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKIFailureInfoTest.cs similarity index 99% rename from crypto/test/src/asn1/test/PKIFailureInfoTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKIFailureInfoTest.cs index 7d51dbb5f1..cb415e0edd 100644 --- a/crypto/test/src/asn1/test/PKIFailureInfoTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PKIFailureInfoTest.cs @@ -72,7 +72,7 @@ public override void PerformTest() DoTestEncoding(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PkiFailureInfoTest()); diff --git a/crypto/test/src/asn1/test/ParseTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ParseTest.cs similarity index 100% rename from crypto/test/src/asn1/test/ParseTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ParseTest.cs diff --git a/crypto/test/src/asn1/test/ParsingTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ParsingTest.cs similarity index 99% rename from crypto/test/src/asn1/test/ParsingTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ParsingTest.cs index bb219e2fce..1d03241be9 100644 --- a/crypto/test/src/asn1/test/ParsingTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ParsingTest.cs @@ -95,7 +95,7 @@ private void inputStreamTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ParsingTest()); diff --git a/crypto/test/src/asn1/test/PersonalDataUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PersonalDataUnitTest.cs similarity index 99% rename from crypto/test/src/asn1/test/PersonalDataUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PersonalDataUnitTest.cs index f92e619cfb..2aef78e9eb 100644 --- a/crypto/test/src/asn1/test/PersonalDataUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PersonalDataUnitTest.cs @@ -110,7 +110,7 @@ private void checkValues( checkOptionalField("postalAddress", postalAddress, data.PostalAddress); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PersonalDataUnitTest()); diff --git a/crypto/test/src/asn1/test/PrivateKeyInfoTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PrivateKeyInfoTest.cs similarity index 96% rename from crypto/test/src/asn1/test/PrivateKeyInfoTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PrivateKeyInfoTest.cs index eb17a54c33..c861de28da 100644 --- a/crypto/test/src/asn1/test/PrivateKeyInfoTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/PrivateKeyInfoTest.cs @@ -44,7 +44,7 @@ public override void PerformTest() IsTrue("enc 2 failed", AreEqual(privWithPub, privInfo2.GetEncoded())); } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new PrivateKeyInfoTest()); } diff --git a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ProcurationSyntaxUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ProcurationSyntaxUnitTest.cs index 97d0e3eee0..f27b40ff2d 100644 --- a/crypto/test/src/asn1/test/ProcurationSyntaxUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ProcurationSyntaxUnitTest.cs @@ -94,7 +94,7 @@ private void checkValues( checkOptionalField("certRef", certRef, procuration.CertRef); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ProcurationSyntaxUnitTest()); diff --git a/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ProfessionInfoUnitTest.cs similarity index 99% rename from crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ProfessionInfoUnitTest.cs index 6af2658ef6..722037957f 100644 --- a/crypto/test/src/asn1/test/ProfessionInfoUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ProfessionInfoUnitTest.cs @@ -104,7 +104,7 @@ private void checkValues( checkOptionalField("addProfessionInfo", addProfInfo, profInfo.AddProfessionInfo); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ProfessionInfoUnitTest()); diff --git a/crypto/test/src/asn1/test/QCStatementUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/QCStatementUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/QCStatementUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/QCStatementUnitTest.cs index 8d8ec9ec74..2303e480ee 100644 --- a/crypto/test/src/asn1/test/QCStatementUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/QCStatementUnitTest.cs @@ -91,7 +91,7 @@ private void CheckStatement( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new QCStatementUnitTest()); diff --git a/crypto/test/src/asn1/test/ReasonFlagsTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ReasonFlagsTest.cs similarity index 97% rename from crypto/test/src/asn1/test/ReasonFlagsTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ReasonFlagsTest.cs index ef404b3e16..f7caf2b3e6 100644 --- a/crypto/test/src/asn1/test/ReasonFlagsTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/ReasonFlagsTest.cs @@ -29,7 +29,7 @@ public override void PerformTest() BitStringConstantTester.testFlagValueCorrect(8, ReasonFlags.AACompromise); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ReasonFlagsTest()); diff --git a/crypto/test/src/asn1/test/RegressionTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RegressionTest.cs similarity index 98% rename from crypto/test/src/asn1/test/RegressionTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RegressionTest.cs index 4534f2c753..d7d5bc2545 100644 --- a/crypto/test/src/asn1/test/RegressionTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RegressionTest.cs @@ -74,7 +74,7 @@ public class RegressionTest new X9Test(), }; - public static void Main( + public static void RunMainTests( string[] args) { for (int i = 0; i != tests.Length; i++) diff --git a/crypto/test/src/asn1/test/RequestedCertificateUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RequestedCertificateUnitTest.cs similarity index 98% rename from crypto/test/src/asn1/test/RequestedCertificateUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RequestedCertificateUnitTest.cs index 767504173c..fb313bc357 100644 --- a/crypto/test/src/asn1/test/RequestedCertificateUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RequestedCertificateUnitTest.cs @@ -100,7 +100,7 @@ private void checkValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new RequestedCertificateUnitTest()); diff --git a/crypto/test/src/asn1/test/RestrictionUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RestrictionUnitTest.cs similarity index 97% rename from crypto/test/src/asn1/test/RestrictionUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RestrictionUnitTest.cs index 5dd6438cbd..19f28c20c9 100644 --- a/crypto/test/src/asn1/test/RestrictionUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/RestrictionUnitTest.cs @@ -61,7 +61,7 @@ private void checkValues( checkMandatoryField("restriction", res, restriction.RestrictionString); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new RestrictionUnitTest()); diff --git a/crypto/test/src/asn1/test/SMIMETest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SMIMETest.cs similarity index 98% rename from crypto/test/src/asn1/test/SMIMETest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SMIMETest.cs index adb90e0935..3097de3fd1 100644 --- a/crypto/test/src/asn1/test/SMIMETest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SMIMETest.cs @@ -70,7 +70,7 @@ public string Name get { return "SMIME"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new SmimeTest(); diff --git a/crypto/test/src/asn1/test/SemanticsInformationUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SemanticsInformationUnitTest.cs similarity index 99% rename from crypto/test/src/asn1/test/SemanticsInformationUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SemanticsInformationUnitTest.cs index 8f1f85f192..8f9517d3c6 100644 --- a/crypto/test/src/asn1/test/SemanticsInformationUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SemanticsInformationUnitTest.cs @@ -121,7 +121,7 @@ private void CheckStatement( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SemanticsInformationUnitTest()); diff --git a/crypto/test/src/asn1/test/SetTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SetTest.cs similarity index 98% rename from crypto/test/src/asn1/test/SetTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SetTest.cs index 57c46603d8..fb4d1bf938 100644 --- a/crypto/test/src/asn1/test/SetTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SetTest.cs @@ -100,7 +100,7 @@ public override void PerformTest() s = new DerSet(v); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SetTest()); diff --git a/crypto/test/src/asn1/test/SignerLocationUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SignerLocationUnitTest.cs similarity index 99% rename from crypto/test/src/asn1/test/SignerLocationUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SignerLocationUnitTest.cs index 650e2fcfd2..17655d9ed8 100644 --- a/crypto/test/src/asn1/test/SignerLocationUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SignerLocationUnitTest.cs @@ -178,7 +178,7 @@ private void CheckValues( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SignerLocationUnitTest()); diff --git a/crypto/test/src/asn1/test/StringTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/StringTest.cs similarity index 98% rename from crypto/test/src/asn1/test/StringTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/StringTest.cs index acfd380b20..9c8c0fd76e 100644 --- a/crypto/test/src/asn1/test/StringTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/StringTest.cs @@ -88,7 +88,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new StringTest()); diff --git a/crypto/test/src/asn1/test/SubjectKeyIdentifierTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SubjectKeyIdentifierTest.cs similarity index 97% rename from crypto/test/src/asn1/test/SubjectKeyIdentifierTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SubjectKeyIdentifierTest.cs index 127c47a3a7..dbe379c539 100644 --- a/crypto/test/src/asn1/test/SubjectKeyIdentifierTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/SubjectKeyIdentifierTest.cs @@ -44,7 +44,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SubjectKeyIdentifierTest()); diff --git a/crypto/test/src/asn1/test/TagTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TagTest.cs similarity index 98% rename from crypto/test/src/asn1/test/TagTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TagTest.cs index 80ca2c0eac..ee85c4e4aa 100644 --- a/crypto/test/src/asn1/test/TagTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TagTest.cs @@ -102,7 +102,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new TagTest()); diff --git a/crypto/test/src/asn1/test/TargetInformationTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TargetInformationTest.cs similarity index 97% rename from crypto/test/src/asn1/test/TargetInformationTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TargetInformationTest.cs index 7fa04cd013..f26ca48cfc 100644 --- a/crypto/test/src/asn1/test/TargetInformationTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TargetInformationTest.cs @@ -41,7 +41,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new TargetInformationTest()); diff --git a/crypto/test/src/asn1/test/TimeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TimeTest.cs similarity index 100% rename from crypto/test/src/asn1/test/TimeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TimeTest.cs diff --git a/crypto/test/src/asn1/test/TypeOfBiometricDataUnitTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TypeOfBiometricDataUnitTest.cs similarity index 99% rename from crypto/test/src/asn1/test/TypeOfBiometricDataUnitTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TypeOfBiometricDataUnitTest.cs index a59415c31d..0f3bfcd502 100644 --- a/crypto/test/src/asn1/test/TypeOfBiometricDataUnitTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/TypeOfBiometricDataUnitTest.cs @@ -135,7 +135,7 @@ private void CheckNonPredefined( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new TypeOfBiometricDataUnitTest()); diff --git a/crypto/test/src/asn1/test/UTCTimeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/UTCTimeTest.cs similarity index 98% rename from crypto/test/src/asn1/test/UTCTimeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/UTCTimeTest.cs index 07abbc9118..f1fe869cc2 100644 --- a/crypto/test/src/asn1/test/UTCTimeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/UTCTimeTest.cs @@ -105,7 +105,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new UtcTimeTest()); diff --git a/crypto/test/src/asn1/test/X509ExtensionsTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X509ExtensionsTest.cs similarity index 98% rename from crypto/test/src/asn1/test/X509ExtensionsTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X509ExtensionsTest.cs index f1efd3a9b8..a8fda0f4d5 100644 --- a/crypto/test/src/asn1/test/X509ExtensionsTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X509ExtensionsTest.cs @@ -100,7 +100,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new X509ExtensionsTest()); diff --git a/crypto/test/src/asn1/test/X509NameTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X509NameTest.cs similarity index 99% rename from crypto/test/src/asn1/test/X509NameTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X509NameTest.cs index 9a564f72f2..8e496aa410 100644 --- a/crypto/test/src/asn1/test/X509NameTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X509NameTest.cs @@ -654,7 +654,7 @@ private bool CompareVectors( return true; } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new X509NameTest(); diff --git a/crypto/test/src/asn1/test/X9Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X9Test.cs similarity index 99% rename from crypto/test/src/asn1/test/X9Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X9Test.cs index db2541f7c8..f1ba7afead 100644 --- a/crypto/test/src/asn1/test/X9Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/asn1/test/X9Test.cs @@ -155,7 +155,7 @@ public override string Name get { return "X9"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new X9Test()); diff --git a/crypto/test/src/cms/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/AllTests.cs similarity index 93% rename from crypto/test/src/cms/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/AllTests.cs index b473749142..ce4cdcc83e 100644 --- a/crypto/test/src/cms/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/AllTests.cs @@ -10,7 +10,7 @@ namespace Org.BouncyCastle.Cms.Tests { public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/cms/test/AuthenticatedDataStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/AuthenticatedDataStreamTest.cs similarity index 100% rename from crypto/test/src/cms/test/AuthenticatedDataStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/AuthenticatedDataStreamTest.cs diff --git a/crypto/test/src/cms/test/AuthenticatedDataTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/AuthenticatedDataTest.cs similarity index 99% rename from crypto/test/src/cms/test/AuthenticatedDataTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/AuthenticatedDataTest.cs index 0ad34a95b9..c4a9067bf6 100644 --- a/crypto/test/src/cms/test/AuthenticatedDataTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/AuthenticatedDataTest.cs @@ -124,7 +124,7 @@ private static X509Certificate ReciECCert // super(name); // } // -// public static void main(string args[]) +// public static void RunMainTests(string args[]) // { // junit.textui.TestRunner.run(AuthenticatedDataTest.class); // } diff --git a/crypto/test/src/cms/test/CMSSampleMessages.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/CMSSampleMessages.cs similarity index 100% rename from crypto/test/src/cms/test/CMSSampleMessages.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/CMSSampleMessages.cs diff --git a/crypto/test/src/cms/test/CMSTestUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/CMSTestUtil.cs similarity index 100% rename from crypto/test/src/cms/test/CMSTestUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/CMSTestUtil.cs diff --git a/crypto/test/src/cms/test/CompressedDataStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/CompressedDataStreamTest.cs similarity index 100% rename from crypto/test/src/cms/test/CompressedDataStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/CompressedDataStreamTest.cs diff --git a/crypto/test/src/cms/test/CompressedDataTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/CompressedDataTest.cs similarity index 100% rename from crypto/test/src/cms/test/CompressedDataTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/CompressedDataTest.cs diff --git a/crypto/test/src/cms/test/EnvelopedDataStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/EnvelopedDataStreamTest.cs similarity index 100% rename from crypto/test/src/cms/test/EnvelopedDataStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/EnvelopedDataStreamTest.cs diff --git a/crypto/test/src/cms/test/EnvelopedDataTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/EnvelopedDataTest.cs similarity index 100% rename from crypto/test/src/cms/test/EnvelopedDataTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/EnvelopedDataTest.cs diff --git a/crypto/test/src/cms/test/MiscDataStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/MiscDataStreamTest.cs similarity index 100% rename from crypto/test/src/cms/test/MiscDataStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/MiscDataStreamTest.cs diff --git a/crypto/test/src/cms/test/Rfc4134Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/Rfc4134Test.cs similarity index 100% rename from crypto/test/src/cms/test/Rfc4134Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/Rfc4134Test.cs diff --git a/crypto/test/src/cms/test/SignedDataStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/SignedDataStreamTest.cs similarity index 100% rename from crypto/test/src/cms/test/SignedDataStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/SignedDataStreamTest.cs diff --git a/crypto/test/src/cms/test/SignedDataTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/cms/test/SignedDataTest.cs similarity index 100% rename from crypto/test/src/cms/test/SignedDataTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/cms/test/SignedDataTest.cs diff --git a/crypto/test/src/crypto/agreement/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/AllTests.cs similarity index 92% rename from crypto/test/src/crypto/agreement/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/AllTests.cs index 66853b2850..93c0cbdacd 100644 --- a/crypto/test/src/crypto/agreement/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/AllTests.cs @@ -11,7 +11,7 @@ namespace Org.BouncyCastle.Crypto.Agreement.Tests [TestFixture] public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/crypto/agreement/test/JPakeParticipantTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakeParticipantTest.cs similarity index 99% rename from crypto/test/src/crypto/agreement/test/JPakeParticipantTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakeParticipantTest.cs index c84264aa54..0f359ba179 100644 --- a/crypto/test/src/crypto/agreement/test/JPakeParticipantTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakeParticipantTest.cs @@ -29,7 +29,7 @@ public override string Name get { return "JPakeParticipant"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new JPakeParticipantTest()); diff --git a/crypto/test/src/crypto/agreement/test/JPakePrimeOrderGroupTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakePrimeOrderGroupTest.cs similarity index 98% rename from crypto/test/src/crypto/agreement/test/JPakePrimeOrderGroupTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakePrimeOrderGroupTest.cs index 0f089f93cc..bfa24bbd1d 100644 --- a/crypto/test/src/crypto/agreement/test/JPakePrimeOrderGroupTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakePrimeOrderGroupTest.cs @@ -22,7 +22,7 @@ public override string Name get { return "JPakePrimeOrderGroup"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new JPakePrimeOrderGroupTest()); diff --git a/crypto/test/src/crypto/agreement/test/JPakeUtilitiesTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakeUtilitiesTest.cs similarity index 99% rename from crypto/test/src/crypto/agreement/test/JPakeUtilitiesTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakeUtilitiesTest.cs index 04a52cc061..f1e3ddb058 100644 --- a/crypto/test/src/crypto/agreement/test/JPakeUtilitiesTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/agreement/test/JPakeUtilitiesTest.cs @@ -32,7 +32,7 @@ public override string Name get { return "JPakeUtilities"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new JPakeUtilitiesTest()); diff --git a/crypto/test/src/crypto/examples/DESExample.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/examples/DESExample.cs similarity index 100% rename from crypto/test/src/crypto/examples/DESExample.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/examples/DESExample.cs diff --git a/crypto/test/src/crypto/io/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/io/test/AllTests.cs similarity index 89% rename from crypto/test/src/crypto/io/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/io/test/AllTests.cs index 2634b4ab17..2311fa75fd 100644 --- a/crypto/test/src/crypto/io/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/io/test/AllTests.cs @@ -8,7 +8,7 @@ namespace Org.BouncyCastle.Crypto.IO.Tests { public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/crypto/io/test/CipherStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/io/test/CipherStreamTest.cs similarity index 100% rename from crypto/test/src/crypto/io/test/CipherStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/io/test/CipherStreamTest.cs diff --git a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/CtrDrbgTest.cs similarity index 99% rename from crypto/test/src/crypto/prng/test/CtrDrbgTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/CtrDrbgTest.cs index 4dc09f4e8a..76fe2d837c 100644 --- a/crypto/test/src/crypto/prng/test/CtrDrbgTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/CtrDrbgTest.cs @@ -23,7 +23,7 @@ public override string Name get { return "CTRDRBGTest"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new CtrDrbgTest()); } diff --git a/crypto/test/src/crypto/prng/test/DrbgTestVector.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/DrbgTestVector.cs similarity index 100% rename from crypto/test/src/crypto/prng/test/DrbgTestVector.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/DrbgTestVector.cs diff --git a/crypto/test/src/crypto/prng/test/HMacDrbgTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/HMacDrbgTest.cs similarity index 99% rename from crypto/test/src/crypto/prng/test/HMacDrbgTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/HMacDrbgTest.cs index a5ca308362..7f682d12ba 100644 --- a/crypto/test/src/crypto/prng/test/HMacDrbgTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/HMacDrbgTest.cs @@ -22,7 +22,7 @@ public override string Name get { return "HMacDRBG"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new HMacDrbgTest()); } diff --git a/crypto/test/src/crypto/prng/test/HashDrbgTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/HashDrbgTest.cs similarity index 99% rename from crypto/test/src/crypto/prng/test/HashDrbgTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/HashDrbgTest.cs index 892ca74da3..b57f07dbcf 100644 --- a/crypto/test/src/crypto/prng/test/HashDrbgTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/HashDrbgTest.cs @@ -21,7 +21,7 @@ public override string Name get { return "HashDRBG"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new HashDrbgTest()); } diff --git a/crypto/test/src/crypto/prng/test/TestEntropySourceProvider.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/TestEntropySourceProvider.cs similarity index 100% rename from crypto/test/src/crypto/prng/test/TestEntropySourceProvider.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/TestEntropySourceProvider.cs diff --git a/crypto/test/src/crypto/prng/test/X931Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/X931Test.cs similarity index 98% rename from crypto/test/src/crypto/prng/test/X931Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/X931Test.cs index 1132ea34a1..7034690941 100644 --- a/crypto/test/src/crypto/prng/test/X931Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/X931Test.cs @@ -23,7 +23,7 @@ public override string Name get { return "X931"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new X931Test()); } diff --git a/crypto/test/src/crypto/prng/test/X931TestVector.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/X931TestVector.cs similarity index 100% rename from crypto/test/src/crypto/prng/test/X931TestVector.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/prng/test/X931TestVector.cs diff --git a/crypto/test/src/crypto/test/AESFastTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESFastTest.cs similarity index 99% rename from crypto/test/src/crypto/test/AESFastTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESFastTest.cs index 5513a0e78f..3df40a9cc4 100644 --- a/crypto/test/src/crypto/test/AESFastTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESFastTest.cs @@ -148,7 +148,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { AesFastTest test = new AesFastTest(); diff --git a/crypto/test/src/crypto/test/AESLightTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESLightTest.cs similarity index 99% rename from crypto/test/src/crypto/test/AESLightTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESLightTest.cs index 0b5777ba13..66bfd89687 100644 --- a/crypto/test/src/crypto/test/AESLightTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESLightTest.cs @@ -148,7 +148,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { AesLightTest test = new AesLightTest(); diff --git a/crypto/test/src/crypto/test/AESTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESTest.cs similarity index 99% rename from crypto/test/src/crypto/test/AESTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESTest.cs index 7b8fc34cf8..325be7e95b 100644 --- a/crypto/test/src/crypto/test/AESTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESTest.cs @@ -158,7 +158,7 @@ public override ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { AesTest test = new AesTest(); diff --git a/crypto/test/src/crypto/test/AESWrapTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESWrapTest.cs similarity index 99% rename from crypto/test/src/crypto/test/AESWrapTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESWrapTest.cs index 11b46098e1..3a6941755a 100644 --- a/crypto/test/src/crypto/test/AESWrapTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AESWrapTest.cs @@ -194,7 +194,7 @@ public ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { AesWrapTest test = new AesWrapTest(); diff --git a/crypto/test/src/crypto/test/AeadTestUtilities.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AeadTestUtilities.cs similarity index 100% rename from crypto/test/src/crypto/test/AeadTestUtilities.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AeadTestUtilities.cs diff --git a/crypto/test/src/crypto/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AllTests.cs similarity index 94% rename from crypto/test/src/crypto/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AllTests.cs index e7035a6635..973771ef20 100644 --- a/crypto/test/src/crypto/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/AllTests.cs @@ -13,7 +13,7 @@ namespace Org.BouncyCastle.Crypto.Tests public class AllTests { #if !LIB - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/crypto/test/BCryptTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BCryptTest.cs similarity index 99% rename from crypto/test/src/crypto/test/BCryptTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BCryptTest.cs index 42d925f803..065ad1b8b0 100644 --- a/crypto/test/src/crypto/test/BCryptTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BCryptTest.cs @@ -147,7 +147,7 @@ private void DoTest(byte[] password, byte[] salt, int cost, byte[] expected) } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new BCryptTest()); } diff --git a/crypto/test/src/crypto/test/Blake2bDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Blake2bDigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/Blake2bDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Blake2bDigestTest.cs index c9dbfc9d5f..4eac40d93e 100644 --- a/crypto/test/src/crypto/test/Blake2bDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Blake2bDigestTest.cs @@ -309,7 +309,7 @@ private void ResetTest() } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new Blake2bDigestTest()); } diff --git a/crypto/test/src/crypto/test/Blake2sDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Blake2sDigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/Blake2sDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Blake2sDigestTest.cs index cb075807cf..36a0574435 100644 --- a/crypto/test/src/crypto/test/Blake2sDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Blake2sDigestTest.cs @@ -295,7 +295,7 @@ public override void PerformTest() DoTestLengthConstruction(); } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new Blake2sDigestTest()); } diff --git a/crypto/test/src/crypto/test/BlockCipherMonteCarloTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BlockCipherMonteCarloTest.cs similarity index 100% rename from crypto/test/src/crypto/test/BlockCipherMonteCarloTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BlockCipherMonteCarloTest.cs diff --git a/crypto/test/src/crypto/test/BlockCipherVectorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BlockCipherVectorTest.cs similarity index 100% rename from crypto/test/src/crypto/test/BlockCipherVectorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BlockCipherVectorTest.cs diff --git a/crypto/test/src/crypto/test/BlowfishTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BlowfishTest.cs similarity index 98% rename from crypto/test/src/crypto/test/BlowfishTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BlowfishTest.cs index 780dd3abd1..e152b7df52 100644 --- a/crypto/test/src/crypto/test/BlowfishTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/BlowfishTest.cs @@ -43,7 +43,7 @@ public void TestFunction() Assert.AreEqual(Name + ": Okay", resultText); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new BlowfishTest(); diff --git a/crypto/test/src/crypto/test/CAST6Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CAST6Test.cs similarity index 97% rename from crypto/test/src/crypto/test/CAST6Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CAST6Test.cs index 7517b67373..210edcef25 100644 --- a/crypto/test/src/crypto/test/CAST6Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CAST6Test.cs @@ -39,7 +39,7 @@ public Cast6Test() { } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Cast6Test(); diff --git a/crypto/test/src/crypto/test/CCMTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CCMTest.cs similarity index 99% rename from crypto/test/src/crypto/test/CCMTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CCMTest.cs index cf5f31f4f4..86f3ce680d 100644 --- a/crypto/test/src/crypto/test/CCMTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CCMTest.cs @@ -303,7 +303,7 @@ public void TestFunction() Assert.AreEqual(Name + ": Okay", resultText); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CcmTest()); diff --git a/crypto/test/src/crypto/test/CMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/CMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CMacTest.cs index 23ae7cb88b..b1f2050ecb 100644 --- a/crypto/test/src/crypto/test/CMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CMacTest.cs @@ -285,7 +285,7 @@ public override string Name get { return "CMac"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CMacTest()); diff --git a/crypto/test/src/crypto/test/CTSTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CTSTest.cs similarity index 99% rename from crypto/test/src/crypto/test/CTSTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CTSTest.cs index 9d001bc684..c61fa7cb8f 100644 --- a/crypto/test/src/crypto/test/CTSTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CTSTest.cs @@ -163,7 +163,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { CTSTest test = new CTSTest(); diff --git a/crypto/test/src/crypto/test/CamelliaLightTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CamelliaLightTest.cs similarity index 98% rename from crypto/test/src/crypto/test/CamelliaLightTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CamelliaLightTest.cs index 2247178f21..91f0ab5717 100644 --- a/crypto/test/src/crypto/test/CamelliaLightTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CamelliaLightTest.cs @@ -71,7 +71,7 @@ public void TestFunction() Assert.AreEqual(Name + ": Okay", resultText); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CamelliaLightTest()); diff --git a/crypto/test/src/crypto/test/CamelliaTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CamelliaTest.cs similarity index 98% rename from crypto/test/src/crypto/test/CamelliaTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CamelliaTest.cs index a134546b70..f422eb94ec 100644 --- a/crypto/test/src/crypto/test/CamelliaTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CamelliaTest.cs @@ -71,7 +71,7 @@ public void TestFunction() Assert.AreEqual(Name + ": Okay", resultText); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CamelliaTest()); diff --git a/crypto/test/src/crypto/test/Cast5Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Cast5Test.cs similarity index 97% rename from crypto/test/src/crypto/test/Cast5Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Cast5Test.cs index ea2e0c5408..49a1ca74a1 100644 --- a/crypto/test/src/crypto/test/Cast5Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Cast5Test.cs @@ -29,7 +29,7 @@ public Cast5Test() { } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Cast5Test(); diff --git a/crypto/test/src/crypto/test/ChaChaTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ChaChaTest.cs similarity index 99% rename from crypto/test/src/crypto/test/ChaChaTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ChaChaTest.cs index 0b394c91ed..65a96fb3ac 100644 --- a/crypto/test/src/crypto/test/ChaChaTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ChaChaTest.cs @@ -302,7 +302,7 @@ private void reinitBug() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ChaChaTest()); diff --git a/crypto/test/src/crypto/test/CipherTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CipherTest.cs similarity index 100% rename from crypto/test/src/crypto/test/CipherTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/CipherTest.cs diff --git a/crypto/test/src/crypto/test/DESTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DESTest.cs similarity index 99% rename from crypto/test/src/crypto/test/DESTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DESTest.cs index cf1022eae9..b880acced7 100644 --- a/crypto/test/src/crypto/test/DESTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DESTest.cs @@ -197,7 +197,7 @@ public override string Name get { return "DES"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DesTest()); diff --git a/crypto/test/src/crypto/test/DESedeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DESedeTest.cs similarity index 99% rename from crypto/test/src/crypto/test/DESedeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DESedeTest.cs index aa61844f2b..7d74df084d 100644 --- a/crypto/test/src/crypto/test/DESedeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DESedeTest.cs @@ -170,7 +170,7 @@ public override string Name get { return "DESede"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DesEdeTest()); diff --git a/crypto/test/src/crypto/test/DHKEKGeneratorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DHKEKGeneratorTest.cs similarity index 98% rename from crypto/test/src/crypto/test/DHKEKGeneratorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DHKEKGeneratorTest.cs index eee408f97c..287fc14201 100644 --- a/crypto/test/src/crypto/test/DHKEKGeneratorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DHKEKGeneratorTest.cs @@ -62,7 +62,7 @@ public override string Name get { return "DHKekGenerator"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DHKekGeneratorTest()); diff --git a/crypto/test/src/crypto/test/DHTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DHTest.cs similarity index 99% rename from crypto/test/src/crypto/test/DHTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DHTest.cs index b460f41a54..e5e3ee63f6 100644 --- a/crypto/test/src/crypto/test/DHTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DHTest.cs @@ -383,7 +383,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new DHTest(); diff --git a/crypto/test/src/crypto/test/DSATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSATest.cs similarity index 99% rename from crypto/test/src/crypto/test/DSATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSATest.cs index 0e6367150b..33a51ab71a 100644 --- a/crypto/test/src/crypto/test/DSATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSATest.cs @@ -574,7 +574,7 @@ private void Dsa2Test4() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DsaTest()); diff --git a/crypto/test/src/crypto/test/DSTU7564Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSTU7564Test.cs similarity index 99% rename from crypto/test/src/crypto/test/DSTU7564Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSTU7564Test.cs index 805d3c8ab5..d600372957 100644 --- a/crypto/test/src/crypto/test/DSTU7564Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSTU7564Test.cs @@ -614,7 +614,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Dstu7564Digest((Dstu7564Digest)digest); } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new Dstu7564Test()); } diff --git a/crypto/test/src/crypto/test/DSTU7624Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSTU7624Test.cs similarity index 99% rename from crypto/test/src/crypto/test/DSTU7624Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSTU7624Test.cs index 234474db6f..5dfbf08515 100644 --- a/crypto/test/src/crypto/test/DSTU7624Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DSTU7624Test.cs @@ -723,7 +723,7 @@ public override string Name get { return "Dstu7624"; } } - public static void Main( + public static void RunMainTests( string[] args) { Dstu7624Test test = new Dstu7624Test(); diff --git a/crypto/test/src/crypto/test/DeterministicDSATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DeterministicDSATest.cs similarity index 99% rename from crypto/test/src/crypto/test/DeterministicDSATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DeterministicDSATest.cs index 914a770bd5..042477e3d6 100644 --- a/crypto/test/src/crypto/test/DeterministicDSATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DeterministicDSATest.cs @@ -494,7 +494,7 @@ public override void PerformTest() TestECHMacDeterministic(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DeterministicDsaTest()); diff --git a/crypto/test/src/crypto/test/DigestRandomNumberTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DigestRandomNumberTest.cs similarity index 99% rename from crypto/test/src/crypto/test/DigestRandomNumberTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DigestRandomNumberTest.cs index cee2e354e2..035a4ed8c7 100644 --- a/crypto/test/src/crypto/test/DigestRandomNumberTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DigestRandomNumberTest.cs @@ -154,7 +154,7 @@ public void TestFunction() Assert.AreEqual(Name + ": Okay", resultText); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DigestRandomNumberTest()); diff --git a/crypto/test/src/crypto/test/DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DigestTest.cs similarity index 100% rename from crypto/test/src/crypto/test/DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/DigestTest.cs diff --git a/crypto/test/src/crypto/test/EAXTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/EAXTest.cs similarity index 99% rename from crypto/test/src/crypto/test/EAXTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/EAXTest.cs index 838f26a1b4..0e6121e350 100644 --- a/crypto/test/src/crypto/test/EAXTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/EAXTest.cs @@ -335,7 +335,7 @@ private void randomTest( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new EaxTest()); diff --git a/crypto/test/src/crypto/test/ECDHKEKGeneratorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECDHKEKGeneratorTest.cs similarity index 98% rename from crypto/test/src/crypto/test/ECDHKEKGeneratorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECDHKEKGeneratorTest.cs index 250b2ca223..d3d780cfbb 100644 --- a/crypto/test/src/crypto/test/ECDHKEKGeneratorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECDHKEKGeneratorTest.cs @@ -63,7 +63,7 @@ public override string Name get { return "ECDHKekGenerator"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ECDHKekGeneratorTest()); diff --git a/crypto/test/src/crypto/test/ECGOST3410Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECGOST3410Test.cs similarity index 99% rename from crypto/test/src/crypto/test/ECGOST3410Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECGOST3410Test.cs index 4c938378a6..6e80b18b1b 100644 --- a/crypto/test/src/crypto/test/ECGOST3410Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECGOST3410Test.cs @@ -325,7 +325,7 @@ public override void PerformTest() ecGOST3410_CParam(); } - public static void Main( + public static void RunMainTests( string[] args) { ECGost3410Test test = new ECGost3410Test(); diff --git a/crypto/test/src/crypto/test/ECIESTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECIESTest.cs similarity index 99% rename from crypto/test/src/crypto/test/ECIESTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECIESTest.cs index 1e2e8f7116..84d305502f 100644 --- a/crypto/test/src/crypto/test/ECIESTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECIESTest.cs @@ -235,7 +235,7 @@ public override void PerformTest() DoTest(p1, p2); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new EcIesTest()); diff --git a/crypto/test/src/crypto/test/ECNRTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECNRTest.cs similarity index 98% rename from crypto/test/src/crypto/test/ECNRTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECNRTest.cs index 1ab67546c9..cb033db15c 100644 --- a/crypto/test/src/crypto/test/ECNRTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECNRTest.cs @@ -98,7 +98,7 @@ public override void PerformTest() ecNR239bitPrime(); } - public static void Main( + public static void RunMainTests( string[] args) { EcNrTest test = new EcNrTest(); diff --git a/crypto/test/src/crypto/test/ECTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECTest.cs similarity index 99% rename from crypto/test/src/crypto/test/ECTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECTest.cs index 7dc847ebec..73b1e54c0c 100644 --- a/crypto/test/src/crypto/test/ECTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ECTest.cs @@ -950,7 +950,7 @@ public override void PerformTest() TestECMqvRandom(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ECTest()); diff --git a/crypto/test/src/crypto/test/Ed25519Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Ed25519Test.cs similarity index 98% rename from crypto/test/src/crypto/test/Ed25519Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Ed25519Test.cs index 82e36d9916..62ad43f50d 100644 --- a/crypto/test/src/crypto/test/Ed25519Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Ed25519Test.cs @@ -22,7 +22,7 @@ public override string Name get { return "Ed25519"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new Ed25519Test()); } diff --git a/crypto/test/src/crypto/test/Ed448Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Ed448Test.cs similarity index 98% rename from crypto/test/src/crypto/test/Ed448Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Ed448Test.cs index b035f554e5..dd9313d7a9 100644 --- a/crypto/test/src/crypto/test/Ed448Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Ed448Test.cs @@ -22,7 +22,7 @@ public override string Name get { return "Ed448"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new Ed448Test()); } diff --git a/crypto/test/src/crypto/test/ElGamalTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ElGamalTest.cs similarity index 99% rename from crypto/test/src/crypto/test/ElGamalTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ElGamalTest.cs index 1caa703872..db7fadd104 100644 --- a/crypto/test/src/crypto/test/ElGamalTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ElGamalTest.cs @@ -269,7 +269,7 @@ public override void PerformTest() TestInitCheck(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ElGamalTest()); diff --git a/crypto/test/src/crypto/test/EqualsHashCodeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/EqualsHashCodeTest.cs similarity index 99% rename from crypto/test/src/crypto/test/EqualsHashCodeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/EqualsHashCodeTest.cs index 05cc9ad538..d0caeeff5a 100644 --- a/crypto/test/src/crypto/test/EqualsHashCodeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/EqualsHashCodeTest.cs @@ -253,7 +253,7 @@ public override void PerformTest() TestDsa(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new EqualsHashCodeTest()); diff --git a/crypto/test/src/crypto/test/GCMTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GCMTest.cs similarity index 99% rename from crypto/test/src/crypto/test/GCMTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GCMTest.cs index e5e5fc43ec..3bcfaa891d 100644 --- a/crypto/test/src/crypto/test/GCMTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GCMTest.cs @@ -728,7 +728,7 @@ private static int NextInt(SecureRandom rand, int n) return value; } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new GcmTest()); diff --git a/crypto/test/src/crypto/test/GMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/GMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GMacTest.cs index 0b37e1a034..e665009c19 100644 --- a/crypto/test/src/crypto/test/GMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GMacTest.cs @@ -174,7 +174,7 @@ public override string Name get { return "GMac"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new GMacTest()); diff --git a/crypto/test/src/crypto/test/GOST28147MacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST28147MacTest.cs similarity index 98% rename from crypto/test/src/crypto/test/GOST28147MacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST28147MacTest.cs index 5f3188f48f..91f16324ca 100644 --- a/crypto/test/src/crypto/test/GOST28147MacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST28147MacTest.cs @@ -85,7 +85,7 @@ public string Name get { return "Gost28147Mac"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Gost28147MacTest(); diff --git a/crypto/test/src/crypto/test/GOST28147Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST28147Test.cs similarity index 99% rename from crypto/test/src/crypto/test/GOST28147Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST28147Test.cs index 865dcc2a76..01b6b6abab 100644 --- a/crypto/test/src/crypto/test/GOST28147Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST28147Test.cs @@ -357,7 +357,7 @@ public override string Name get { return "Gost28147"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Gost28147Test(); diff --git a/crypto/test/src/crypto/test/GOST3410Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3410Test.cs similarity index 99% rename from crypto/test/src/crypto/test/GOST3410Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3410Test.cs index f54662770b..f170c8d9fd 100644 --- a/crypto/test/src/crypto/test/GOST3410Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3410Test.cs @@ -1584,7 +1584,7 @@ public ITestResult Perform() return new SimpleTestResult(true, "Gost3410: Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Gost3410Test(); diff --git a/crypto/test/src/crypto/test/GOST3411DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3411DigestTest.cs similarity index 98% rename from crypto/test/src/crypto/test/GOST3411DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3411DigestTest.cs index 329a158d61..8bfdd6a32e 100644 --- a/crypto/test/src/crypto/test/GOST3411DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3411DigestTest.cs @@ -75,7 +75,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Gost3411Digest((Gost3411Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Gost3411DigestTest(); diff --git a/crypto/test/src/crypto/test/GOST3411_2012_256DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3411_2012_256DigestTest.cs similarity index 100% rename from crypto/test/src/crypto/test/GOST3411_2012_256DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3411_2012_256DigestTest.cs diff --git a/crypto/test/src/crypto/test/GOST3411_2012_512DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3411_2012_512DigestTest.cs similarity index 100% rename from crypto/test/src/crypto/test/GOST3411_2012_512DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GOST3411_2012_512DigestTest.cs diff --git a/crypto/test/src/crypto/test/GcmReorderTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GcmReorderTest.cs similarity index 100% rename from crypto/test/src/crypto/test/GcmReorderTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/GcmReorderTest.cs diff --git a/crypto/test/src/crypto/test/HCFamilyTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HCFamilyTest.cs similarity index 99% rename from crypto/test/src/crypto/test/HCFamilyTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HCFamilyTest.cs index 0904bc9eb0..9f091c8506 100644 --- a/crypto/test/src/crypto/test/HCFamilyTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HCFamilyTest.cs @@ -184,7 +184,7 @@ private void HCTest(IStreamCipher hc, string test, byte[] key, byte[] IV, byte[] } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new HCFamilyTest()); } diff --git a/crypto/test/src/crypto/test/HCFamilyVecTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HCFamilyVecTest.cs similarity index 99% rename from crypto/test/src/crypto/test/HCFamilyVecTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HCFamilyVecTest.cs index 00b0ee75c4..db73f7a686 100644 --- a/crypto/test/src/crypto/test/HCFamilyVecTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HCFamilyVecTest.cs @@ -168,7 +168,7 @@ private static void xor(byte[] digest, byte[] block) } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new HCFamilyVecTest()); diff --git a/crypto/test/src/crypto/test/HKDFGeneratorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HKDFGeneratorTest.cs similarity index 99% rename from crypto/test/src/crypto/test/HKDFGeneratorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HKDFGeneratorTest.cs index d6e2149df3..66e3bfa141 100644 --- a/crypto/test/src/crypto/test/HKDFGeneratorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/HKDFGeneratorTest.cs @@ -294,7 +294,7 @@ public override string Name get { return "HKDF"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new HkdfGeneratorTest()); } diff --git a/crypto/test/src/crypto/test/IDEATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/IDEATest.cs similarity index 97% rename from crypto/test/src/crypto/test/IDEATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/IDEATest.cs index fbbd1ae17e..1c46adb778 100644 --- a/crypto/test/src/crypto/test/IDEATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/IDEATest.cs @@ -35,7 +35,7 @@ public IdeaTest() { } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new IdeaTest(); diff --git a/crypto/test/src/crypto/test/ISAACTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISAACTest.cs similarity index 99% rename from crypto/test/src/crypto/test/ISAACTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISAACTest.cs index 1782bbc985..5f15d430e5 100644 --- a/crypto/test/src/crypto/test/ISAACTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISAACTest.cs @@ -180,7 +180,7 @@ private void doTest( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new IsaacTest()); diff --git a/crypto/test/src/crypto/test/ISO9796Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISO9796Test.cs similarity index 99% rename from crypto/test/src/crypto/test/ISO9796Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISO9796Test.cs index 562238bca7..8cd7a690ca 100644 --- a/crypto/test/src/crypto/test/ISO9796Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISO9796Test.cs @@ -952,7 +952,7 @@ public override void PerformTest() DoFullMessageTest(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ISO9796Test()); diff --git a/crypto/test/src/crypto/test/ISO9797Alg3MacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISO9797Alg3MacTest.cs similarity index 98% rename from crypto/test/src/crypto/test/ISO9797Alg3MacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISO9797Alg3MacTest.cs index 9d5d8b6b75..f28f403dc2 100644 --- a/crypto/test/src/crypto/test/ISO9797Alg3MacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ISO9797Alg3MacTest.cs @@ -79,7 +79,7 @@ public override string Name } } - public static void Main( + public static void RunMainTests( string[] args) { ISO9797Alg3MacTest test = new ISO9797Alg3MacTest(); diff --git a/crypto/test/src/crypto/test/KDF1GeneratorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KDF1GeneratorTest.cs similarity index 98% rename from crypto/test/src/crypto/test/KDF1GeneratorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KDF1GeneratorTest.cs index 89c8d5453e..05762bc5e2 100644 --- a/crypto/test/src/crypto/test/KDF1GeneratorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KDF1GeneratorTest.cs @@ -86,7 +86,7 @@ public override string Name get { return "KDF1"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Kdf1GeneratorTest()); diff --git a/crypto/test/src/crypto/test/KDF2GeneratorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KDF2GeneratorTest.cs similarity index 99% rename from crypto/test/src/crypto/test/KDF2GeneratorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KDF2GeneratorTest.cs index e184e0b401..6565f54cb4 100644 --- a/crypto/test/src/crypto/test/KDF2GeneratorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KDF2GeneratorTest.cs @@ -98,7 +98,7 @@ public override string Name get { return "KDF2"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Kdf2GeneratorTest()); diff --git a/crypto/test/src/crypto/test/KeccakDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KeccakDigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/KeccakDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KeccakDigestTest.cs index 961a5d2e36..ec606e335e 100644 --- a/crypto/test/src/crypto/test/KeccakDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/KeccakDigestTest.cs @@ -357,7 +357,7 @@ protected virtual IDigest CloneDigest(IDigest digest) return new KeccakDigest((KeccakDigest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new KeccakDigestTest()); diff --git a/crypto/test/src/crypto/test/MD2DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD2DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/MD2DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD2DigestTest.cs index 4f4da516b4..e9899e2ad3 100644 --- a/crypto/test/src/crypto/test/MD2DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD2DigestTest.cs @@ -50,7 +50,7 @@ protected override IDigest CloneDigest(IDigest digest) return new MD2Digest((MD2Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MD2DigestTest()); diff --git a/crypto/test/src/crypto/test/MD4DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD4DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/MD4DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD4DigestTest.cs index 4fd4e09319..95c16fb5ed 100644 --- a/crypto/test/src/crypto/test/MD4DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD4DigestTest.cs @@ -42,7 +42,7 @@ protected override IDigest CloneDigest(IDigest digest) return new MD4Digest((MD4Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MD4DigestTest()); diff --git a/crypto/test/src/crypto/test/MD5DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD5DigestTest.cs similarity index 96% rename from crypto/test/src/crypto/test/MD5DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD5DigestTest.cs index cc914165cf..b907942411 100644 --- a/crypto/test/src/crypto/test/MD5DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD5DigestTest.cs @@ -42,7 +42,7 @@ protected override IDigest CloneDigest(IDigest digest) return new MD5Digest((MD5Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MD5DigestTest()); diff --git a/crypto/test/src/crypto/test/MD5HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD5HMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/MD5HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD5HMacTest.cs index 101b8be3c6..951156527f 100644 --- a/crypto/test/src/crypto/test/MD5HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MD5HMacTest.cs @@ -71,7 +71,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new MD5HMacTest(); diff --git a/crypto/test/src/crypto/test/MGF1GeneratorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MGF1GeneratorTest.cs similarity index 98% rename from crypto/test/src/crypto/test/MGF1GeneratorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MGF1GeneratorTest.cs index ee67ffa1cf..85be9b8361 100644 --- a/crypto/test/src/crypto/test/MGF1GeneratorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MGF1GeneratorTest.cs @@ -86,7 +86,7 @@ public override string Name get { return "MGF1"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Mgf1GeneratorTest()); diff --git a/crypto/test/src/crypto/test/MacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/MacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MacTest.cs index 9a58f8a8c6..a710ca3677 100644 --- a/crypto/test/src/crypto/test/MacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/MacTest.cs @@ -180,7 +180,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { MacTest test = new MacTest(); diff --git a/crypto/test/src/crypto/test/ModeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ModeTest.cs similarity index 98% rename from crypto/test/src/crypto/test/ModeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ModeTest.cs index c67dce0940..bb7dec3f1c 100644 --- a/crypto/test/src/crypto/test/ModeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ModeTest.cs @@ -88,7 +88,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new ModeTest(); diff --git a/crypto/test/src/crypto/test/NaccacheSternTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NaccacheSternTest.cs similarity index 99% rename from crypto/test/src/crypto/test/NaccacheSternTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NaccacheSternTest.cs index 9168adced0..21f82b1d71 100644 --- a/crypto/test/src/crypto/test/NaccacheSternTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NaccacheSternTest.cs @@ -339,7 +339,7 @@ public void TestFunction() Assert.AreEqual(Name + ": Okay", resultText); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new NaccacheSternTest(); diff --git a/crypto/test/src/crypto/test/NoekeonTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NoekeonTest.cs similarity index 97% rename from crypto/test/src/crypto/test/NoekeonTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NoekeonTest.cs index b6fff70ce1..0f30157d6f 100644 --- a/crypto/test/src/crypto/test/NoekeonTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NoekeonTest.cs @@ -42,7 +42,7 @@ public override string Name get { return "Noekeon"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NoekeonTest()); diff --git a/crypto/test/src/crypto/test/NonMemoableDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NonMemoableDigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/NonMemoableDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NonMemoableDigestTest.cs index e6b329e884..901192e486 100644 --- a/crypto/test/src/crypto/test/NonMemoableDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NonMemoableDigestTest.cs @@ -102,7 +102,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NonMemoableDigestTest()); diff --git a/crypto/test/src/crypto/test/NullTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NullTest.cs similarity index 97% rename from crypto/test/src/crypto/test/NullTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NullTest.cs index 16a51808fd..dc3ffd4ec1 100644 --- a/crypto/test/src/crypto/test/NullTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/NullTest.cs @@ -71,7 +71,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NullTest()); diff --git a/crypto/test/src/crypto/test/OAEPTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OAEPTest.cs similarity index 99% rename from crypto/test/src/crypto/test/OAEPTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OAEPTest.cs index 204784cee8..b53405c495 100644 --- a/crypto/test/src/crypto/test/OAEPTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OAEPTest.cs @@ -896,7 +896,7 @@ private void TestForHighByteError(string label, int keySizeBits) } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new OaepTest()); } diff --git a/crypto/test/src/crypto/test/OCBTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OCBTest.cs similarity index 99% rename from crypto/test/src/crypto/test/OCBTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OCBTest.cs index 9f898fbe24..8c547386da 100644 --- a/crypto/test/src/crypto/test/OCBTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OCBTest.cs @@ -498,7 +498,7 @@ private static int NextInt(SecureRandom rand, int n) return value; } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new OcbTest()); diff --git a/crypto/test/src/crypto/test/OpenBsdBCryptTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OpenBsdBCryptTest.cs similarity index 99% rename from crypto/test/src/crypto/test/OpenBsdBCryptTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OpenBsdBCryptTest.cs index fabe84d6b5..56a9adf66f 100644 --- a/crypto/test/src/crypto/test/OpenBsdBCryptTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/OpenBsdBCryptTest.cs @@ -91,7 +91,7 @@ public class OpenBsdBCryptTest {"ABCDEFGHIJKLMNOPQRSTUVWXYABCDEFGHIJKLMNOPQRSTUVWXYABCDEFGHIJKLMNOPQRSTUVWXYABCDEFGHIJKLMNOPQRSTUVWXY", "$2b$12$QwAt5kuG68nW7v.87q0QPuwdki3romFc/RU/RV3Qqk4FPw6WdbQzu"} }; - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new OpenBsdBCryptTest()); } diff --git a/crypto/test/src/crypto/test/PSSBlindTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PSSBlindTest.cs similarity index 99% rename from crypto/test/src/crypto/test/PSSBlindTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PSSBlindTest.cs index d887a8f08e..a4cd9efc37 100644 --- a/crypto/test/src/crypto/test/PSSBlindTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PSSBlindTest.cs @@ -382,7 +382,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PssBlindTest()); diff --git a/crypto/test/src/crypto/test/PSSTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PSSTest.cs similarity index 99% rename from crypto/test/src/crypto/test/PSSTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PSSTest.cs index 8578d254f3..a385be4d18 100644 --- a/crypto/test/src/crypto/test/PSSTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PSSTest.cs @@ -357,7 +357,7 @@ private void fixedSaltTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PssTest()); diff --git a/crypto/test/src/crypto/test/PaddingTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PaddingTest.cs similarity index 98% rename from crypto/test/src/crypto/test/PaddingTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PaddingTest.cs index ed53d92289..657d58fba3 100644 --- a/crypto/test/src/crypto/test/PaddingTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/PaddingTest.cs @@ -152,7 +152,7 @@ public override string Name get { return "PaddingTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PaddingTest()); diff --git a/crypto/test/src/crypto/test/Pkcs12Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Pkcs12Test.cs similarity index 98% rename from crypto/test/src/crypto/test/Pkcs12Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Pkcs12Test.cs index 29d5a39422..c641cbb2ae 100644 --- a/crypto/test/src/crypto/test/Pkcs12Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Pkcs12Test.cs @@ -84,7 +84,7 @@ public override void PerformTest() Run3(10, password2, Hex.Decode("263216FCC2FAB31C"), 1000, Hex.Decode("5EC4C7A80DF652294C3925B6489A7AB857C83476")); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Pkcs12Test()); diff --git a/crypto/test/src/crypto/test/Pkcs5Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Pkcs5Test.cs similarity index 99% rename from crypto/test/src/crypto/test/Pkcs5Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Pkcs5Test.cs index fdf1e7a665..70e70d46ef 100644 --- a/crypto/test/src/crypto/test/Pkcs5Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Pkcs5Test.cs @@ -218,7 +218,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Pkcs5Test()); diff --git a/crypto/test/src/crypto/test/Poly1305Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Poly1305Test.cs similarity index 99% rename from crypto/test/src/crypto/test/Poly1305Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Poly1305Test.cs index 7aaceb99ec..f318e7fac0 100644 --- a/crypto/test/src/crypto/test/Poly1305Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Poly1305Test.cs @@ -502,7 +502,7 @@ private void CheckVector(byte[] keyMaterial, byte[] input, byte[] tag) } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Poly1305Test()); diff --git a/crypto/test/src/crypto/test/RC2Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC2Test.cs similarity index 98% rename from crypto/test/src/crypto/test/RC2Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC2Test.cs index 177c1817dd..488c8458e0 100644 --- a/crypto/test/src/crypto/test/RC2Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC2Test.cs @@ -38,7 +38,7 @@ public RC2Test() { } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RC2Test(); diff --git a/crypto/test/src/crypto/test/RC2WrapTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC2WrapTest.cs similarity index 98% rename from crypto/test/src/crypto/test/RC2WrapTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC2WrapTest.cs index fc27acd2cb..752beaf4a8 100644 --- a/crypto/test/src/crypto/test/RC2WrapTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC2WrapTest.cs @@ -103,7 +103,7 @@ public string Name get { return "RC2Wrap"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RC2WrapTest(); diff --git a/crypto/test/src/crypto/test/RC4Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC4Test.cs similarity index 97% rename from crypto/test/src/crypto/test/RC4Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC4Test.cs index 7c1ac91622..9c60328e51 100644 --- a/crypto/test/src/crypto/test/RC4Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC4Test.cs @@ -39,7 +39,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RC4Test(); diff --git a/crypto/test/src/crypto/test/RC5Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC5Test.cs similarity index 99% rename from crypto/test/src/crypto/test/RC5Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC5Test.cs index e50878a0e5..49169e8b3f 100644 --- a/crypto/test/src/crypto/test/RC5Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC5Test.cs @@ -181,7 +181,7 @@ public ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { RC5Test test = new RC5Test(); diff --git a/crypto/test/src/crypto/test/RC6Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC6Test.cs similarity index 98% rename from crypto/test/src/crypto/test/RC6Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC6Test.cs index 4f59ec4e9a..eb622d2319 100644 --- a/crypto/test/src/crypto/test/RC6Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RC6Test.cs @@ -34,7 +34,7 @@ public RC6Test() { } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RC6Test(); diff --git a/crypto/test/src/crypto/test/RFC3211WrapTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RFC3211WrapTest.cs similarity index 99% rename from crypto/test/src/crypto/test/RFC3211WrapTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RFC3211WrapTest.cs index 91dea34dd7..89ccd75088 100644 --- a/crypto/test/src/crypto/test/RFC3211WrapTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RFC3211WrapTest.cs @@ -199,7 +199,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Rfc3211WrapTest()); diff --git a/crypto/test/src/crypto/test/RSABlindedTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RSABlindedTest.cs similarity index 99% rename from crypto/test/src/crypto/test/RSABlindedTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RSABlindedTest.cs index 75b9f3a07d..da3efd4799 100644 --- a/crypto/test/src/crypto/test/RSABlindedTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RSABlindedTest.cs @@ -429,7 +429,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RsaBlindedTest(); diff --git a/crypto/test/src/crypto/test/RegressionTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RegressionTest.cs similarity index 98% rename from crypto/test/src/crypto/test/RegressionTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RegressionTest.cs index f8b5c3c799..0edc37b4cb 100644 --- a/crypto/test/src/crypto/test/RegressionTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RegressionTest.cs @@ -140,7 +140,7 @@ public class RegressionTest new Ed448Test(), }; - public static void Main(string[] args) + public static void RunMainTests(string[] args) { foreach (ITest test in tests) { diff --git a/crypto/test/src/crypto/test/RijndaelTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RijndaelTest.cs similarity index 99% rename from crypto/test/src/crypto/test/RijndaelTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RijndaelTest.cs index f714c83eb3..2f2dbba231 100644 --- a/crypto/test/src/crypto/test/RijndaelTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RijndaelTest.cs @@ -114,7 +114,7 @@ public override string Name get { return "Rijndael"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RijndaelTest(); diff --git a/crypto/test/src/crypto/test/RipeMD128DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD128DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/RipeMD128DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD128DigestTest.cs index ead4f06ad2..da0abe8418 100644 --- a/crypto/test/src/crypto/test/RipeMD128DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD128DigestTest.cs @@ -57,7 +57,7 @@ protected override IDigest CloneDigest(IDigest digest) return new RipeMD128Digest((RipeMD128Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new RipeMD128DigestTest()); diff --git a/crypto/test/src/crypto/test/RipeMD128HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD128HMacTest.cs similarity index 98% rename from crypto/test/src/crypto/test/RipeMD128HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD128HMacTest.cs index 2f6a2d9791..338b41269e 100644 --- a/crypto/test/src/crypto/test/RipeMD128HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD128HMacTest.cs @@ -80,7 +80,7 @@ public ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RipeMD128HMacTest(); diff --git a/crypto/test/src/crypto/test/RipeMD160DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD160DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/RipeMD160DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD160DigestTest.cs index 15e53f2a07..39353db60f 100644 --- a/crypto/test/src/crypto/test/RipeMD160DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD160DigestTest.cs @@ -57,7 +57,7 @@ protected override IDigest CloneDigest(IDigest digest) return new RipeMD160Digest((RipeMD160Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new RipeMD160DigestTest()); diff --git a/crypto/test/src/crypto/test/RipeMD160HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD160HMacTest.cs similarity index 98% rename from crypto/test/src/crypto/test/RipeMD160HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD160HMacTest.cs index cc87a535f8..4f14ef41a1 100644 --- a/crypto/test/src/crypto/test/RipeMD160HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD160HMacTest.cs @@ -81,7 +81,7 @@ public ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RipeMD160HMacTest(); diff --git a/crypto/test/src/crypto/test/RipeMD256DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD256DigestTest.cs similarity index 98% rename from crypto/test/src/crypto/test/RipeMD256DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD256DigestTest.cs index 5b3e6b10b9..c47216e351 100644 --- a/crypto/test/src/crypto/test/RipeMD256DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD256DigestTest.cs @@ -57,7 +57,7 @@ protected override IDigest CloneDigest(IDigest digest) return new RipeMD256Digest((RipeMD256Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new RipeMD256DigestTest()); diff --git a/crypto/test/src/crypto/test/RipeMD320DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD320DigestTest.cs similarity index 98% rename from crypto/test/src/crypto/test/RipeMD320DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD320DigestTest.cs index 047d68aa7e..8449cf7f68 100644 --- a/crypto/test/src/crypto/test/RipeMD320DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RipeMD320DigestTest.cs @@ -57,7 +57,7 @@ protected override IDigest CloneDigest(IDigest digest) return new RipeMD320Digest((RipeMD320Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new RipeMD320DigestTest()); diff --git a/crypto/test/src/crypto/test/RsaTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RsaTest.cs similarity index 99% rename from crypto/test/src/crypto/test/RsaTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RsaTest.cs index ace60b2372..1671259179 100644 --- a/crypto/test/src/crypto/test/RsaTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/RsaTest.cs @@ -744,7 +744,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RsaTest(); diff --git a/crypto/test/src/crypto/test/SCryptTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SCryptTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SCryptTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SCryptTest.cs index 82bc608804..ae4e9cfacd 100644 --- a/crypto/test/src/crypto/test/SCryptTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SCryptTest.cs @@ -134,7 +134,7 @@ private static int ExtractInteger(string arg) return int.Parse(arg.Trim()); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SCryptTest()); diff --git a/crypto/test/src/crypto/test/SEEDTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SEEDTest.cs similarity index 98% rename from crypto/test/src/crypto/test/SEEDTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SEEDTest.cs index 2fcb242cc9..65b33788ad 100644 --- a/crypto/test/src/crypto/test/SEEDTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SEEDTest.cs @@ -48,7 +48,7 @@ public override string Name get { return "SEED"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SeedTest()); diff --git a/crypto/test/src/crypto/test/SHA1DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA1DigestTest.cs similarity index 96% rename from crypto/test/src/crypto/test/SHA1DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA1DigestTest.cs index 318035b0cf..429fb224c2 100644 --- a/crypto/test/src/crypto/test/SHA1DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA1DigestTest.cs @@ -40,7 +40,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Sha1Digest((Sha1Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha1DigestTest()); diff --git a/crypto/test/src/crypto/test/SHA1HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA1HMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SHA1HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA1HMacTest.cs index 865f5b58b5..73c9cb2eb4 100644 --- a/crypto/test/src/crypto/test/SHA1HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA1HMacTest.cs @@ -73,7 +73,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Sha1HMacTest(); diff --git a/crypto/test/src/crypto/test/SHA224DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA224DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/SHA224DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA224DigestTest.cs index 9469b651b1..c79e59610a 100644 --- a/crypto/test/src/crypto/test/SHA224DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA224DigestTest.cs @@ -53,7 +53,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Sha224Digest((Sha224Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha224DigestTest()); diff --git a/crypto/test/src/crypto/test/SHA224HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA224HMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SHA224HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA224HMacTest.cs index 06c6ea1cb5..6f7f133c8d 100644 --- a/crypto/test/src/crypto/test/SHA224HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA224HMacTest.cs @@ -102,7 +102,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Sha224HMacTest(); diff --git a/crypto/test/src/crypto/test/SHA256DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA256DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/SHA256DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA256DigestTest.cs index d2ae89e569..537c45ab56 100644 --- a/crypto/test/src/crypto/test/SHA256DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA256DigestTest.cs @@ -54,7 +54,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Sha256Digest((Sha256Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha256DigestTest()); diff --git a/crypto/test/src/crypto/test/SHA256HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA256HMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SHA256HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA256HMacTest.cs index a9016af218..4a5d9b5ad7 100644 --- a/crypto/test/src/crypto/test/SHA256HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA256HMacTest.cs @@ -102,7 +102,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Sha256HMacTest(); diff --git a/crypto/test/src/crypto/test/SHA384DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA384DigestTest.cs similarity index 98% rename from crypto/test/src/crypto/test/SHA384DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA384DigestTest.cs index 99363ac5a9..6245faf79d 100644 --- a/crypto/test/src/crypto/test/SHA384DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA384DigestTest.cs @@ -53,7 +53,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Sha384Digest((Sha384Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha384DigestTest()); diff --git a/crypto/test/src/crypto/test/SHA384HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA384HMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SHA384HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA384HMacTest.cs index 0caba12c41..522b1db99a 100644 --- a/crypto/test/src/crypto/test/SHA384HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA384HMacTest.cs @@ -102,7 +102,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Sha384HMacTest(); diff --git a/crypto/test/src/crypto/test/SHA3DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA3DigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SHA3DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA3DigestTest.cs index 71f51f43b8..4be0e9123a 100644 --- a/crypto/test/src/crypto/test/SHA3DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA3DigestTest.cs @@ -229,7 +229,7 @@ private string StripFromChar(string s, char c) return s; } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha3DigestTest()); diff --git a/crypto/test/src/crypto/test/SHA512DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512DigestTest.cs similarity index 98% rename from crypto/test/src/crypto/test/SHA512DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512DigestTest.cs index d4f56e15e7..32ae2a4e84 100644 --- a/crypto/test/src/crypto/test/SHA512DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512DigestTest.cs @@ -53,7 +53,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Sha512Digest((Sha512Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha512DigestTest()); diff --git a/crypto/test/src/crypto/test/SHA512HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512HMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SHA512HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512HMacTest.cs index c091a7220b..0b821453c8 100644 --- a/crypto/test/src/crypto/test/SHA512HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512HMacTest.cs @@ -103,7 +103,7 @@ public virtual ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new Sha512HMacTest(); diff --git a/crypto/test/src/crypto/test/SHA512t224DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512t224DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/SHA512t224DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512t224DigestTest.cs index a3d68e1ab6..ccc3f02634 100644 --- a/crypto/test/src/crypto/test/SHA512t224DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512t224DigestTest.cs @@ -53,7 +53,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Sha512tDigest((Sha512tDigest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha512t224DigestTest()); diff --git a/crypto/test/src/crypto/test/SHA512t256DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512t256DigestTest.cs similarity index 97% rename from crypto/test/src/crypto/test/SHA512t256DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512t256DigestTest.cs index c957aa6602..05c0183c17 100644 --- a/crypto/test/src/crypto/test/SHA512t256DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SHA512t256DigestTest.cs @@ -53,7 +53,7 @@ protected override IDigest CloneDigest(IDigest digest) return new Sha512tDigest((Sha512tDigest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Sha512t256DigestTest()); diff --git a/crypto/test/src/crypto/test/SM2EngineTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2EngineTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SM2EngineTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2EngineTest.cs index 1a2d1d13e6..7a9676b362 100644 --- a/crypto/test/src/crypto/test/SM2EngineTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2EngineTest.cs @@ -152,7 +152,7 @@ public override void PerformTest() DoEngineTestF2m(); } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new SM2EngineTest()); } diff --git a/crypto/test/src/crypto/test/SM2KeyExchangeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2KeyExchangeTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SM2KeyExchangeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2KeyExchangeTest.cs index 39131f163c..3d3b614077 100644 --- a/crypto/test/src/crypto/test/SM2KeyExchangeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2KeyExchangeTest.cs @@ -214,7 +214,7 @@ public override void PerformTest() DoKeyExchangeTestF2m(); } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new SM2KeyExchangeTest()); } diff --git a/crypto/test/src/crypto/test/SM2SignerTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2SignerTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SM2SignerTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2SignerTest.cs index e3c9c21aee..6d679f964b 100644 --- a/crypto/test/src/crypto/test/SM2SignerTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM2SignerTest.cs @@ -178,7 +178,7 @@ private static byte[] Encode(BigInteger r, BigInteger s) return new DerSequence(new DerInteger(r), new DerInteger(s)).GetEncoded(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SM2SignerTest()); diff --git a/crypto/test/src/crypto/test/SM3DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM3DigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SM3DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM3DigestTest.cs index ae29a15811..8bcbcce1bb 100644 --- a/crypto/test/src/crypto/test/SM3DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM3DigestTest.cs @@ -190,7 +190,7 @@ protected override IDigest CloneDigest(IDigest digest) return new SM3Digest((SM3Digest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SM3DigestTest()); diff --git a/crypto/test/src/crypto/test/SM4Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM4Test.cs similarity index 97% rename from crypto/test/src/crypto/test/SM4Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM4Test.cs index ae2f18b00e..54110ac8ae 100644 --- a/crypto/test/src/crypto/test/SM4Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SM4Test.cs @@ -77,7 +77,7 @@ public override string Name get { return "SM4"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new SM4Test()); } diff --git a/crypto/test/src/crypto/test/SRP6Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SRP6Test.cs similarity index 99% rename from crypto/test/src/crypto/test/SRP6Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SRP6Test.cs index 6b64df9247..e54bbbc268 100644 --- a/crypto/test/src/crypto/test/SRP6Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SRP6Test.cs @@ -242,7 +242,7 @@ private void testServerCatchesBadA(Srp6GroupParameters group) } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new Srp6Test()); } diff --git a/crypto/test/src/crypto/test/Salsa20Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Salsa20Test.cs similarity index 99% rename from crypto/test/src/crypto/test/Salsa20Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Salsa20Test.cs index b4dc1ef2b2..f94845a00a 100644 --- a/crypto/test/src/crypto/test/Salsa20Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Salsa20Test.cs @@ -301,7 +301,7 @@ private void reinitBug() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Salsa20Test()); diff --git a/crypto/test/src/crypto/test/SerpentTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SerpentTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SerpentTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SerpentTest.cs index 08dbda5916..f6da31027b 100644 --- a/crypto/test/src/crypto/test/SerpentTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SerpentTest.cs @@ -134,7 +134,7 @@ public override string Name get { return "Serpent"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new SerpentTest()); } diff --git a/crypto/test/src/crypto/test/ShakeDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ShakeDigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/ShakeDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ShakeDigestTest.cs index d8b2d55d6f..faf5a8aeee 100644 --- a/crypto/test/src/crypto/test/ShakeDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ShakeDigestTest.cs @@ -277,7 +277,7 @@ private string StripFromChar(string s, char c) return s; } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ShakeDigestTest()); diff --git a/crypto/test/src/crypto/test/ShortenedDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ShortenedDigestTest.cs similarity index 98% rename from crypto/test/src/crypto/test/ShortenedDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ShortenedDigestTest.cs index 4956b5b399..0dc11aab1b 100644 --- a/crypto/test/src/crypto/test/ShortenedDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/ShortenedDigestTest.cs @@ -81,7 +81,7 @@ public override string Name get { return "ShortenedDigest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ShortenedDigestTest()); diff --git a/crypto/test/src/crypto/test/SipHashTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SipHashTest.cs similarity index 98% rename from crypto/test/src/crypto/test/SipHashTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SipHashTest.cs index 82dfce82c8..5dcd0d4ff0 100644 --- a/crypto/test/src/crypto/test/SipHashTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SipHashTest.cs @@ -140,7 +140,7 @@ private void UpdateMac(SipHash mac, byte[] input, int updateType) } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new SipHashTest()); } diff --git a/crypto/test/src/crypto/test/SkeinDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkeinDigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SkeinDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkeinDigestTest.cs index b6f1c542b1..088e46b78f 100644 --- a/crypto/test/src/crypto/test/SkeinDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkeinDigestTest.cs @@ -285,7 +285,7 @@ private void runTest(Case dc) // } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SkeinDigestTest()); diff --git a/crypto/test/src/crypto/test/SkeinMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkeinMacTest.cs similarity index 99% rename from crypto/test/src/crypto/test/SkeinMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkeinMacTest.cs index 852c3b2c79..a671eb835e 100644 --- a/crypto/test/src/crypto/test/SkeinMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkeinMacTest.cs @@ -156,7 +156,7 @@ private void runTest(Case dc) } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SkeinMacTest()); diff --git a/crypto/test/src/crypto/test/SkipjackTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkipjackTest.cs similarity index 96% rename from crypto/test/src/crypto/test/SkipjackTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkipjackTest.cs index d9fe6e4b44..3c70b3f165 100644 --- a/crypto/test/src/crypto/test/SkipjackTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/SkipjackTest.cs @@ -26,7 +26,7 @@ public SkipjackTest() { } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new SkipjackTest(); diff --git a/crypto/test/src/crypto/test/StreamCipherResetTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/StreamCipherResetTest.cs similarity index 98% rename from crypto/test/src/crypto/test/StreamCipherResetTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/StreamCipherResetTest.cs index 49760a24b4..cfcce1f213 100644 --- a/crypto/test/src/crypto/test/StreamCipherResetTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/StreamCipherResetTest.cs @@ -118,7 +118,7 @@ private void CheckReset(IStreamCipher cipher, ICipherParameters cipherParams, } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new StreamCipherResetTest()); } diff --git a/crypto/test/src/crypto/test/StreamCipherVectorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/StreamCipherVectorTest.cs similarity index 100% rename from crypto/test/src/crypto/test/StreamCipherVectorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/StreamCipherVectorTest.cs diff --git a/crypto/test/src/crypto/test/TEATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TEATest.cs similarity index 97% rename from crypto/test/src/crypto/test/TEATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TEATest.cs index 525941dbf7..6278acc5ca 100644 --- a/crypto/test/src/crypto/test/TEATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TEATest.cs @@ -42,7 +42,7 @@ public override string Name get { return "TEA"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new TeaTest()); diff --git a/crypto/test/src/crypto/test/Threefish1024Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish1024Test.cs similarity index 98% rename from crypto/test/src/crypto/test/Threefish1024Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish1024Test.cs index 64f9aa29fd..814c1d12c1 100644 --- a/crypto/test/src/crypto/test/Threefish1024Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish1024Test.cs @@ -57,7 +57,7 @@ public override string Name get { return "Threefish-1024"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Threefish1024Test()); diff --git a/crypto/test/src/crypto/test/Threefish256Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish256Test.cs similarity index 97% rename from crypto/test/src/crypto/test/Threefish256Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish256Test.cs index e44299a315..82f3b82037 100644 --- a/crypto/test/src/crypto/test/Threefish256Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish256Test.cs @@ -42,7 +42,7 @@ public override string Name get { return "Threefish-256"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Threefish256Test()); diff --git a/crypto/test/src/crypto/test/Threefish512Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish512Test.cs similarity index 98% rename from crypto/test/src/crypto/test/Threefish512Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish512Test.cs index 8f4ec63452..b31aeb95b3 100644 --- a/crypto/test/src/crypto/test/Threefish512Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/Threefish512Test.cs @@ -47,7 +47,7 @@ public override string Name get { return "Threefish-512"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Threefish512Test()); diff --git a/crypto/test/src/crypto/test/TigerDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TigerDigestTest.cs similarity index 98% rename from crypto/test/src/crypto/test/TigerDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TigerDigestTest.cs index b351c4b5ee..07cc3373ad 100644 --- a/crypto/test/src/crypto/test/TigerDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TigerDigestTest.cs @@ -65,7 +65,7 @@ protected override IDigest CloneDigest(IDigest digest) return new TigerDigest((TigerDigest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new TigerDigestTest()); diff --git a/crypto/test/src/crypto/test/TnepresTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TnepresTest.cs similarity index 99% rename from crypto/test/src/crypto/test/TnepresTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TnepresTest.cs index 07308dbff7..79483fa455 100644 --- a/crypto/test/src/crypto/test/TnepresTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TnepresTest.cs @@ -139,7 +139,7 @@ public override string Name get { return "Tnepres"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new TnepresTest()); } diff --git a/crypto/test/src/crypto/test/TwofishTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TwofishTest.cs similarity index 97% rename from crypto/test/src/crypto/test/TwofishTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TwofishTest.cs index 9425d2e60a..2f432ad8f4 100644 --- a/crypto/test/src/crypto/test/TwofishTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/TwofishTest.cs @@ -34,7 +34,7 @@ public TwofishTest() { } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new TwofishTest(); diff --git a/crypto/test/src/crypto/test/VMPCKSA3Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCKSA3Test.cs similarity index 98% rename from crypto/test/src/crypto/test/VMPCKSA3Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCKSA3Test.cs index a25105b77d..534c2bc1b0 100644 --- a/crypto/test/src/crypto/test/VMPCKSA3Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCKSA3Test.cs @@ -95,7 +95,7 @@ private byte[] checkEngine(VmpcKsa3Engine engine) return output; } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new VmpcKsa3Test()); diff --git a/crypto/test/src/crypto/test/VMPCMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCMacTest.cs similarity index 97% rename from crypto/test/src/crypto/test/VMPCMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCMacTest.cs index b9a5e3a935..12f6897dc2 100644 --- a/crypto/test/src/crypto/test/VMPCMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCMacTest.cs @@ -20,7 +20,7 @@ public override string Name get { return "VMPC-MAC"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new VmpcMacTest()); diff --git a/crypto/test/src/crypto/test/VMPCTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCTest.cs similarity index 98% rename from crypto/test/src/crypto/test/VMPCTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCTest.cs index 6186c4733f..1e6820dec6 100644 --- a/crypto/test/src/crypto/test/VMPCTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/VMPCTest.cs @@ -95,7 +95,7 @@ private byte[] checkEngine(VmpcEngine engine) return output; } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new VmpcTest()); diff --git a/crypto/test/src/crypto/test/WhirlpoolDigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/WhirlpoolDigestTest.cs similarity index 99% rename from crypto/test/src/crypto/test/WhirlpoolDigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/WhirlpoolDigestTest.cs index 1445b89778..b08113d78b 100644 --- a/crypto/test/src/crypto/test/WhirlpoolDigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/WhirlpoolDigestTest.cs @@ -102,7 +102,7 @@ protected override IDigest CloneDigest(IDigest digest) return new WhirlpoolDigest((WhirlpoolDigest)digest); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new WhirlpoolDigestTest()); diff --git a/crypto/test/src/crypto/test/X25519Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X25519Test.cs similarity index 97% rename from crypto/test/src/crypto/test/X25519Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X25519Test.cs index 29466e0c65..1edf755a5d 100644 --- a/crypto/test/src/crypto/test/X25519Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X25519Test.cs @@ -21,7 +21,7 @@ public override string Name get { return "X25519"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new X25519Test()); } diff --git a/crypto/test/src/crypto/test/X448Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X448Test.cs similarity index 97% rename from crypto/test/src/crypto/test/X448Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X448Test.cs index 5d4b14b638..0d1ed49611 100644 --- a/crypto/test/src/crypto/test/X448Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X448Test.cs @@ -21,7 +21,7 @@ public override string Name get { return "X448"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new X448Test()); } diff --git a/crypto/test/src/crypto/test/X931SignerTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X931SignerTest.cs similarity index 99% rename from crypto/test/src/crypto/test/X931SignerTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X931SignerTest.cs index d03cbc8e46..3925843b50 100644 --- a/crypto/test/src/crypto/test/X931SignerTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/X931SignerTest.cs @@ -129,7 +129,7 @@ private void ShouldPassSignatureTest3() } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new X931SignerTest()); } diff --git a/crypto/test/src/crypto/test/XSalsa20Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/XSalsa20Test.cs similarity index 99% rename from crypto/test/src/crypto/test/XSalsa20Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/XSalsa20Test.cs index 74ed04e88a..6f542147e9 100644 --- a/crypto/test/src/crypto/test/XSalsa20Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/XSalsa20Test.cs @@ -166,7 +166,7 @@ private void performTest(int number, TestCase testCase) } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new XSalsa20Test()); diff --git a/crypto/test/src/crypto/test/XTEATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/XTEATest.cs similarity index 97% rename from crypto/test/src/crypto/test/XTEATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/test/XTEATest.cs index a1ea652986..717ced9177 100644 --- a/crypto/test/src/crypto/test/XTEATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/test/XTEATest.cs @@ -42,7 +42,7 @@ public override string Name get { return "XTEA"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new XteaTest()); diff --git a/crypto/test/src/crypto/tls/test/ByteQueueStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/ByteQueueStreamTest.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/ByteQueueStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/ByteQueueStreamTest.cs diff --git a/crypto/test/src/crypto/tls/test/DtlsProtocolTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsProtocolTest.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/DtlsProtocolTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsProtocolTest.cs diff --git a/crypto/test/src/crypto/tls/test/DtlsTestCase.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestCase.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/DtlsTestCase.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestCase.cs diff --git a/crypto/test/src/crypto/tls/test/DtlsTestClientProtocol.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestClientProtocol.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/DtlsTestClientProtocol.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestClientProtocol.cs diff --git a/crypto/test/src/crypto/tls/test/DtlsTestServerProtocol.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestServerProtocol.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/DtlsTestServerProtocol.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestServerProtocol.cs diff --git a/crypto/test/src/crypto/tls/test/DtlsTestSuite.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestSuite.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/DtlsTestSuite.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/DtlsTestSuite.cs diff --git a/crypto/test/src/crypto/tls/test/LoggingDatagramTransport.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/LoggingDatagramTransport.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/LoggingDatagramTransport.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/LoggingDatagramTransport.cs diff --git a/crypto/test/src/crypto/tls/test/MockDatagramAssociation.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockDatagramAssociation.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockDatagramAssociation.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockDatagramAssociation.cs diff --git a/crypto/test/src/crypto/tls/test/MockDtlsClient.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockDtlsClient.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockDtlsClient.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockDtlsClient.cs diff --git a/crypto/test/src/crypto/tls/test/MockDtlsServer.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockDtlsServer.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockDtlsServer.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockDtlsServer.cs diff --git a/crypto/test/src/crypto/tls/test/MockPskTlsClient.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockPskTlsClient.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockPskTlsClient.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockPskTlsClient.cs diff --git a/crypto/test/src/crypto/tls/test/MockPskTlsServer.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockPskTlsServer.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockPskTlsServer.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockPskTlsServer.cs diff --git a/crypto/test/src/crypto/tls/test/MockSrpTlsClient.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockSrpTlsClient.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockSrpTlsClient.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockSrpTlsClient.cs diff --git a/crypto/test/src/crypto/tls/test/MockSrpTlsServer.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockSrpTlsServer.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockSrpTlsServer.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockSrpTlsServer.cs diff --git a/crypto/test/src/crypto/tls/test/MockTlsClient.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockTlsClient.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockTlsClient.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockTlsClient.cs diff --git a/crypto/test/src/crypto/tls/test/MockTlsServer.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockTlsServer.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/MockTlsServer.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/MockTlsServer.cs diff --git a/crypto/test/src/crypto/tls/test/NetworkStream.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/NetworkStream.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/NetworkStream.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/NetworkStream.cs diff --git a/crypto/test/src/crypto/tls/test/PipedStream.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/PipedStream.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/PipedStream.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/PipedStream.cs diff --git a/crypto/test/src/crypto/tls/test/PskTlsClientTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/PskTlsClientTest.cs similarity index 98% rename from crypto/test/src/crypto/tls/test/PskTlsClientTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/PskTlsClientTest.cs index 7072c71059..cbff20e373 100644 --- a/crypto/test/src/crypto/tls/test/PskTlsClientTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/PskTlsClientTest.cs @@ -20,7 +20,7 @@ public class PskTlsClientTest { private static readonly SecureRandom secureRandom = new SecureRandom(); - public static void Main(string[] args) + public static void RunMainTests(string[] args) { string hostname = "localhost"; int port = 5556; diff --git a/crypto/test/src/crypto/tls/test/TlsClientTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsClientTest.cs similarity index 97% rename from crypto/test/src/crypto/tls/test/TlsClientTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsClientTest.cs index c9a5ef9adf..efa7f959d4 100644 --- a/crypto/test/src/crypto/tls/test/TlsClientTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsClientTest.cs @@ -17,7 +17,7 @@ public class TlsClientTest { private static readonly SecureRandom secureRandom = new SecureRandom(); - public static void Main(string[] args) + public static void RunMainTests(string[] args) { string hostname = "localhost"; int port = 5556; diff --git a/crypto/test/src/crypto/tls/test/TlsProtocolNonBlockingTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsProtocolNonBlockingTest.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsProtocolNonBlockingTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsProtocolNonBlockingTest.cs diff --git a/crypto/test/src/crypto/tls/test/TlsProtocolTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsProtocolTest.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsProtocolTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsProtocolTest.cs diff --git a/crypto/test/src/crypto/tls/test/TlsPskProtocolTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsPskProtocolTest.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsPskProtocolTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsPskProtocolTest.cs diff --git a/crypto/test/src/crypto/tls/test/TlsServerTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsServerTest.cs similarity index 97% rename from crypto/test/src/crypto/tls/test/TlsServerTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsServerTest.cs index 7920cb59a4..3b89402861 100644 --- a/crypto/test/src/crypto/tls/test/TlsServerTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsServerTest.cs @@ -19,7 +19,7 @@ public class TlsServerTest { private static readonly SecureRandom secureRandom = new SecureRandom(); - public static void Main(string[] args) + public static void RunMainTests(string[] args) { int port = 5556; diff --git a/crypto/test/src/crypto/tls/test/TlsSrpProtocolTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsSrpProtocolTest.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsSrpProtocolTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsSrpProtocolTest.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestCase.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestCase.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestCase.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestCase.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestClientImpl.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestClientImpl.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestClientImpl.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestClientImpl.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestClientProtocol.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestClientProtocol.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestClientProtocol.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestClientProtocol.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestConfig.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestConfig.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestConfig.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestConfig.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestServerImpl.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestServerImpl.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestServerImpl.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestServerImpl.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestServerProtocol.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestServerProtocol.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestServerProtocol.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestServerProtocol.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestSuite.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestSuite.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestSuite.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestSuite.cs diff --git a/crypto/test/src/crypto/tls/test/TlsTestUtilities.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestUtilities.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/TlsTestUtilities.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/TlsTestUtilities.cs diff --git a/crypto/test/src/crypto/tls/test/UnreliableDatagramTransport.cs b/test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/UnreliableDatagramTransport.cs similarity index 100% rename from crypto/test/src/crypto/tls/test/UnreliableDatagramTransport.cs rename to test/Crypto.NetSdk.NUnitTest/tests/crypto/tls/test/UnreliableDatagramTransport.cs diff --git a/crypto/test/src/math/ec/custom/sec/test/SecP256R1FieldTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/custom/sec/test/SecP256R1FieldTest.cs similarity index 100% rename from crypto/test/src/math/ec/custom/sec/test/SecP256R1FieldTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/custom/sec/test/SecP256R1FieldTest.cs diff --git a/crypto/test/src/math/ec/custom/sec/test/SecP384R1FieldTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/custom/sec/test/SecP384R1FieldTest.cs similarity index 100% rename from crypto/test/src/math/ec/custom/sec/test/SecP384R1FieldTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/custom/sec/test/SecP384R1FieldTest.cs diff --git a/crypto/test/src/math/ec/rfc7748/test/X25519Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc7748/test/X25519Test.cs similarity index 100% rename from crypto/test/src/math/ec/rfc7748/test/X25519Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc7748/test/X25519Test.cs diff --git a/crypto/test/src/math/ec/rfc7748/test/X448Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc7748/test/X448Test.cs similarity index 100% rename from crypto/test/src/math/ec/rfc7748/test/X448Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc7748/test/X448Test.cs diff --git a/crypto/test/src/math/ec/rfc8032/test/Ed25519Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc8032/test/Ed25519Test.cs similarity index 100% rename from crypto/test/src/math/ec/rfc8032/test/Ed25519Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc8032/test/Ed25519Test.cs diff --git a/crypto/test/src/math/ec/rfc8032/test/Ed448Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc8032/test/Ed448Test.cs similarity index 100% rename from crypto/test/src/math/ec/rfc8032/test/Ed448Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/rfc8032/test/Ed448Test.cs diff --git a/crypto/test/src/math/ec/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/AllTests.cs similarity index 91% rename from crypto/test/src/math/ec/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/AllTests.cs index 3d3f3939b5..2f51a746af 100644 --- a/crypto/test/src/math/ec/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/AllTests.cs @@ -8,7 +8,7 @@ namespace Org.BouncyCastle.Math.EC.Tests { public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/math/ec/test/ECAlgorithmsTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/ECAlgorithmsTest.cs similarity index 100% rename from crypto/test/src/math/ec/test/ECAlgorithmsTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/ECAlgorithmsTest.cs diff --git a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/ECPointPerformanceTest.cs similarity index 99% rename from crypto/test/src/math/ec/test/ECPointPerformanceTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/ECPointPerformanceTest.cs index 2bcd5b5027..95bf0883c0 100644 --- a/crypto/test/src/math/ec/test/ECPointPerformanceTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/ECPointPerformanceTest.cs @@ -201,7 +201,7 @@ public void TestMultiply() } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { new ECPointPerformanceTest().TestMultiply(); } diff --git a/crypto/test/src/math/ec/test/ECPointTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/ECPointTest.cs similarity index 100% rename from crypto/test/src/math/ec/test/ECPointTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/ECPointTest.cs diff --git a/crypto/test/src/math/ec/test/F2mProofer.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/F2mProofer.cs similarity index 99% rename from crypto/test/src/math/ec/test/F2mProofer.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/F2mProofer.cs index 727d32c55c..cbb62bbbaf 100644 --- a/crypto/test/src/math/ec/test/F2mProofer.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/F2mProofer.cs @@ -136,7 +136,7 @@ // + "| -compare ]"); // } // -// public static void Main(string[] args) +// public static void RunMainTests(string[] args) // { // if (args.Length == 0) // { diff --git a/crypto/test/src/math/ec/test/FixedPointTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/FixedPointTest.cs similarity index 100% rename from crypto/test/src/math/ec/test/FixedPointTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/FixedPointTest.cs diff --git a/crypto/test/src/math/ec/test/TnafTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/TnafTest.cs similarity index 100% rename from crypto/test/src/math/ec/test/TnafTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/ec/test/TnafTest.cs diff --git a/crypto/test/src/math/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/test/AllTests.cs similarity index 90% rename from crypto/test/src/math/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/test/AllTests.cs index 53feff9546..4d62c78b40 100644 --- a/crypto/test/src/math/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/math/test/AllTests.cs @@ -8,7 +8,7 @@ namespace Org.BouncyCastle.Math.Tests { public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/math/test/BigIntegerTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/test/BigIntegerTest.cs similarity index 100% rename from crypto/test/src/math/test/BigIntegerTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/test/BigIntegerTest.cs diff --git a/crypto/test/src/math/test/PrimesTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/math/test/PrimesTest.cs similarity index 100% rename from crypto/test/src/math/test/PrimesTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/math/test/PrimesTest.cs diff --git a/crypto/test/src/ocsp/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/AllTests.cs similarity index 90% rename from crypto/test/src/ocsp/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/AllTests.cs index 5e799cd09a..4e7541e16f 100644 --- a/crypto/test/src/ocsp/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/AllTests.cs @@ -10,7 +10,7 @@ namespace Org.BouncyCastle.Ocsp.Tests { public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/ocsp/test/OCSPTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/OCSPTest.cs similarity index 99% rename from crypto/test/src/ocsp/test/OCSPTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/OCSPTest.cs index 823de90f97..5c128b9343 100644 --- a/crypto/test/src/ocsp/test/OCSPTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/OCSPTest.cs @@ -835,7 +835,7 @@ public override void PerformTest() doTestIrregularVersionReq(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new OcspTest()); diff --git a/crypto/test/src/ocsp/test/OCSPTestUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/OCSPTestUtil.cs similarity index 100% rename from crypto/test/src/ocsp/test/OCSPTestUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/ocsp/test/OCSPTestUtil.cs diff --git a/crypto/test/src/openpgp/examples/ByteArrayHandler.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/ByteArrayHandler.cs similarity index 100% rename from crypto/test/src/openpgp/examples/ByteArrayHandler.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/ByteArrayHandler.cs diff --git a/crypto/test/src/openpgp/examples/ClearSignedFileProcessor.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/ClearSignedFileProcessor.cs similarity index 100% rename from crypto/test/src/openpgp/examples/ClearSignedFileProcessor.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/ClearSignedFileProcessor.cs diff --git a/crypto/test/src/openpgp/examples/DetachedSignatureProcessor.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/DetachedSignatureProcessor.cs similarity index 100% rename from crypto/test/src/openpgp/examples/DetachedSignatureProcessor.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/DetachedSignatureProcessor.cs diff --git a/crypto/test/src/openpgp/examples/DirectKeySignature.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/DirectKeySignature.cs similarity index 100% rename from crypto/test/src/openpgp/examples/DirectKeySignature.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/DirectKeySignature.cs diff --git a/crypto/test/src/openpgp/examples/DsaElGamalKeyRingGenerator.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/DsaElGamalKeyRingGenerator.cs similarity index 100% rename from crypto/test/src/openpgp/examples/DsaElGamalKeyRingGenerator.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/DsaElGamalKeyRingGenerator.cs diff --git a/crypto/test/src/openpgp/examples/KeyBasedFileProcessor.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/KeyBasedFileProcessor.cs similarity index 100% rename from crypto/test/src/openpgp/examples/KeyBasedFileProcessor.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/KeyBasedFileProcessor.cs diff --git a/crypto/test/src/openpgp/examples/KeyBasedLargeFileProcessor.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/KeyBasedLargeFileProcessor.cs similarity index 100% rename from crypto/test/src/openpgp/examples/KeyBasedLargeFileProcessor.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/KeyBasedLargeFileProcessor.cs diff --git a/crypto/test/src/openpgp/examples/PbeFileProcessor.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/PbeFileProcessor.cs similarity index 100% rename from crypto/test/src/openpgp/examples/PbeFileProcessor.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/PbeFileProcessor.cs diff --git a/crypto/test/src/openpgp/examples/PgpExampleUtilities.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/PgpExampleUtilities.cs similarity index 100% rename from crypto/test/src/openpgp/examples/PgpExampleUtilities.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/PgpExampleUtilities.cs diff --git a/crypto/test/src/openpgp/examples/PublicKeyRingDump.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/PublicKeyRingDump.cs similarity index 100% rename from crypto/test/src/openpgp/examples/PublicKeyRingDump.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/PublicKeyRingDump.cs diff --git a/crypto/test/src/openpgp/examples/RsaKeyRingGenerator.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/RsaKeyRingGenerator.cs similarity index 100% rename from crypto/test/src/openpgp/examples/RsaKeyRingGenerator.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/RsaKeyRingGenerator.cs diff --git a/crypto/test/src/openpgp/examples/SignedFileProcessor.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/SignedFileProcessor.cs similarity index 100% rename from crypto/test/src/openpgp/examples/SignedFileProcessor.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/SignedFileProcessor.cs diff --git a/crypto/test/src/openpgp/examples/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/test/AllTests.cs similarity index 99% rename from crypto/test/src/openpgp/examples/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/test/AllTests.cs index 3403a4fdc7..4f8fce56f2 100644 --- a/crypto/test/src/openpgp/examples/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/examples/test/AllTests.cs @@ -418,7 +418,7 @@ private string GetLine( return bRd.ReadLine(); } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/openpgp/test/DSA2Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/DSA2Test.cs similarity index 100% rename from crypto/test/src/openpgp/test/DSA2Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/DSA2Test.cs diff --git a/crypto/test/src/openpgp/test/PGPArmoredTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPArmoredTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPArmoredTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPArmoredTest.cs index e48827a35a..00521ac4b5 100644 --- a/crypto/test/src/openpgp/test/PGPArmoredTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPArmoredTest.cs @@ -265,7 +265,7 @@ public override string Name get { return "PGPArmoredTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpArmoredTest()); diff --git a/crypto/test/src/openpgp/test/PGPClearSignedSignatureTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPClearSignedSignatureTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPClearSignedSignatureTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPClearSignedSignatureTest.cs index 668f8cce28..850468c5a7 100644 --- a/crypto/test/src/openpgp/test/PGPClearSignedSignatureTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPClearSignedSignatureTest.cs @@ -428,7 +428,7 @@ public override void PerformTest() generateTest(crNlMessage, "\\r\\n"); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpClearSignedSignatureTest()); diff --git a/crypto/test/src/openpgp/test/PGPCompressionTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPCompressionTest.cs similarity index 98% rename from crypto/test/src/openpgp/test/PGPCompressionTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPCompressionTest.cs index fdcf7222ce..73b71ff428 100644 --- a/crypto/test/src/openpgp/test/PGPCompressionTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPCompressionTest.cs @@ -108,7 +108,7 @@ public override string Name get { return "PGPCompressionTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpCompressionTest()); diff --git a/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPDSAElGamalTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPDSAElGamalTest.cs index b86324954a..2edefe019d 100644 --- a/crypto/test/src/openpgp/test/PGPDSAElGamalTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPDSAElGamalTest.cs @@ -475,7 +475,7 @@ public override string Name get { return "PGPDSAElGamalTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpDsaElGamalTest()); diff --git a/crypto/test/src/openpgp/test/PGPDSATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPDSATest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPDSATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPDSATest.cs index 7808ed6cd6..37ddba3b0e 100644 --- a/crypto/test/src/openpgp/test/PGPDSATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPDSATest.cs @@ -580,7 +580,7 @@ public override string Name get { return "PGPDSATest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpDsaTest()); diff --git a/crypto/test/src/openpgp/test/PGPNoPrivateKeyTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPNoPrivateKeyTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPNoPrivateKeyTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPNoPrivateKeyTest.cs index 8f702b67b7..b1ee1decbe 100644 --- a/crypto/test/src/openpgp/test/PGPNoPrivateKeyTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPNoPrivateKeyTest.cs @@ -152,7 +152,7 @@ public override string Name get { return "PGPNoPrivateKeyTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpNoPrivateKeyTest()); diff --git a/crypto/test/src/openpgp/test/PGPPBETest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPPBETest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPPBETest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPPBETest.cs index 29b786a839..2f83fc6590 100644 --- a/crypto/test/src/openpgp/test/PGPPBETest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPPBETest.cs @@ -367,7 +367,7 @@ public override string Name get { return "PGPPBETest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpPbeTest()); diff --git a/crypto/test/src/openpgp/test/PGPPacketTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPPacketTest.cs similarity index 98% rename from crypto/test/src/openpgp/test/PGPPacketTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPPacketTest.cs index b82f8526f3..2e9d5e98d2 100644 --- a/crypto/test/src/openpgp/test/PGPPacketTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPPacketTest.cs @@ -63,7 +63,7 @@ public override string Name get { return "PGPPacketTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpPacketTest()); diff --git a/crypto/test/src/openpgp/test/PGPRSATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPRSATest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPRSATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPRSATest.cs index 82b569bbb8..67ff4f9fb2 100644 --- a/crypto/test/src/openpgp/test/PGPRSATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPRSATest.cs @@ -1216,7 +1216,7 @@ public override string Name get { return "PGPRSATest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpRsaTest()); diff --git a/crypto/test/src/openpgp/test/PGPSignatureTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPSignatureTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PGPSignatureTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPSignatureTest.cs index af490193a6..a15472933e 100644 --- a/crypto/test/src/openpgp/test/PGPSignatureTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PGPSignatureTest.cs @@ -1069,7 +1069,7 @@ public override string Name get { return "PGPSignatureTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpSignatureTest()); diff --git a/crypto/test/src/openpgp/test/PgpECDHTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECDHTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PgpECDHTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECDHTest.cs index b7c500bd0e..01523b5fcb 100644 --- a/crypto/test/src/openpgp/test/PgpECDHTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECDHTest.cs @@ -263,7 +263,7 @@ public override string Name get { return "PgpECDHTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpECDHTest()); diff --git a/crypto/test/src/openpgp/test/PgpECDsaTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECDsaTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PgpECDsaTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECDsaTest.cs index 6259ef6271..905f93cb3c 100644 --- a/crypto/test/src/openpgp/test/PgpECDsaTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECDsaTest.cs @@ -188,7 +188,7 @@ public override string Name get { return "PgpECDsaTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpECDsaTest()); diff --git a/crypto/test/src/openpgp/test/PgpECMessageTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECMessageTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PgpECMessageTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECMessageTest.cs index ac82837214..5f46bb11df 100644 --- a/crypto/test/src/openpgp/test/PgpECMessageTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpECMessageTest.cs @@ -179,7 +179,7 @@ public override string Name get { return "PgpECMessageTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpECMessageTest()); diff --git a/crypto/test/src/openpgp/test/PgpKeyRingTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpKeyRingTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PgpKeyRingTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpKeyRingTest.cs index 5f1d83459c..4c8d8d6eba 100644 --- a/crypto/test/src/openpgp/test/PgpKeyRingTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpKeyRingTest.cs @@ -2620,7 +2620,7 @@ public override string Name get { return "PgpKeyRingTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpKeyRingTest()); diff --git a/crypto/test/src/openpgp/test/PgpMarkerTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpMarkerTest.cs similarity index 99% rename from crypto/test/src/openpgp/test/PgpMarkerTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpMarkerTest.cs index 89be7cd52c..1437c44028 100644 --- a/crypto/test/src/openpgp/test/PgpMarkerTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpMarkerTest.cs @@ -85,7 +85,7 @@ public override string Name get { return "PgpMarkerTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpMarkerTest()); diff --git a/crypto/test/src/openpgp/test/PgpParsingTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpParsingTest.cs similarity index 94% rename from crypto/test/src/openpgp/test/PgpParsingTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpParsingTest.cs index 78fca75708..74886fb438 100644 --- a/crypto/test/src/openpgp/test/PgpParsingTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpParsingTest.cs @@ -23,7 +23,7 @@ public override string Name get { return "PgpParsingTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PgpParsingTest()); diff --git a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpUnicodeTest.cs similarity index 89% rename from crypto/test/src/openpgp/test/PgpUnicodeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpUnicodeTest.cs index 534e8a471e..fec6c74f48 100644 --- a/crypto/test/src/openpgp/test/PgpUnicodeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/PgpUnicodeTest.cs @@ -2,7 +2,6 @@ using System.IO; using System.Text; -using NUnit.Core; using NUnit.Framework; using Org.BouncyCastle.Math; @@ -123,20 +122,20 @@ private PgpSecretKeyRingBundle LoadSecretKeyCollection(string keyName) return new PgpSecretKeyRingBundle(SimpleTest.GetTestDataAsStream("openpgp.unicode." + keyName)); } - public static void Main(string[] args) - { - Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); - } - - [Suite] - public static TestSuite Suite - { - get - { - TestSuite suite = new TestSuite("Unicode Password Tests"); - suite.Add(new PgpUnicodeTest()); - return suite; - } - } + //public static void RunMainTests(string[] args) + //{ + // Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); + //} + + //[Suite] + //public static TestSuite Suite + //{ + // get + // { + // TestSuite suite = new TestSuite("Unicode Password Tests"); + // suite.Add(new PgpUnicodeTest()); + // return suite; + // } + //} } } diff --git a/crypto/test/src/openpgp/test/RegressionTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/RegressionTest.cs similarity index 95% rename from crypto/test/src/openpgp/test/RegressionTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/RegressionTest.cs index 329960bd8e..888e0620b6 100644 --- a/crypto/test/src/openpgp/test/RegressionTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openpgp/test/RegressionTest.cs @@ -26,7 +26,7 @@ public class RegressionTest new PgpParsingTest(), }; - public static void Main( + public static void RunMainTests( string[] args) { foreach (ITest test in tests) diff --git a/crypto/test/src/openssl/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/openssl/test/AllTests.cs similarity index 98% rename from crypto/test/src/openssl/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openssl/test/AllTests.cs index 0cc2dcd85e..a0eecb9822 100644 --- a/crypto/test/src/openssl/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openssl/test/AllTests.cs @@ -36,7 +36,7 @@ public char[] GetPassword() } #if !LIB - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/openssl/test/ReaderTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openssl/test/ReaderTest.cs similarity index 99% rename from crypto/test/src/openssl/test/ReaderTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openssl/test/ReaderTest.cs index c0be5c8488..e97e9300a4 100644 --- a/crypto/test/src/openssl/test/ReaderTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openssl/test/ReaderTest.cs @@ -362,7 +362,7 @@ private static PemReader OpenPemResource( return new PemReader(tr, pGet); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ReaderTest()); diff --git a/crypto/test/src/openssl/test/WriterTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/openssl/test/WriterTest.cs similarity index 99% rename from crypto/test/src/openssl/test/WriterTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/openssl/test/WriterTest.cs index 0d7887771f..c6f5549e98 100644 --- a/crypto/test/src/openssl/test/WriterTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/openssl/test/WriterTest.cs @@ -168,7 +168,7 @@ private void DoWriteReadTest( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new WriterTest()); diff --git a/crypto/test/src/pkcs/examples/PKCS12Example.cs b/test/Crypto.NetSdk.NUnitTest/tests/pkcs/examples/PKCS12Example.cs similarity index 100% rename from crypto/test/src/pkcs/examples/PKCS12Example.cs rename to test/Crypto.NetSdk.NUnitTest/tests/pkcs/examples/PKCS12Example.cs diff --git a/crypto/test/src/pkcs/test/EncryptedPrivateKeyInfoTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/EncryptedPrivateKeyInfoTest.cs similarity index 98% rename from crypto/test/src/pkcs/test/EncryptedPrivateKeyInfoTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/EncryptedPrivateKeyInfoTest.cs index 23639b1124..90c2374fea 100644 --- a/crypto/test/src/pkcs/test/EncryptedPrivateKeyInfoTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/EncryptedPrivateKeyInfoTest.cs @@ -78,7 +78,7 @@ private void doOpensslTestKeys() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new EncryptedPrivateKeyInfoTest()); diff --git a/crypto/test/src/pkcs/test/PKCS10Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/PKCS10Test.cs similarity index 98% rename from crypto/test/src/pkcs/test/PKCS10Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/PKCS10Test.cs index d0227b9de0..f1ee5c12bb 100644 --- a/crypto/test/src/pkcs/test/PKCS10Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/PKCS10Test.cs @@ -71,7 +71,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Pkcs10Test()); diff --git a/crypto/test/src/pkcs/test/PKCS12StoreTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/PKCS12StoreTest.cs similarity index 99% rename from crypto/test/src/pkcs/test/PKCS12StoreTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/PKCS12StoreTest.cs index cd9dfcfadb..532465d2e7 100644 --- a/crypto/test/src/pkcs/test/PKCS12StoreTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/pkcs/test/PKCS12StoreTest.cs @@ -904,7 +904,7 @@ public override void PerformTest() doTestPkcs12Store(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Pkcs12StoreTest()); diff --git a/crypto/test/src/security/test/SecureRandomTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/security/test/SecureRandomTest.cs similarity index 100% rename from crypto/test/src/security/test/SecureRandomTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/security/test/SecureRandomTest.cs diff --git a/crypto/test/src/security/test/TestDigestUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/security/test/TestDigestUtil.cs similarity index 100% rename from crypto/test/src/security/test/TestDigestUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/security/test/TestDigestUtil.cs diff --git a/crypto/test/src/security/test/TestDotNetUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/security/test/TestDotNetUtil.cs similarity index 100% rename from crypto/test/src/security/test/TestDotNetUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/security/test/TestDotNetUtil.cs diff --git a/crypto/test/src/security/test/TestEncodings.cs b/test/Crypto.NetSdk.NUnitTest/tests/security/test/TestEncodings.cs similarity index 100% rename from crypto/test/src/security/test/TestEncodings.cs rename to test/Crypto.NetSdk.NUnitTest/tests/security/test/TestEncodings.cs diff --git a/crypto/test/src/security/test/TestMacUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/security/test/TestMacUtil.cs similarity index 100% rename from crypto/test/src/security/test/TestMacUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/security/test/TestMacUtil.cs diff --git a/crypto/test/src/security/test/TestParameterUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/security/test/TestParameterUtil.cs similarity index 100% rename from crypto/test/src/security/test/TestParameterUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/security/test/TestParameterUtil.cs diff --git a/crypto/test/src/security/test/TestSignerUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/security/test/TestSignerUtil.cs similarity index 100% rename from crypto/test/src/security/test/TestSignerUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/security/test/TestSignerUtil.cs diff --git a/crypto/test/src/test/AESSICTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/AESSICTest.cs similarity index 99% rename from crypto/test/src/test/AESSICTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/AESSICTest.cs index f8de35efd1..05c76af1d2 100644 --- a/crypto/test/src/test/AESSICTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/AESSICTest.cs @@ -130,7 +130,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AesSicTest()); diff --git a/crypto/test/src/test/AESTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/AESTest.cs similarity index 99% rename from crypto/test/src/test/AESTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/AESTest.cs index 5a1ce80463..02d91dbd35 100644 --- a/crypto/test/src/test/AESTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/AESTest.cs @@ -354,7 +354,7 @@ public override void PerformTest() TestGcm(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AesTest()); diff --git a/crypto/test/src/test/AttrCertSelectorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/AttrCertSelectorTest.cs similarity index 99% rename from crypto/test/src/test/AttrCertSelectorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/AttrCertSelectorTest.cs index 37c1e66d21..d08336b725 100644 --- a/crypto/test/src/test/AttrCertSelectorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/AttrCertSelectorTest.cs @@ -205,7 +205,7 @@ public override void PerformTest() TestSelector(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AttrCertSelectorTest()); diff --git a/crypto/test/src/test/AttrCertTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/AttrCertTest.cs similarity index 99% rename from crypto/test/src/test/AttrCertTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/AttrCertTest.cs index d701d007ec..11c434c921 100644 --- a/crypto/test/src/test/AttrCertTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/AttrCertTest.cs @@ -604,7 +604,7 @@ public override void PerformTest() doTestGenerateWithPrincipal(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new AttrCertTest()); diff --git a/crypto/test/src/test/BaseBlockCipherTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/BaseBlockCipherTest.cs similarity index 100% rename from crypto/test/src/test/BaseBlockCipherTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/BaseBlockCipherTest.cs diff --git a/crypto/test/src/test/BlockCipherTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/BlockCipherTest.cs similarity index 99% rename from crypto/test/src/test/BlockCipherTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/BlockCipherTest.cs index 18753eb1a2..21b98b5f39 100644 --- a/crypto/test/src/test/BlockCipherTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/BlockCipherTest.cs @@ -1075,7 +1075,7 @@ public override void PerformTest() doTestExceptions(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new BlockCipherTest()); diff --git a/crypto/test/src/test/CMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CMacTest.cs similarity index 99% rename from crypto/test/src/test/CMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CMacTest.cs index f80caca7d6..8be4a9ef76 100644 --- a/crypto/test/src/test/CMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CMacTest.cs @@ -260,7 +260,7 @@ public override string Name get { return "CMac"; } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new CMacTest()); } diff --git a/crypto/test/src/test/CRL5Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CRL5Test.cs similarity index 99% rename from crypto/test/src/test/CRL5Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CRL5Test.cs index ebd74af69a..1bbefc9ad7 100644 --- a/crypto/test/src/test/CRL5Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CRL5Test.cs @@ -248,7 +248,7 @@ public override void PerformTest() TestDirectCrl(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Crl5Test()); diff --git a/crypto/test/src/test/CamelliaTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CamelliaTest.cs similarity index 99% rename from crypto/test/src/test/CamelliaTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CamelliaTest.cs index f8e3520a3e..e259fc8eac 100644 --- a/crypto/test/src/test/CamelliaTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CamelliaTest.cs @@ -195,7 +195,7 @@ public override void PerformTest() TestWrapOids(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CamelliaTest()); diff --git a/crypto/test/src/test/CertPathBuilderTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CertPathBuilderTest.cs similarity index 99% rename from crypto/test/src/test/CertPathBuilderTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CertPathBuilderTest.cs index e31bde8666..b68b922dfb 100644 --- a/crypto/test/src/test/CertPathBuilderTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CertPathBuilderTest.cs @@ -146,7 +146,7 @@ public override string Name get { return "CertPathBuilder"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CertPathBuilderTest()); diff --git a/crypto/test/src/test/CertPathTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CertPathTest.cs similarity index 99% rename from crypto/test/src/test/CertPathTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CertPathTest.cs index f1a7c94f64..011a166030 100644 --- a/crypto/test/src/test/CertPathTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CertPathTest.cs @@ -244,7 +244,7 @@ public override string Name get { return "CertPath"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CertPathTest()); diff --git a/crypto/test/src/test/CertPathValidatorTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CertPathValidatorTest.cs similarity index 99% rename from crypto/test/src/test/CertPathValidatorTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CertPathValidatorTest.cs index 3f9ff57fa2..2282abf698 100644 --- a/crypto/test/src/test/CertPathValidatorTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CertPathValidatorTest.cs @@ -281,7 +281,7 @@ public override string Name get { return "CertPathValidator"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CertPathValidatorTest()); diff --git a/crypto/test/src/test/CertTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CertTest.cs similarity index 99% rename from crypto/test/src/test/CertTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CertTest.cs index 46276a75bd..3016e3b924 100644 --- a/crypto/test/src/test/CertTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CertTest.cs @@ -2598,7 +2598,7 @@ public override void PerformTest() checkCertificate(18, emptyDNCert); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CertTest()); diff --git a/crypto/test/src/test/CipherStreamTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/CipherStreamTest.cs similarity index 99% rename from crypto/test/src/test/CipherStreamTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/CipherStreamTest.cs index 0809dfe80d..c4e5df283d 100644 --- a/crypto/test/src/test/CipherStreamTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/CipherStreamTest.cs @@ -440,7 +440,7 @@ public override string Name get { return "CipherStreamTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new CipherStreamTest()); diff --git a/crypto/test/src/test/DESedeTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/DESedeTest.cs similarity index 99% rename from crypto/test/src/test/DESedeTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/DESedeTest.cs index d84b994f0a..961c17eebd 100644 --- a/crypto/test/src/test/DESedeTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/DESedeTest.cs @@ -281,7 +281,7 @@ public override void PerformTest() wrapTest("TDEA", 1, kek1, iv1, in1, out1); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DesEdeTest()); diff --git a/crypto/test/src/test/DHTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/DHTest.cs similarity index 99% rename from crypto/test/src/test/DHTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/DHTest.cs index 3ed79ca84e..ba395c499c 100644 --- a/crypto/test/src/test/DHTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/DHTest.cs @@ -716,7 +716,7 @@ public override void PerformTest() TestSubgroupConfinement(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DHTest()); diff --git a/crypto/test/src/test/DSATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/DSATest.cs similarity index 99% rename from crypto/test/src/test/DSATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/DSATest.cs index 9ed1109e2c..9c5df856e9 100644 --- a/crypto/test/src/test/DSATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/DSATest.cs @@ -819,7 +819,7 @@ public override string Name get { return "DSA/ECDSA"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DsaTest()); diff --git a/crypto/test/src/test/DigestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/DigestTest.cs similarity index 99% rename from crypto/test/src/test/DigestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/DigestTest.cs index 9f68a8361a..fad6aa833a 100644 --- a/crypto/test/src/test/DigestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/DigestTest.cs @@ -197,7 +197,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new DigestTest()); diff --git a/crypto/test/src/test/ECDSA5Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/ECDSA5Test.cs similarity index 99% rename from crypto/test/src/test/ECDSA5Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/ECDSA5Test.cs index 3bf746edb6..b886ec07c4 100644 --- a/crypto/test/src/test/ECDSA5Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/ECDSA5Test.cs @@ -291,7 +291,7 @@ public override void PerformTest() TestGeneration(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ECDsa5Test()); diff --git a/crypto/test/src/test/ECEncodingTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/ECEncodingTest.cs similarity index 99% rename from crypto/test/src/test/ECEncodingTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/ECEncodingTest.cs index 8d993c15e5..b2decc78e1 100644 --- a/crypto/test/src/test/ECEncodingTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/ECEncodingTest.cs @@ -225,7 +225,7 @@ private ECPublicKeyParameters SetPublicUncompressed( key.Parameters); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ECEncodingTest()); diff --git a/crypto/test/src/test/ECNRTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/ECNRTest.cs similarity index 99% rename from crypto/test/src/test/ECNRTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/ECNRTest.cs index 8a24443c27..065ab69228 100644 --- a/crypto/test/src/test/ECNRTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/ECNRTest.cs @@ -195,7 +195,7 @@ public override void PerformTest() TestECNR521bitPrime(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ECNRTest()); diff --git a/crypto/test/src/test/ElGamalTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/ElGamalTest.cs similarity index 99% rename from crypto/test/src/test/ElGamalTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/ElGamalTest.cs index 9a87ea9b1e..0bfb9ad91b 100644 --- a/crypto/test/src/test/ElGamalTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/ElGamalTest.cs @@ -325,7 +325,7 @@ public override void PerformTest() TestRandom256(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new ElGamalTest()); diff --git a/crypto/test/src/test/EncryptedPrivateKeyInfoTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/EncryptedPrivateKeyInfoTest.cs similarity index 99% rename from crypto/test/src/test/EncryptedPrivateKeyInfoTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/EncryptedPrivateKeyInfoTest.cs index baac5ff7f4..ffb0794fcb 100644 --- a/crypto/test/src/test/EncryptedPrivateKeyInfoTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/EncryptedPrivateKeyInfoTest.cs @@ -137,7 +137,7 @@ public override string Name get { return "EncryptedPrivateKeyInfoTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new EncryptedPrivateKeyInfoTest()); diff --git a/crypto/test/src/test/FIPSDESTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/FIPSDESTest.cs similarity index 99% rename from crypto/test/src/test/FIPSDESTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/FIPSDESTest.cs index 1f40e15913..a12205e0e9 100644 --- a/crypto/test/src/test/FIPSDESTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/FIPSDESTest.cs @@ -185,7 +185,7 @@ public ITestResult Perform() return new SimpleTestResult(true, Name + ": Okay"); } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new FipsDesTest(); diff --git a/crypto/test/src/test/GOST28147Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/GOST28147Test.cs similarity index 99% rename from crypto/test/src/test/GOST28147Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/GOST28147Test.cs index 0adfad3345..2d7c96e395 100644 --- a/crypto/test/src/test/GOST28147Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/GOST28147Test.cs @@ -228,7 +228,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Gost28147Test()); diff --git a/crypto/test/src/test/GOST3410Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/GOST3410Test.cs similarity index 99% rename from crypto/test/src/test/GOST3410Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/GOST3410Test.cs index 03dcf31440..05729627b3 100644 --- a/crypto/test/src/test/GOST3410Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/GOST3410Test.cs @@ -367,7 +367,7 @@ public override void PerformTest() parametersTest(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Gost3410Test()); diff --git a/crypto/test/src/test/HMacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/HMacTest.cs similarity index 99% rename from crypto/test/src/test/HMacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/HMacTest.cs index 4a018ac50b..7691d5683d 100644 --- a/crypto/test/src/test/HMacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/HMacTest.cs @@ -244,7 +244,7 @@ public override string Name get { return "HMac"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new HMacTest()); diff --git a/crypto/test/src/test/IESTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/IESTest.cs similarity index 99% rename from crypto/test/src/test/IESTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/IESTest.cs index 99aacc66d4..aaf8e554bf 100644 --- a/crypto/test/src/test/IESTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/IESTest.cs @@ -221,7 +221,7 @@ public void doDefTest( // } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new IesTest()); diff --git a/crypto/test/src/test/MacTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/MacTest.cs similarity index 99% rename from crypto/test/src/test/MacTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/MacTest.cs index d4b3188bd1..f0e55a7fb3 100644 --- a/crypto/test/src/test/MacTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/MacTest.cs @@ -199,7 +199,7 @@ public override string Name get { return "Mac"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MacTest()); diff --git a/crypto/test/src/test/MqvTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/MqvTest.cs similarity index 98% rename from crypto/test/src/test/MqvTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/MqvTest.cs index b26d5619b0..db3481b47e 100644 --- a/crypto/test/src/test/MqvTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/MqvTest.cs @@ -77,7 +77,7 @@ public void TestECMqv() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new MqvTest()); diff --git a/crypto/test/src/test/NamedCurveTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/NamedCurveTest.cs similarity index 99% rename from crypto/test/src/test/NamedCurveTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/NamedCurveTest.cs index f7c831f17b..17ba70321a 100644 --- a/crypto/test/src/test/NamedCurveTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/NamedCurveTest.cs @@ -394,7 +394,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NamedCurveTest()); diff --git a/crypto/test/src/test/NistCertPathTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/NistCertPathTest.cs similarity index 99% rename from crypto/test/src/test/NistCertPathTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/NistCertPathTest.cs index 0f42e24d08..368a1ab167 100644 --- a/crypto/test/src/test/NistCertPathTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/NistCertPathTest.cs @@ -5175,7 +5175,7 @@ private void Test(string _name, string[] _data, ISet _ipolset, End_Certificate_RL_09_01_crt }; - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NistCertPathTest()); diff --git a/crypto/test/src/test/NoekeonTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/NoekeonTest.cs similarity index 98% rename from crypto/test/src/test/NoekeonTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/NoekeonTest.cs index c3745da1c8..077c9b342d 100644 --- a/crypto/test/src/test/NoekeonTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/NoekeonTest.cs @@ -140,7 +140,7 @@ public override void PerformTest() } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new NoekeonTest()); diff --git a/crypto/test/src/test/PBETest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/PBETest.cs similarity index 99% rename from crypto/test/src/test/PBETest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/PBETest.cs index ee61a027ca..0b3f154c5e 100644 --- a/crypto/test/src/test/PBETest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/PBETest.cs @@ -510,7 +510,7 @@ public override string Name get { return "PbeTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PbeTest()); diff --git a/crypto/test/src/test/PEMData.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/PEMData.cs similarity index 100% rename from crypto/test/src/test/PEMData.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/PEMData.cs diff --git a/crypto/test/src/test/PKCS10CertRequestTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/PKCS10CertRequestTest.cs similarity index 99% rename from crypto/test/src/test/PKCS10CertRequestTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/PKCS10CertRequestTest.cs index ea27d5111e..4dc4892205 100644 --- a/crypto/test/src/test/PKCS10CertRequestTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/PKCS10CertRequestTest.cs @@ -440,7 +440,7 @@ public override void PerformTest() nullPointerTest(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new Pkcs10CertRequestTest()); diff --git a/crypto/test/src/test/PSSTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/PSSTest.cs similarity index 99% rename from crypto/test/src/test/PSSTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/PSSTest.cs index 677289e7c8..f6a9624996 100644 --- a/crypto/test/src/test/PSSTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/PSSTest.cs @@ -236,7 +236,7 @@ public override string Name get { return "PSS"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PssTest()); diff --git a/crypto/test/src/test/PkixNameConstraintsTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/PkixNameConstraintsTest.cs similarity index 99% rename from crypto/test/src/test/PkixNameConstraintsTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/PkixNameConstraintsTest.cs index a20fc33c4e..8d50811968 100644 --- a/crypto/test/src/test/PkixNameConstraintsTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/PkixNameConstraintsTest.cs @@ -416,7 +416,7 @@ private void TestConstraints( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PkixNameConstraintsTest()); diff --git a/crypto/test/src/test/PkixPolicyMappingTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/PkixPolicyMappingTest.cs similarity index 99% rename from crypto/test/src/test/PkixPolicyMappingTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/PkixPolicyMappingTest.cs index 47e2c3120d..2ff303ddbd 100644 --- a/crypto/test/src/test/PkixPolicyMappingTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/PkixPolicyMappingTest.cs @@ -402,7 +402,7 @@ private void CheckMessage( } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PkixPolicyMappingTest()); diff --git a/crypto/test/src/test/PkixTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/PkixTest.cs similarity index 99% rename from crypto/test/src/test/PkixTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/PkixTest.cs index 8823196108..d0be910634 100644 --- a/crypto/test/src/test/PkixTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/PkixTest.cs @@ -231,7 +231,7 @@ public override String Name get { return "PkixTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new PkixTest()); diff --git a/crypto/test/src/test/RSATest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/RSATest.cs similarity index 99% rename from crypto/test/src/test/RSATest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/RSATest.cs index a765ff1388..1eaea63f98 100644 --- a/crypto/test/src/test/RSATest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/RSATest.cs @@ -665,7 +665,7 @@ public override string Name get { return "RSATest"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new RsaTest(); diff --git a/crypto/test/src/test/RegressionTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/RegressionTest.cs similarity index 98% rename from crypto/test/src/test/RegressionTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/RegressionTest.cs index 7f4f38f00b..660ba067c0 100644 --- a/crypto/test/src/test/RegressionTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/RegressionTest.cs @@ -67,7 +67,7 @@ public class RegressionTest new SM4Test() }; - public static void Main( + public static void RunMainTests( string[] args) { for (int i = 0; i != tests.Length; i++) diff --git a/crypto/test/src/test/SEEDTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/SEEDTest.cs similarity index 99% rename from crypto/test/src/test/SEEDTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/SEEDTest.cs index 2b380d5b79..165bb0e995 100644 --- a/crypto/test/src/test/SEEDTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/SEEDTest.cs @@ -181,7 +181,7 @@ public override void PerformTest() TestWrapOids(); } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SeedTest()); diff --git a/crypto/test/src/test/SM4Test.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/SM4Test.cs similarity index 98% rename from crypto/test/src/test/SM4Test.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/SM4Test.cs index 5d36b34311..d17cb8c938 100644 --- a/crypto/test/src/test/SM4Test.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/SM4Test.cs @@ -141,7 +141,7 @@ public override void PerformTest() } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new SM4Test()); } diff --git a/crypto/test/src/test/SigTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/SigTest.cs similarity index 99% rename from crypto/test/src/test/SigTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/SigTest.cs index 803a24493e..364b72fd1e 100644 --- a/crypto/test/src/test/SigTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/SigTest.cs @@ -361,7 +361,7 @@ public override string Name get { return "SigTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new SigTest()); diff --git a/crypto/test/src/test/TestUtilities.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/TestUtilities.cs similarity index 100% rename from crypto/test/src/test/TestUtilities.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/TestUtilities.cs diff --git a/crypto/test/src/test/WrapTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/WrapTest.cs similarity index 98% rename from crypto/test/src/test/WrapTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/WrapTest.cs index bb49446e76..dc9946cca7 100644 --- a/crypto/test/src/test/WrapTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/WrapTest.cs @@ -74,7 +74,7 @@ public string Name get { return "WrapTest"; } } - public static void Main( + public static void RunMainTests( string[] args) { ITest test = new WrapTest(); diff --git a/crypto/test/src/test/X509CertificatePairTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/X509CertificatePairTest.cs similarity index 98% rename from crypto/test/src/test/X509CertificatePairTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/X509CertificatePairTest.cs index a83de4cf06..336fbfffe7 100644 --- a/crypto/test/src/test/X509CertificatePairTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/X509CertificatePairTest.cs @@ -132,7 +132,7 @@ public override string Name get { return "X509CertificatePair"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new X509CertificatePairTest()); diff --git a/crypto/test/src/test/X509StoreTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/X509StoreTest.cs similarity index 99% rename from crypto/test/src/test/X509StoreTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/X509StoreTest.cs index 37673b8b4b..e6f266cfeb 100644 --- a/crypto/test/src/test/X509StoreTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/X509StoreTest.cs @@ -318,7 +318,7 @@ public override string Name get { return "IX509Store"; } } - public static void Main( + public static void RunMainTests( string[] args) { RunTest(new X509StoreTest()); diff --git a/crypto/test/src/test/nist/NistCertPathTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/nist/NistCertPathTest.cs similarity index 100% rename from crypto/test/src/test/nist/NistCertPathTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/nist/NistCertPathTest.cs diff --git a/crypto/test/src/test/rsa3/RSA3CertTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/test/rsa3/RSA3CertTest.cs similarity index 97% rename from crypto/test/src/test/rsa3/RSA3CertTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/test/rsa3/RSA3CertTest.cs index 913f4f0155..648984cd2b 100644 --- a/crypto/test/src/test/rsa3/RSA3CertTest.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/test/rsa3/RSA3CertTest.cs @@ -108,7 +108,7 @@ private X509Certificate loadCert( return (X509Certificate) rd.ReadObject(); } -// public static void main (string[] args) +// public void Main (string[] args) // throws Exception // { // junit.textui.TestRunner.run(suite()); diff --git a/crypto/test/src/tsp/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/tsp/test/AllTests.cs similarity index 92% rename from crypto/test/src/tsp/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/tsp/test/AllTests.cs index 58d096d543..a086ce78a7 100644 --- a/crypto/test/src/tsp/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/tsp/test/AllTests.cs @@ -10,7 +10,7 @@ namespace Org.BouncyCastle.Tsp.Tests { public class AllTests { - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/tsp/test/GenTimeAccuracyTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/tsp/test/GenTimeAccuracyTest.cs similarity index 100% rename from crypto/test/src/tsp/test/GenTimeAccuracyTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/tsp/test/GenTimeAccuracyTest.cs diff --git a/crypto/test/src/tsp/test/ParseTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/tsp/test/ParseTest.cs similarity index 100% rename from crypto/test/src/tsp/test/ParseTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/tsp/test/ParseTest.cs diff --git a/crypto/test/src/tsp/test/TSPTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/tsp/test/TSPTest.cs similarity index 100% rename from crypto/test/src/tsp/test/TSPTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/tsp/test/TSPTest.cs diff --git a/crypto/test/src/tsp/test/TSPTestUtil.cs b/test/Crypto.NetSdk.NUnitTest/tests/tsp/test/TSPTestUtil.cs similarity index 100% rename from crypto/test/src/tsp/test/TSPTestUtil.cs rename to test/Crypto.NetSdk.NUnitTest/tests/tsp/test/TSPTestUtil.cs diff --git a/crypto/test/src/tsp/test/TimeStampTokenInfoTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/tsp/test/TimeStampTokenInfoTest.cs similarity index 100% rename from crypto/test/src/tsp/test/TimeStampTokenInfoTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/tsp/test/TimeStampTokenInfoTest.cs diff --git a/crypto/test/src/util/io/pem/test/AllTests.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/io/pem/test/AllTests.cs similarity index 97% rename from crypto/test/src/util/io/pem/test/AllTests.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/io/pem/test/AllTests.cs index 921c40cb84..6f8dddbf1d 100644 --- a/crypto/test/src/util/io/pem/test/AllTests.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/util/io/pem/test/AllTests.cs @@ -22,7 +22,7 @@ namespace Org.BouncyCastle.Utilities.IO.Pem.Tests public class AllTests { #if !LIB - public static void Main(string[] args) + public static void RunMainTests(string[] args) { Suite.Run(new NullListener(), NUnit.Core.TestFilter.Empty); } diff --git a/crypto/test/src/util/net/test/IPAddressTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/net/test/IPAddressTest.cs similarity index 100% rename from crypto/test/src/util/net/test/IPAddressTest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/net/test/IPAddressTest.cs diff --git a/crypto/test/src/util/test/FixedSecureRandom.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/FixedSecureRandom.cs similarity index 100% rename from crypto/test/src/util/test/FixedSecureRandom.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/FixedSecureRandom.cs diff --git a/crypto/test/src/util/test/ITest.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/ITest.cs similarity index 100% rename from crypto/test/src/util/test/ITest.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/ITest.cs diff --git a/crypto/test/src/util/test/ITestResult.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/ITestResult.cs similarity index 100% rename from crypto/test/src/util/test/ITestResult.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/ITestResult.cs diff --git a/crypto/test/src/util/test/NumberParsing.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/NumberParsing.cs similarity index 100% rename from crypto/test/src/util/test/NumberParsing.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/NumberParsing.cs diff --git a/test/Crypto.NetSdk.NUnitTest/tests/util/test/SimpleTest.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/SimpleTest.cs new file mode 100644 index 0000000000..4915eea760 --- /dev/null +++ b/test/Crypto.NetSdk.NUnitTest/tests/util/test/SimpleTest.cs @@ -0,0 +1,221 @@ +using System; +using System.Collections; +using System.IO; +using System.Reflection; +using System.Text; + +using Org.BouncyCastle.Utilities; + +namespace Org.BouncyCastle.Utilities.Test +{ + public abstract class SimpleTest + : ITest + { + public abstract string Name + { + get; + } + + private ITestResult Success() + { + return SimpleTestResult.Successful(this, "Okay"); + } + + internal void Fail( + string message) + { + throw new TestFailedException(SimpleTestResult.Failed(this, message)); + } + + internal void Fail( + string message, + Exception throwable) + { + throw new TestFailedException(SimpleTestResult.Failed(this, message, throwable)); + } + + internal void Fail( + string message, + object expected, + object found) + { + throw new TestFailedException(SimpleTestResult.Failed(this, message, expected, found)); + } + + internal void IsTrue(bool value) + { + if (!value) + throw new TestFailedException(SimpleTestResult.Failed(this, "no message")); + } + + internal void IsTrue(string message, bool value) + { + if (!value) + throw new TestFailedException(SimpleTestResult.Failed(this, message)); + } + + internal void IsEquals(object a, object b) + { + if (!a.Equals(b)) + throw new TestFailedException(SimpleTestResult.Failed(this, "no message")); + } + + internal void IsEquals(int a, int b) + { + if (a != b) + throw new TestFailedException(SimpleTestResult.Failed(this, "no message")); + } + + internal void IsEquals(string message, bool a, bool b) + { + if (a != b) + throw new TestFailedException(SimpleTestResult.Failed(this, message)); + } + + internal void IsEquals(string message, long a, long b) + { + if (a != b) + throw new TestFailedException(SimpleTestResult.Failed(this, message)); + } + + internal void IsEquals(string message, object a, object b) + { + if (a == null && b == null) + return; + + if (a == null) + throw new TestFailedException(SimpleTestResult.Failed(this, message)); + if (b == null) + throw new TestFailedException(SimpleTestResult.Failed(this, message)); + if (!a.Equals(b)) + throw new TestFailedException(SimpleTestResult.Failed(this, message)); + } + + internal bool AreEqual( + byte[] a, + byte[] b) + { + return Arrays.AreEqual(a, b); + } + + public virtual ITestResult Perform() + { + try + { + PerformTest(); + + return Success(); + } + catch (TestFailedException e) + { + return e.GetResult(); + } + catch (Exception e) + { + return SimpleTestResult.Failed(this, "Exception: " + e, e); + } + } + + internal static void RunTest( + ITest test) + { + RunTest(test, Console.Out); + } + + internal static void RunTest( + ITest test, + TextWriter outStream) + { + ITestResult result = test.Perform(); + + outStream.WriteLine(result.ToString()); + if (result.GetException() != null) + { + outStream.WriteLine(result.GetException().StackTrace); + } + } + + internal static Stream GetTestDataAsStream( + string name) + { + string fullName = GetFullName(name); + + return Assembly.GetExecutingAssembly().GetManifestResourceStream(fullName)?? throw new FileNotFoundException("Resource: "+name); + } + + internal static string[] GetTestDataEntries( + string prefix) + { + string fullPrefix = GetFullName(prefix); + + ArrayList result = new ArrayList(); + string[] fullNames = Assembly.GetExecutingAssembly().GetManifestResourceNames(); + foreach (string fullName in fullNames) + { + if (fullName.StartsWith(fullPrefix)) + { + string name = GetShortName(fullName); + result.Add(name); + } + } + return (string[])result.ToArray(typeof(String)); + } + + private static string GetFullName( + string name) + { + return "Crypto.NetSdk.NUnitTest." + name; + } + + private static string GetShortName( + string fullName) + { + return fullName.Substring("Crypto.NetSdk.NUnitTest.".Length); + } + +#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(); + + public abstract void PerformTest(); + + public static DateTime MakeUtcDateTime(int year, int month, int day, int hour, int minute, int second) + { +#if PORTABLE + return new DateTime(year, month, day, hour, minute, second, DateTimeKind.Utc); +#else + return new DateTime(year, month, day, hour, minute, second); +#endif + } + + public static DateTime MakeUtcDateTime(int year, int month, int day, int hour, int minute, int second, int millisecond) + { +#if PORTABLE + return new DateTime(year, month, day, hour, minute, second, millisecond, DateTimeKind.Utc); +#else + return new DateTime(year, month, day, hour, minute, second, millisecond); +#endif + } + } +} diff --git a/crypto/test/src/util/test/SimpleTestResult.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/SimpleTestResult.cs similarity index 100% rename from crypto/test/src/util/test/SimpleTestResult.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/SimpleTestResult.cs diff --git a/crypto/test/src/util/test/TestFailedException.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/TestFailedException.cs similarity index 100% rename from crypto/test/src/util/test/TestFailedException.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/TestFailedException.cs diff --git a/crypto/test/src/util/test/TestRandomBigInteger.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/TestRandomBigInteger.cs similarity index 100% rename from crypto/test/src/util/test/TestRandomBigInteger.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/TestRandomBigInteger.cs diff --git a/crypto/test/src/util/test/UncloseableStream.cs b/test/Crypto.NetSdk.NUnitTest/tests/util/test/UncloseableStream.cs similarity index 100% rename from crypto/test/src/util/test/UncloseableStream.cs rename to test/Crypto.NetSdk.NUnitTest/tests/util/test/UncloseableStream.cs diff --git a/crypto/test/src/x509/test/TestCertificateGen.cs b/test/Crypto.NetSdk.NUnitTest/tests/x509/test/TestCertificateGen.cs similarity index 99% rename from crypto/test/src/x509/test/TestCertificateGen.cs rename to test/Crypto.NetSdk.NUnitTest/tests/x509/test/TestCertificateGen.cs index 24dbdf08f2..2c16014470 100644 --- a/crypto/test/src/x509/test/TestCertificateGen.cs +++ b/test/Crypto.NetSdk.NUnitTest/tests/x509/test/TestCertificateGen.cs @@ -721,7 +721,7 @@ public void TestCertLoading() } } - public static void Main(string[] args) + public static void RunMainTests(string[] args) { RunTest(new TestCertificateGen()); } diff --git a/version.props b/version.props new file mode 100644 index 0000000000..701a83b57f --- /dev/null +++ b/version.props @@ -0,0 +1,8 @@ + + + + 1.9.0.1 + 1.9.0 + + +