Skip to content

Commit 7519bac

Browse files
peterdettmanpeterdettman
committed
Fix project files plus portability fixes
1 parent 017ebcc commit 7519bac

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

46 files changed

+2691
-2571
lines changed

‎crypto/BouncyCastle.Android.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -671,6 +671,7 @@
671671
<Compile Include="src\crypto\CipherKeyGenerator.cs" />
672672
<Compile Include="src\crypto\CryptoException.cs" />
673673
<Compile Include="src\crypto\DataLengthException.cs" />
674+
<Compile Include="src\crypto\IAlphabetMapper.cs" />
674675
<Compile Include="src\crypto\IAsymmetricBlockCipher.cs" />
675676
<Compile Include="src\crypto\IAsymmetricCipherKeyPairGenerator.cs" />
676677
<Compile Include="src\crypto\IBasicAgreement.cs" />
@@ -759,6 +760,7 @@
759760
<Compile Include="src\crypto\digests\MD5Digest.cs" />
760761
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
761762
<Compile Include="src\crypto\digests\NullDigest.cs" />
763+
<Compile Include="src\crypto\digests\ParallelHash.cs" />
762764
<Compile Include="src\crypto\digests\RipeMD128Digest.cs" />
763765
<Compile Include="src\crypto\digests\RipeMD160Digest.cs" />
764766
<Compile Include="src\crypto\digests\RipeMD256Digest.cs" />
@@ -776,6 +778,7 @@
776778
<Compile Include="src\crypto\digests\SkeinDigest.cs" />
777779
<Compile Include="src\crypto\digests\SkeinEngine.cs" />
778780
<Compile Include="src\crypto\digests\TigerDigest.cs" />
781+
<Compile Include="src\crypto\digests\TupleHash.cs" />
779782
<Compile Include="src\crypto\digests\WhirlpoolDigest.cs" />
780783
<Compile Include="src\crypto\digests\XofUtils.cs" />
781784
<Compile Include="src\crypto\ec\CustomNamedCurves.cs" />
@@ -839,6 +842,10 @@
839842
<Compile Include="src\crypto\engines\VMPCKSA3Engine.cs" />
840843
<Compile Include="src\crypto\engines\XSalsa20Engine.cs" />
841844
<Compile Include="src\crypto\engines\XTEAEngine.cs" />
845+
<Compile Include="src\crypto\fpe\FpeEngine.cs" />
846+
<Compile Include="src\crypto\fpe\FpeFf1Engine.cs" />
847+
<Compile Include="src\crypto\fpe\FpeFf3_1Engine.cs" />
848+
<Compile Include="src\crypto\fpe\SP80038G.cs" />
842849
<Compile Include="src\crypto\generators\BaseKdfBytesGenerator.cs" />
843850
<Compile Include="src\crypto\generators\BCrypt.cs" />
844851
<Compile Include="src\crypto\generators\DHBasicKeyPairGenerator.cs" />
@@ -904,6 +911,7 @@
904911
<Compile Include="src\crypto\modes\CtsBlockCipher.cs" />
905912
<Compile Include="src\crypto\modes\EAXBlockCipher.cs" />
906913
<Compile Include="src\crypto\modes\GCMBlockCipher.cs" />
914+
<Compile Include="src\crypto\modes\GcmSivBlockCipher.cs" />
907915
<Compile Include="src\crypto\modes\GOFBBlockCipher.cs" />
908916
<Compile Include="src\crypto\modes\IAeadBlockCipher.cs" />
909917
<Compile Include="src\crypto\modes\IAeadCipher.cs" />
@@ -976,6 +984,7 @@
976984
<Compile Include="src\crypto\parameters\ElGamalParameters.cs" />
977985
<Compile Include="src\crypto\parameters\ElGamalPrivateKeyParameters.cs" />
978986
<Compile Include="src\crypto\parameters\ElGamalPublicKeyParameters.cs" />
987+
<Compile Include="src\crypto\parameters\FpeParameters.cs" />
979988
<Compile Include="src\crypto\parameters\GOST3410KeyGenerationParameters.cs" />
980989
<Compile Include="src\crypto\parameters\GOST3410KeyParameters.cs" />
981990
<Compile Include="src\crypto\parameters\GOST3410Parameters.cs" />
@@ -1229,6 +1238,7 @@
12291238
<Compile Include="src\crypto\tls\UseSrtpData.cs" />
12301239
<Compile Include="src\crypto\tls\UserMappingType.cs" />
12311240
<Compile Include="src\crypto\util\AlgorithmIdentifierFactory.cs" />
1241+
<Compile Include="src\crypto\util\BasicAlphabetMapper.cs" />
12321242
<Compile Include="src\crypto\util\CipherFactory.cs" />
12331243
<Compile Include="src\crypto\util\CipherKeyGeneratorFactory.cs" />
12341244
<Compile Include="src\crypto\util\Pack.cs" />
@@ -1563,6 +1573,7 @@
15631573
<Compile Include="src\tsp\TimeStampTokenInfo.cs" />
15641574
<Compile Include="src\util\Arrays.cs" />
15651575
<Compile Include="src\util\BigIntegers.cs" />
1576+
<Compile Include="src\util\Bytes.cs" />
15661577
<Compile Include="src\util\Enums.cs" />
15671578
<Compile Include="src\util\IMemoable.cs" />
15681579
<Compile Include="src\util\Integers.cs" />

