Skip to content

Commit 425727f

Browse files
peterdettmanpeterdettman
committed
Update TLS test data from bc-java
1 parent bea54d9 commit 425727f

File tree

79 files changed

+2564
-352
lines changed

Some content is hidden

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

79 files changed

+2564
-352
lines changed

‎crypto/crypto.csproj

Lines changed: 198 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -11608,61 +11608,253 @@
1160811608
BuildAction = "EmbeddedResource"
1160911609
/>
1161011610
<File
11611-
RelPath = "test\data\tls\x509-ca.pem"
11611+
RelPath = "test\data\tls\ca.tmpl"
11612+
BuildAction = "None"
11613+
/>
11614+
<File
11615+
RelPath = "test\data\tls\client_agree.tmpl"
11616+
BuildAction = "None"
11617+
/>
11618+
<File
11619+
RelPath = "test\data\tls\client_enc.tmpl"
11620+
BuildAction = "None"
11621+
/>
11622+
<File
11623+
RelPath = "test\data\tls\client_sign.tmpl"
11624+
BuildAction = "None"
11625+
/>
11626+
<File
11627+
RelPath = "test\data\tls\README.txt"
11628+
BuildAction = "None"
11629+
/>
11630+
<File
11631+
RelPath = "test\data\tls\server_agree.tmpl"
11632+
BuildAction = "None"
11633+
/>
11634+
<File
11635+
RelPath = "test\data\tls\server_enc.tmpl"
11636+
BuildAction = "None"
11637+
/>
11638+
<File
11639+
RelPath = "test\data\tls\server_sign.tmpl"
11640+
BuildAction = "None"
11641+
/>
11642+
<File
11643+
RelPath = "test\data\tls\x509-ca-dsa.pem"
11644+
BuildAction = "EmbeddedResource"
11645+
/>
11646+
<File
11647+
RelPath = "test\data\tls\x509-ca-ecdsa.pem"
11648+
BuildAction = "EmbeddedResource"
11649+
/>
11650+
<File
11651+
RelPath = "test\data\tls\x509-ca-ed25519.pem"
11652+
BuildAction = "EmbeddedResource"
11653+
/>
11654+
<File
11655+
RelPath = "test\data\tls\x509-ca-ed448.pem"
11656+
BuildAction = "EmbeddedResource"
11657+
/>
11658+
<File
11659+
RelPath = "test\data\tls\x509-ca-key-dsa.pem"
1161211660
BuildAction = "EmbeddedResource"
1161311661
/>
1161411662
<File
11615-
RelPath = "test\data\tls\x509-ca-key.pem"
11663+
RelPath = "test\data\tls\x509-ca-key-ecdsa.pem"
1161611664
BuildAction = "EmbeddedResource"
1161711665
/>
1161811666
<File
11619-
RelPath = "test\data\tls\x509-client.pem"
11667+
RelPath = "test\data\tls\x509-ca-key-ed25519.pem"
11668+
BuildAction = "EmbeddedResource"
11669+
/>
11670+
<File
11671+
RelPath = "test\data\tls\x509-ca-key-ed448.pem"
11672+
BuildAction = "EmbeddedResource"
11673+
/>
11674+
<File
11675+
RelPath = "test\data\tls\x509-ca-key-rsa.pem"
11676+
BuildAction = "EmbeddedResource"
11677+
/>
11678+
<File
11679+
RelPath = "test\data\tls\x509-ca-key-rsa_pss_256.pem"
11680+
BuildAction = "EmbeddedResource"
11681+
/>
11682+
<File
11683+
RelPath = "test\data\tls\x509-ca-key-rsa_pss_384.pem"
11684+
BuildAction = "EmbeddedResource"
11685+
/>
11686+
<File
11687+
RelPath = "test\data\tls\x509-ca-key-rsa_pss_512.pem"
11688+
BuildAction = "EmbeddedResource"
11689+
/>
11690+
<File
11691+
RelPath = "test\data\tls\x509-ca-rsa.pem"
11692+
BuildAction = "EmbeddedResource"
11693+
/>
11694+
<File
11695+
RelPath = "test\data\tls\x509-ca-rsa_pss_256.pem"
11696+
BuildAction = "EmbeddedResource"
11697+
/>
11698+
<File
11699+
RelPath = "test\data\tls\x509-ca-rsa_pss_384.pem"
11700+
BuildAction = "EmbeddedResource"
11701+
/>
11702+
<File
11703+
RelPath = "test\data\tls\x509-ca-rsa_pss_512.pem"
1162011704
BuildAction = "EmbeddedResource"
1162111705
/>
1162211706
<File
1162311707
RelPath = "test\data\tls\x509-client-dsa.pem"
1162411708
BuildAction = "EmbeddedResource"
1162511709
/>
11710+
<File
11711+
RelPath = "test\data\tls\x509-client-ecdh.pem"
11712+
BuildAction = "EmbeddedResource"
11713+
/>
1162611714
<File
1162711715
RelPath = "test\data\tls\x509-client-ecdsa.pem"
1162811716
BuildAction = "EmbeddedResource"
1162911717
/>
1163011718
<File
11631-
RelPath = "test\data\tls\x509-client-key.pem"
11719+
RelPath = "test\data\tls\x509-client-ed25519.pem"
11720+
BuildAction = "EmbeddedResource"
11721+
/>
11722+
<File
11723+
RelPath = "test\data\tls\x509-client-ed448.pem"
1163211724
BuildAction = "EmbeddedResource"
1163311725
/>
1163411726
<File
1163511727
RelPath = "test\data\tls\x509-client-key-dsa.pem"
1163611728
BuildAction = "EmbeddedResource"
1163711729
/>
11730+
<File
11731+
RelPath = "test\data\tls\x509-client-key-ecdh.pem"
11732+
BuildAction = "EmbeddedResource"
11733+
/>
1163811734
<File
1163911735
RelPath = "test\data\tls\x509-client-key-ecdsa.pem"
1164011736
BuildAction = "EmbeddedResource"
1164111737
/>
1164211738
<File
11643-
RelPath = "test\data\tls\x509-server.pem"
11739+
RelPath = "test\data\tls\x509-client-key-ed25519.pem"
11740+
BuildAction = "EmbeddedResource"
11741+
/>
11742+
<File
11743+
RelPath = "test\data\tls\x509-client-key-ed448.pem"
11744+
BuildAction = "EmbeddedResource"
11745+
/>
11746+
<File
11747+
RelPath = "test\data\tls\x509-client-key-rsa.pem"
11748+
BuildAction = "EmbeddedResource"
11749+
/>
11750+
<File
11751+
RelPath = "test\data\tls\x509-client-key-rsa_pss_256.pem"
11752+
BuildAction = "EmbeddedResource"
11753+
/>
11754+
<File
11755+
RelPath = "test\data\tls\x509-client-key-rsa_pss_384.pem"
11756+
BuildAction = "EmbeddedResource"
11757+
/>
11758+
<File
11759+
RelPath = "test\data\tls\x509-client-key-rsa_pss_512.pem"
11760+
BuildAction = "EmbeddedResource"
11761+
/>
11762+
<File
11763+
RelPath = "test\data\tls\x509-client-rsa.pem"
11764+
BuildAction = "EmbeddedResource"
11765+
/>
11766+
<File
11767+
RelPath = "test\data\tls\x509-client-rsa_pss_256.pem"
11768+
BuildAction = "EmbeddedResource"
11769+
/>
11770+
<File
11771+
RelPath = "test\data\tls\x509-client-rsa_pss_384.pem"
11772+
BuildAction = "EmbeddedResource"
11773+
/>
11774+
<File
11775+
RelPath = "test\data\tls\x509-client-rsa_pss_512.pem"
1164411776
BuildAction = "EmbeddedResource"
1164511777
/>
1164611778
<File
1164711779
RelPath = "test\data\tls\x509-server-dsa.pem"
1164811780
BuildAction = "EmbeddedResource"
1164911781
/>
11782+
<File
11783+
RelPath = "test\data\tls\x509-server-ecdh.pem"
11784+
BuildAction = "EmbeddedResource"
11785+
/>
1165011786
<File
1165111787
RelPath = "test\data\tls\x509-server-ecdsa.pem"
1165211788
BuildAction = "EmbeddedResource"
1165311789
/>
1165411790
<File
11655-
RelPath = "test\data\tls\x509-server-key.pem"
11791+
RelPath = "test\data\tls\x509-server-ed25519.pem"
11792+
BuildAction = "EmbeddedResource"
11793+
/>
11794+
<File
11795+
RelPath = "test\data\tls\x509-server-ed448.pem"
1165611796
BuildAction = "EmbeddedResource"
1165711797
/>
1165811798
<File
1165911799
RelPath = "test\data\tls\x509-server-key-dsa.pem"
1166011800
BuildAction = "EmbeddedResource"
1166111801
/>
11802+
<File
11803+
RelPath = "test\data\tls\x509-server-key-ecdh.pem"
11804+
BuildAction = "EmbeddedResource"
11805+
/>
1166211806
<File
1166311807
RelPath = "test\data\tls\x509-server-key-ecdsa.pem"
1166411808
BuildAction = "EmbeddedResource"
1166511809
/>
11810+
<File
11811+
RelPath = "test\data\tls\x509-server-key-ed25519.pem"
11812+
BuildAction = "EmbeddedResource"
11813+
/>
11814+
<File
11815+
RelPath = "test\data\tls\x509-server-key-ed448.pem"
11816+
BuildAction = "EmbeddedResource"
11817+
/>
11818+
<File
11819+
RelPath = "test\data\tls\x509-server-key-rsa-enc.pem"
11820+
BuildAction = "EmbeddedResource"
11821+
/>
11822+
<File
11823+
RelPath = "test\data\tls\x509-server-key-rsa-sign.pem"
11824+
BuildAction = "EmbeddedResource"
11825+
/>
11826+
<File
11827+
RelPath = "test\data\tls\x509-server-key-rsa_pss_256.pem"
11828+
BuildAction = "EmbeddedResource"
11829+
/>
11830+
<File
11831+
RelPath = "test\data\tls\x509-server-key-rsa_pss_384.pem"
11832+
BuildAction = "EmbeddedResource"
11833+
/>
11834+
<File
11835+
RelPath = "test\data\tls\x509-server-key-rsa_pss_512.pem"
11836+
BuildAction = "EmbeddedResource"
11837+
/>
11838+
<File
11839+
RelPath = "test\data\tls\x509-server-rsa-enc.pem"
11840+
BuildAction = "EmbeddedResource"
11841+
/>
11842+
<File
11843+
RelPath = "test\data\tls\x509-server-rsa-sign.pem"
11844+
BuildAction = "EmbeddedResource"
11845+
/>
11846+
<File
11847+
RelPath = "test\data\tls\x509-server-rsa_pss_256.pem"
11848+
BuildAction = "EmbeddedResource"
11849+
/>
11850+
<File
11851+
RelPath = "test\data\tls\x509-server-rsa_pss_384.pem"
11852+
BuildAction = "EmbeddedResource"
11853+
/>
11854+
<File
11855+
RelPath = "test\data\tls\x509-server-rsa_pss_512.pem"
11856+
BuildAction = "EmbeddedResource"
11857+
/>
1166611858
<File
1166711859
RelPath = "test\data\tls\keystores\client_store.dsa"
1166811860
BuildAction = "EmbeddedResource"