‎crypto/BouncyCastle.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -665,6 +665,7 @@
665665
<Compile Include="src\crypto\CipherKeyGenerator.cs" />
666666
<Compile Include="src\crypto\CryptoException.cs" />
667667
<Compile Include="src\crypto\DataLengthException.cs" />
668+
<Compile Include="src\crypto\IAlphabetMapper.cs" />
668669
<Compile Include="src\crypto\IAsymmetricBlockCipher.cs" />
669670
<Compile Include="src\crypto\IAsymmetricCipherKeyPairGenerator.cs" />
670671
<Compile Include="src\crypto\IBasicAgreement.cs" />
@@ -753,6 +754,7 @@
753754
<Compile Include="src\crypto\digests\MD5Digest.cs" />
754755
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
755756
<Compile Include="src\crypto\digests\NullDigest.cs" />
757+
<Compile Include="src\crypto\digests\ParallelHash.cs" />
756758
<Compile Include="src\crypto\digests\RipeMD128Digest.cs" />
757759
<Compile Include="src\crypto\digests\RipeMD160Digest.cs" />
758760
<Compile Include="src\crypto\digests\RipeMD256Digest.cs" />
@@ -770,6 +772,7 @@
770772
<Compile Include="src\crypto\digests\SkeinDigest.cs" />
771773
<Compile Include="src\crypto\digests\SkeinEngine.cs" />
772774
<Compile Include="src\crypto\digests\TigerDigest.cs" />
775+
<Compile Include="src\crypto\digests\TupleHash.cs" />
773776
<Compile Include="src\crypto\digests\WhirlpoolDigest.cs" />
774777
<Compile Include="src\crypto\digests\XofUtils.cs" />
775778
<Compile Include="src\crypto\ec\CustomNamedCurves.cs" />
@@ -833,6 +836,10 @@
833836
<Compile Include="src\crypto\engines\VMPCKSA3Engine.cs" />
834837
<Compile Include="src\crypto\engines\XSalsa20Engine.cs" />
835838
<Compile Include="src\crypto\engines\XTEAEngine.cs" />
839+
<Compile Include="src\crypto\fpe\FpeEngine.cs" />
840+
<Compile Include="src\crypto\fpe\FpeFf1Engine.cs" />
841+
<Compile Include="src\crypto\fpe\FpeFf3_1Engine.cs" />
842+
<Compile Include="src\crypto\fpe\SP80038G.cs" />
836843
<Compile Include="src\crypto\generators\BaseKdfBytesGenerator.cs" />
837844
<Compile Include="src\crypto\generators\BCrypt.cs" />
838845
<Compile Include="src\crypto\generators\DHBasicKeyPairGenerator.cs" />
@@ -898,6 +905,7 @@
898905
<Compile Include="src\crypto\modes\CtsBlockCipher.cs" />
899906
<Compile Include="src\crypto\modes\EAXBlockCipher.cs" />
900907
<Compile Include="src\crypto\modes\GCMBlockCipher.cs" />
908+
<Compile Include="src\crypto\modes\GcmSivBlockCipher.cs" />
901909
<Compile Include="src\crypto\modes\GOFBBlockCipher.cs" />
902910
<Compile Include="src\crypto\modes\IAeadBlockCipher.cs" />
903911
<Compile Include="src\crypto\modes\IAeadCipher.cs" />
@@ -970,6 +978,7 @@
970978
<Compile Include="src\crypto\parameters\ElGamalParameters.cs" />
971979
<Compile Include="src\crypto\parameters\ElGamalPrivateKeyParameters.cs" />
972980
<Compile Include="src\crypto\parameters\ElGamalPublicKeyParameters.cs" />
981+
<Compile Include="src\crypto\parameters\FpeParameters.cs" />
973982
<Compile Include="src\crypto\parameters\GOST3410KeyGenerationParameters.cs" />
974983
<Compile Include="src\crypto\parameters\GOST3410KeyParameters.cs" />
975984
<Compile Include="src\crypto\parameters\GOST3410Parameters.cs" />
@@ -1223,6 +1232,7 @@
12231232
<Compile Include="src\crypto\tls\UseSrtpData.cs" />
12241233
<Compile Include="src\crypto\tls\UserMappingType.cs" />
12251234
<Compile Include="src\crypto\util\AlgorithmIdentifierFactory.cs" />
1235+
<Compile Include="src\crypto\util\BasicAlphabetMapper.cs" />
12261236
<Compile Include="src\crypto\util\CipherFactory.cs" />
12271237
<Compile Include="src\crypto\util\CipherKeyGeneratorFactory.cs" />
12281238
<Compile Include="src\crypto\util\Pack.cs" />
@@ -1557,6 +1567,7 @@
15571567
<Compile Include="src\tsp\TimeStampTokenInfo.cs" />
15581568
<Compile Include="src\util\Arrays.cs" />
15591569
<Compile Include="src\util\BigIntegers.cs" />
1570+
<Compile Include="src\util\Bytes.cs" />
15601571
<Compile Include="src\util\Enums.cs" />
15611572
<Compile Include="src\util\IMemoable.cs" />
15621573
<Compile Include="src\util\Integers.cs" />

‎crypto/BouncyCastle.iOS.csproj

Lines changed: 11 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -666,6 +666,7 @@
666666
<Compile Include="src\crypto\CipherKeyGenerator.cs" />
667667
<Compile Include="src\crypto\CryptoException.cs" />
668668
<Compile Include="src\crypto\DataLengthException.cs" />
669+
<Compile Include="src\crypto\IAlphabetMapper.cs" />
669670
<Compile Include="src\crypto\IAsymmetricBlockCipher.cs" />
670671
<Compile Include="src\crypto\IAsymmetricCipherKeyPairGenerator.cs" />
671672
<Compile Include="src\crypto\IBasicAgreement.cs" />
@@ -754,6 +755,7 @@
754755
<Compile Include="src\crypto\digests\MD5Digest.cs" />
755756
<Compile Include="src\crypto\digests\NonMemoableDigest.cs" />
756757
<Compile Include="src\crypto\digests\NullDigest.cs" />
758+
<Compile Include="src\crypto\digests\ParallelHash.cs" />
757759
<Compile Include="src\crypto\digests\RipeMD128Digest.cs" />
758760
<Compile Include="src\crypto\digests\RipeMD160Digest.cs" />
759761
<Compile Include="src\crypto\digests\RipeMD256Digest.cs" />
@@ -771,6 +773,7 @@
771773
<Compile Include="src\crypto\digests\SkeinDigest.cs" />
772774
<Compile Include="src\crypto\digests\SkeinEngine.cs" />
773775
<Compile Include="src\crypto\digests\TigerDigest.cs" />
776+
<Compile Include="src\crypto\digests\TupleHash.cs" />
774777
<Compile Include="src\crypto\digests\WhirlpoolDigest.cs" />
775778
<Compile Include="src\crypto\digests\XofUtils.cs" />
776779
<Compile Include="src\crypto\ec\CustomNamedCurves.cs" />
@@ -834,6 +837,10 @@
834837
<Compile Include="src\crypto\engines\VMPCKSA3Engine.cs" />
835838
<Compile Include="src\crypto\engines\XSalsa20Engine.cs" />
836839
<Compile Include="src\crypto\engines\XTEAEngine.cs" />
840+
<Compile Include="src\crypto\fpe\FpeEngine.cs" />
841+
<Compile Include="src\crypto\fpe\FpeFf1Engine.cs" />
842+
<Compile Include="src\crypto\fpe\FpeFf3_1Engine.cs" />
843+
<Compile Include="src\crypto\fpe\SP80038G.cs" />
837844
<Compile Include="src\crypto\generators\BaseKdfBytesGenerator.cs" />
838845
<Compile Include="src\crypto\generators\BCrypt.cs" />
839846
<Compile Include="src\crypto\generators\DHBasicKeyPairGenerator.cs" />
@@ -899,6 +906,7 @@
899906
<Compile Include="src\crypto\modes\CtsBlockCipher.cs" />
900907
<Compile Include="src\crypto\modes\EAXBlockCipher.cs" />
901908
<Compile Include="src\crypto\modes\GCMBlockCipher.cs" />
909+
<Compile Include="src\crypto\modes\GcmSivBlockCipher.cs" />
902910
<Compile Include="src\crypto\modes\GOFBBlockCipher.cs" />
903911
<Compile Include="src\crypto\modes\IAeadBlockCipher.cs" />
904912
<Compile Include="src\crypto\modes\IAeadCipher.cs" />
@@ -971,6 +979,7 @@
971979
<Compile Include="src\crypto\parameters\ElGamalParameters.cs" />
972980
<Compile Include="src\crypto\parameters\ElGamalPrivateKeyParameters.cs" />
973981
<Compile Include="src\crypto\parameters\ElGamalPublicKeyParameters.cs" />
982+
<Compile Include="src\crypto\parameters\FpeParameters.cs" />
974983
<Compile Include="src\crypto\parameters\GOST3410KeyGenerationParameters.cs" />
975984
<Compile Include="src\crypto\parameters\GOST3410KeyParameters.cs" />
976985
<Compile Include="src\crypto\parameters\GOST3410Parameters.cs" />
@@ -1224,6 +1233,7 @@
12241233
<Compile Include="src\crypto\tls\UseSrtpData.cs" />
12251234
<Compile Include="src\crypto\tls\UserMappingType.cs" />
12261235
<Compile Include="src\crypto\util\AlgorithmIdentifierFactory.cs" />
1236+
<Compile Include="src\crypto\util\BasicAlphabetMapper.cs" />
12271237
<Compile Include="src\crypto\util\CipherFactory.cs" />
12281238
<Compile Include="src\crypto\util\CipherKeyGeneratorFactory.cs" />
12291239
<Compile Include="src\crypto\util\Pack.cs" />
@@ -1558,6 +1568,7 @@
15581568
<Compile Include="src\tsp\TimeStampTokenInfo.cs" />
15591569
<Compile Include="src\util\Arrays.cs" />
15601570
<Compile Include="src\util\BigIntegers.cs" />
1571+
<Compile Include="src\util\Bytes.cs" />
15611572
<Compile Include="src\util\Enums.cs" />
15621573
<Compile Include="src\util\IMemoable.cs" />
15631574
<Compile Include="src\util\Integers.cs" />