‎crypto/test/UnitTests.csproj

Lines changed: 55 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1327,24 +1327,68 @@
13271327
<EmbeddedResource Include="data\rsa3\self-testcase-L.pem" />
13281328
<EmbeddedResource Include="data\rsa3\testcases.README" />
13291329
<EmbeddedResource Include="data\scrypt\TestVectors.txt" />
1330-
<EmbeddedResource Include="data\tls\README.txt" />
1331-
<EmbeddedResource Include="data\tls\ca.tmpl" />
1332-
<EmbeddedResource Include="data\tls\client.tmpl" />
1333-
<EmbeddedResource Include="data\tls\server.tmpl" />
1334-
<EmbeddedResource Include="data\tls\x509-ca-key.pem" />
1335-
<EmbeddedResource Include="data\tls\x509-ca.pem" />
1330+
<None Include="data\tls\ca.tmpl" />
1331+
<None Include="data\tls\client_agree.tmpl" />
1332+
<None Include="data\tls\client_enc.tmpl" />
1333+
<None Include="data\tls\client_sign.tmpl" />
1334+
<None Include="data\tls\README.txt" />
1335+
<None Include="data\tls\server_agree.tmpl" />
1336+
<None Include="data\tls\server_enc.tmpl" />
1337+
<None Include="data\tls\server_sign.tmpl" />
1338+
<EmbeddedResource Include="data\tls\x509-ca-dsa.pem" />
1339+
<EmbeddedResource Include="data\tls\x509-ca-ecdsa.pem" />
1340+
<EmbeddedResource Include="data\tls\x509-ca-ed25519.pem" />
1341+
<EmbeddedResource Include="data\tls\x509-ca-ed448.pem" />
1342+
<EmbeddedResource Include="data\tls\x509-ca-key-dsa.pem" />
1343+
<EmbeddedResource Include="data\tls\x509-ca-key-ecdsa.pem" />
1344+
<EmbeddedResource Include="data\tls\x509-ca-key-ed25519.pem" />
1345+
<EmbeddedResource Include="data\tls\x509-ca-key-ed448.pem" />
1346+
<EmbeddedResource Include="data\tls\x509-ca-key-rsa.pem" />
1347+
<EmbeddedResource Include="data\tls\x509-ca-key-rsa_pss_256.pem" />
1348+
<EmbeddedResource Include="data\tls\x509-ca-key-rsa_pss_384.pem" />
1349+
<EmbeddedResource Include="data\tls\x509-ca-key-rsa_pss_512.pem" />
1350+
<EmbeddedResource Include="data\tls\x509-ca-rsa.pem" />
1351+
<EmbeddedResource Include="data\tls\x509-ca-rsa_pss_256.pem" />
1352+
<EmbeddedResource Include="data\tls\x509-ca-rsa_pss_384.pem" />
1353+
<EmbeddedResource Include="data\tls\x509-ca-rsa_pss_512.pem" />
13361354
<EmbeddedResource Include="data\tls\x509-client-dsa.pem" />
1355+
<EmbeddedResource Include="data\tls\x509-client-ecdh.pem" />
13371356
<EmbeddedResource Include="data\tls\x509-client-ecdsa.pem" />
1338-
<EmbeddedResource Include="data\tls\x509-client-key.pem" />
1357+
<EmbeddedResource Include="data\tls\x509-client-ed25519.pem" />
1358+
<EmbeddedResource Include="data\tls\x509-client-ed448.pem" />
13391359
<EmbeddedResource Include="data\tls\x509-client-key-dsa.pem" />
1360+
<EmbeddedResource Include="data\tls\x509-client-key-ecdh.pem" />
13401361
<EmbeddedResource Include="data\tls\x509-client-key-ecdsa.pem" />
1341-
<EmbeddedResource Include="data\tls\x509-client.pem" />
1362+
<EmbeddedResource Include="data\tls\x509-client-key-ed25519.pem" />
1363+
<EmbeddedResource Include="data\tls\x509-client-key-ed448.pem" />
1364+
<EmbeddedResource Include="data\tls\x509-client-key-rsa.pem" />
1365+
<EmbeddedResource Include="data\tls\x509-client-key-rsa_pss_256.pem" />
1366+
<EmbeddedResource Include="data\tls\x509-client-key-rsa_pss_384.pem" />
1367+
<EmbeddedResource Include="data\tls\x509-client-key-rsa_pss_512.pem" />
1368+
<EmbeddedResource Include="data\tls\x509-client-rsa.pem" />
1369+
<EmbeddedResource Include="data\tls\x509-client-rsa_pss_256.pem" />
1370+
<EmbeddedResource Include="data\tls\x509-client-rsa_pss_384.pem" />
1371+
<EmbeddedResource Include="data\tls\x509-client-rsa_pss_512.pem" />
13421372
<EmbeddedResource Include="data\tls\x509-server-dsa.pem" />
1373+
<EmbeddedResource Include="data\tls\x509-server-ecdh.pem" />
13431374
<EmbeddedResource Include="data\tls\x509-server-ecdsa.pem" />
1344-
<EmbeddedResource Include="data\tls\x509-server-key.pem" />
1375+
<EmbeddedResource Include="data\tls\x509-server-ed25519.pem" />
1376+
<EmbeddedResource Include="data\tls\x509-server-ed448.pem" />
13451377
<EmbeddedResource Include="data\tls\x509-server-key-dsa.pem" />
1378+
<EmbeddedResource Include="data\tls\x509-server-key-ecdh.pem" />
13461379
<EmbeddedResource Include="data\tls\x509-server-key-ecdsa.pem" />
1347-
<EmbeddedResource Include="data\tls\x509-server.pem" />
1380+
<EmbeddedResource Include="data\tls\x509-server-key-ed25519.pem" />
1381+
<EmbeddedResource Include="data\tls\x509-server-key-ed448.pem" />
1382+
<EmbeddedResource Include="data\tls\x509-server-key-rsa-enc.pem" />
1383+
<EmbeddedResource Include="data\tls\x509-server-key-rsa-sign.pem" />
1384+
<EmbeddedResource Include="data\tls\x509-server-key-rsa_pss_256.pem" />
1385+
<EmbeddedResource Include="data\tls\x509-server-key-rsa_pss_384.pem" />
1386+
<EmbeddedResource Include="data\tls\x509-server-key-rsa_pss_512.pem" />
1387+
<EmbeddedResource Include="data\tls\x509-server-rsa-enc.pem" />
1388+
<EmbeddedResource Include="data\tls\x509-server-rsa-sign.pem" />
1389+
<EmbeddedResource Include="data\tls\x509-server-rsa_pss_256.pem" />
1390+
<EmbeddedResource Include="data\tls\x509-server-rsa_pss_384.pem" />
1391+
<EmbeddedResource Include="data\tls\x509-server-rsa_pss_512.pem" />
13481392
<EmbeddedResource Include="data\tls\keystores\client_store.dsa" />
13491393
<EmbeddedResource Include="data\tls\keystores\client_store.rsa" />
13501394
<EmbeddedResource Include="data\tls\keystores\server_store.dsa" />
@@ -1353,4 +1397,4 @@
13531397
<ItemGroup>
13541398
<Service Include="{82A7F48D-3B50-4B1E-B82E-3ADA8210C358}" />
13551399
</ItemGroup>
1356-
</Project>
1400+
</Project>

0 commit comments

Comments
 (0)