‎crypto/crypto.csproj

Lines changed: 80 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -3213,6 +3213,11 @@
32133213
SubType = "Code"
32143214
BuildAction = "Compile"
32153215
/>
3216+
<File
3217+
RelPath = "src\crypto\IAlphabetMapper.cs"
3218+
SubType = "Code"
3219+
BuildAction = "Compile"
3220+
/>
32163221
<File
32173222
RelPath = "src\crypto\IAsymmetricBlockCipher.cs"
32183223
SubType = "Code"
@@ -3648,6 +3653,11 @@
36483653
SubType = "Code"
36493654
BuildAction = "Compile"
36503655
/>
3656+
<File
3657+
RelPath = "src\crypto\digests\ParallelHash.cs"
3658+
SubType = "Code"
3659+
BuildAction = "Compile"
3660+
/>
36513661
<File
36523662
RelPath = "src\crypto\digests\RIPEMD128Digest.cs"
36533663
SubType = "Code"
@@ -3733,6 +3743,11 @@
37333743
SubType = "Code"
37343744
BuildAction = "Compile"
37353745
/>
3746+
<File
3747+
RelPath = "src\crypto\digests\TupleHash.cs"
3748+
SubType = "Code"
3749+
BuildAction = "Compile"
3750+
/>
37363751
<File
37373752
RelPath = "src\crypto\digests\WhirlpoolDigest.cs"
37383753
SubType = "Code"
@@ -4048,6 +4063,26 @@
40484063
SubType = "Code"
40494064
BuildAction = "Compile"
40504065
/>
4066+
<File
4067+
RelPath = "src\crypto\fpe\FpeEngine.cs"
4068+
SubType = "Code"
4069+
BuildAction = "Compile"
4070+
/>
4071+
<File
4072+
RelPath = "src\crypto\fpe\FpeFf1Engine.cs"
4073+
SubType = "Code"
4074+
BuildAction = "Compile"
4075+
/>
4076+
<File
4077+
RelPath = "src\crypto\fpe\FpeFf3_1Engine.cs"
4078+
SubType = "Code"
4079+
BuildAction = "Compile"
4080+
/>
4081+
<File
4082+
RelPath = "src\crypto\fpe\SP80038G.cs"
4083+
SubType = "Code"
4084+
BuildAction = "Compile"
4085+
/>
40514086
<File
40524087
RelPath = "src\crypto\generators\BaseKDFBytesGenerator.cs"
40534088
SubType = "Code"
@@ -4373,6 +4408,11 @@
43734408
SubType = "Code"
43744409
BuildAction = "Compile"
43754410
/>
4411+
<File
4412+
RelPath = "src\crypto\modes\GcmSivBlockCipher.cs"
4413+
SubType = "Code"
4414+
BuildAction = "Compile"
4415+
/>
43764416
<File
43774417
RelPath = "src\crypto\modes\GOFBBlockCipher.cs"
43784418
SubType = "Code"
@@ -4733,6 +4773,11 @@
47334773
SubType = "Code"
47344774
BuildAction = "Compile"
47354775
/>
4776+
<File
4777+
RelPath = "src\crypto\parameters\FpeParameters.cs"
4778+
SubType = "Code"
4779+
BuildAction = "Compile"
4780+
/>
47364781
<File
47374782
RelPath = "src\crypto\parameters\GOST3410KeyGenerationParameters.cs"
47384783
SubType = "Code"
@@ -6003,6 +6048,11 @@
60036048
SubType = "Code"
60046049
BuildAction = "Compile"
60056050
/>
6051+
<File
6052+
RelPath = "src\crypto\util\BasicAlphabetMapper.cs"
6053+
SubType = "Code"
6054+
BuildAction = "Compile"
6055+
/>
60066056
<File
60076057
RelPath = "src\crypto\util\CipherFactory.cs"
60086058
SubType = "Code"
@@ -7673,6 +7723,11 @@
76737723
SubType = "Code"
76747724
BuildAction = "Compile"
76757725
/>
7726+
<File
7727+
RelPath = "src\util\Bytes.cs"
7728+
SubType = "Code"
7729+
BuildAction = "Compile"
7730+
/>
76767731
<File
76777732
RelPath = "src\util\Enums.cs"
76787733
SubType = "Code"
@@ -12386,6 +12441,11 @@
1238612441
SubType = "Code"
1238712442
BuildAction = "Compile"
1238812443
/>
12444+
<File
12445+
RelPath = "test\src\crypto\test\GcmSivTest.cs"
12446+
SubType = "Code"
12447+
BuildAction = "Compile"
12448+
/>
1238912449
<File
1239012450
RelPath = "test\src\crypto\test\GCMTest.cs"
1239112451
SubType = "Code"
@@ -12561,6 +12621,11 @@
1256112621
SubType = "Code"
1256212622
BuildAction = "Compile"
1256312623
/>
12624+
<File
12625+
RelPath = "test\src\crypto\test\ParallelHashTest.cs"
12626+
SubType = "Code"
12627+
BuildAction = "Compile"
12628+
/>
1256412629
<File
1256512630
RelPath = "test\src\crypto\test\Pkcs12Test.cs"
1256612631
SubType = "Code"
@@ -12806,6 +12871,11 @@
1280612871
SubType = "Code"
1280712872
BuildAction = "Compile"
1280812873
/>
12874+
<File
12875+
RelPath = "test\src\crypto\test\SP80038GTest.cs"
12876+
SubType = "Code"
12877+
BuildAction = "Compile"
12878+
/>
1280912879
<File
1281012880
RelPath = "test\src\crypto\test\SRP6Test.cs"
1281112881
SubType = "Code"
@@ -12851,6 +12921,11 @@
1285112921
SubType = "Code"
1285212922
BuildAction = "Compile"
1285312923
/>
12924+
<File
12925+
RelPath = "test\src\crypto\test\TupleHashTest.cs"
12926+
SubType = "Code"
12927+
BuildAction = "Compile"
12928+
/>
1285412929
<File
1285512930
RelPath = "test\src\crypto\test\TwofishTest.cs"
1285612931
SubType = "Code"
@@ -13306,6 +13381,11 @@
1330613381
SubType = "Code"
1330713382
BuildAction = "Compile"
1330813383
/>
13384+
<File
13385+
RelPath = "test\src\openpgp\test\PgpFeaturesTest.cs"
13386+
SubType = "Code"
13387+
BuildAction = "Compile"
13388+
/>
1330913389
<File
1331013390
RelPath = "test\src\openpgp\test\PgpKeyRingTest.cs"
1331113391
SubType = "Code"

0 commit comments

Comments
 (0)