Skip to content

Commit 25119c3

Browse files
committed
Added compatibility testing results for Entrust
1 parent 38999e7 commit 25119c3

16 files changed

+876
-1
lines changed

pqc_hackathon_results.md

+537
Large diffs are not rendered by default.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.3.6.1.4.1.2.267.11.4.4","Y","Y","Y","Y","Y"
3+
"1.3.6.1.4.1.2.267.11.6.5","Y","Y","Y","Y","Y"
4+
"1.3.6.1.4.1.2.267.11.8.7","Y","Y","Y","Y","Y"
5+
"1.3.6.1.4.1.2.267.7.4.4","Y","Y","Y","Y","Y"
6+
"1.3.6.1.4.1.2.267.7.6.5","Y","Y","Y","Y","Y"
7+
"1.3.6.1.4.1.2.267.7.8.7","Y","Y","Y","Y","Y"
8+
"1.3.9999.3.1","Y","Y","Y","Y","Y"
9+
"1.3.9999.3.4","Y","Y","Y","Y","Y"
10+
"artifacts","","","","",""
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,27 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.2.840.10045.3.1.7","Y","Y","Y","Y","Y"
3+
"1.2.840.10045.3.1.7_1.3.6.1.4.1.2.267.7.4.4","Y","Y","Y","Y","Y"
4+
"1.2.840.10045.3.1.7_1.3.6.1.4.1.2.267.7.4.4_1.3.9999.3.4","Y","Y","Y","Y","Y"
5+
"1.2.840.10045.3.1.7_1.3.6.1.4.1.2.267.7.6.5","Y","Y","Y","Y","Y"
6+
"1.2.840.10045.3.1.7_1.3.6.1.4.1.2.267.7.6.5_1.3.9999.3.1","Y","Y","Y","Y","Y"
7+
"1.3.6.1.4.1.2.267.11.4.4","Y","Y","Y","Y","Y"
8+
"1.3.6.1.4.1.2.267.11.6.5","Y","Y","Y","Y","Y"
9+
"1.3.6.1.4.1.2.267.11.8.7","Y","Y","Y","Y","Y"
10+
"1.3.6.1.4.1.2.267.7.4.4","Y","Y","Y","Y","Y"
11+
"1.3.6.1.4.1.2.267.7.6.5","Y","Y","Y","Y","Y"
12+
"1.3.6.1.4.1.2.267.7.8.7","Y","Y","Y","Y","Y"
13+
"1.3.9999.3.1","Y","Y","Y","Y","Y"
14+
"1.3.9999.3.4","Y","Y","Y","Y","Y"
15+
"1.3.9999.6.4.1","Y","Y","Y","Y","Y"
16+
"1.3.9999.6.4.10","Y","Y","Y","Y","Y"
17+
"1.3.9999.6.4.4","Y","Y","Y","Y","Y"
18+
"1.3.9999.6.4.7","Y","Y","Y","Y","Y"
19+
"1.3.9999.6.5.1","Y","Y","Y","Y","Y"
20+
"1.3.9999.6.5.3","Y","Y","Y","Y","Y"
21+
"1.3.9999.6.5.5","Y","Y","Y","Y","Y"
22+
"1.3.9999.6.5.7","Y","Y","Y","Y","Y"
23+
"1.3.9999.6.6.1","Y","Y","Y","Y","Y"
24+
"1.3.9999.6.6.3","Y","Y","Y","Y","Y"
25+
"1.3.9999.6.6.5","Y","Y","Y","Y","Y"
26+
"1.3.9999.6.6.7","Y","Y","Y","Y","Y"
27+
"2.16.840.1.114027.80.5.1","N","N","N","N","N"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,25 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.2.840.10045.2.1","Y","Y","Y","Y","Y"
3+
"1.3.6.1.4.1.2.267.11.4.4","Y","Y","Y","Y","Y"
4+
"1.3.6.1.4.1.2.267.11.6.5","Y","Y","Y","Y","Y"
5+
"1.3.6.1.4.1.2.267.11.8.7","Y","Y","Y","Y","Y"
6+
"1.3.6.1.4.1.2.267.7.4.4","Y","Y","Y","Y","Y"
7+
"1.3.6.1.4.1.2.267.7.6.5","Y","Y","Y","Y","Y"
8+
"1.3.6.1.4.1.2.267.7.8.7","Y","Y","Y","Y","Y"
9+
"1.3.9999.3.1","Y","Y","Y","Y","Y"
10+
"1.3.9999.3.4","Y","Y","Y","Y","Y"
11+
"1.3.9999.6.4.1","Y","Y","Y","Y","Y"
12+
"1.3.9999.6.4.10","Y","Y","Y","Y","Y"
13+
"1.3.9999.6.4.4","Y","Y","Y","Y","Y"
14+
"1.3.9999.6.4.7","Y","Y","Y","Y","Y"
15+
"1.3.9999.6.5.1","Y","Y","Y","Y","Y"
16+
"1.3.9999.6.5.3","Y","Y","Y","Y","Y"
17+
"1.3.9999.6.5.5","Y","Y","Y","Y","Y"
18+
"1.3.9999.6.5.7","Y","Y","Y","Y","Y"
19+
"1.3.9999.6.6.1","Y","Y","Y","Y","Y"
20+
"1.3.9999.6.6.3","Y","Y","Y","Y","Y"
21+
"1.3.9999.6.6.5","Y","Y","Y","Y","Y"
22+
"1.3.9999.6.6.7","Y","Y","Y","Y","Y"
23+
"2.16.840.1.114027.80.4.1","Y","Y","Y","Y","Y"
24+
"2.16.840.1.114027.80.5.1","Y","Y","Y","Y","Y"
25+
"hybrid","Y","N","N","Y","N"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,11 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.2.840.10045.2.1","N","N","N","",""
3+
"1.3.6.1.4.1.2.267.7.4.4","Y","Y","N","Y","Y"
4+
"1.3.6.1.4.1.2.267.7.6.5","Y","Y","N","Y","Y"
5+
"1.3.6.1.4.1.2.267.7.8.7","Y","Y","N","Y","Y"
6+
"1.3.9999.3.1","N","N","N","N","N"
7+
"1.3.9999.3.4","N","N","N","N","N"
8+
"1.3.9999.6.7.4","N","N","N","N","N"
9+
"1.3.9999.6.8.3","N","N","N","N","N"
10+
"1.3.9999.6.9.3","N","N","N","N","N"
11+
"2.16.840.1.114027.80.4.1","N","N","N","",""
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"2.16.840.1.114027.80.4.1","Y","Y","Y","Y","Y"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.3.6.1.4.1.2.267.7.4.4","N","N","N","",""
3+
"1.3.6.1.4.1.2.267.7.6.5","N","N","N","",""
4+
"1.3.6.1.4.1.2.267.7.8.7","N","N","N","",""
5+
"1.3.9999.3.1","N","N","N","",""
6+
"1.3.9999.3.4","N","N","N","",""
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,6 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.3.6.1.4.1.2.267.7.4.4","N","N","N","N","N"
3+
"1.3.6.1.4.1.2.267.7.6.5","N","N","N","N","N"
4+
"1.3.6.1.4.1.2.267.7.8.7","N","N","N","N","N"
5+
"1.3.9999.3.1","N","N","N","N","N"
6+
"1.3.9999.3.4","N","N","N","N","N"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,2 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.3.6.1.4.1.2.267.7.6.5","Y","Y","Y","Y","Y"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.3.6.1.4.1.2.267.11.4.4","N","N","N","N","N"
3+
"1.3.6.1.4.1.2.267.11.6.5","N","N","N","N","N"
4+
"1.3.6.1.4.1.2.267.11.8.7","N","N","N","N","N"
5+
"1.3.6.1.4.1.2.267.7.4.4","N","N","N","N","N"
6+
"1.3.6.1.4.1.2.267.7.6.5","N","N","N","N","N"
7+
"1.3.6.1.4.1.2.267.7.8.7","N","N","N","N","N"
8+
"1.3.9999.3.1","N","N","N","N","N"
9+
"1.3.9999.3.4","N","N","N","N","N"
10+
"1.3.9999.6.4.1","N","N","N","N","N"
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,10 @@
1+
"key_algorithm_oid","ta","ca","ee","crl_ta","crl_ca"
2+
"1.3.6.1.4.1.2.267.11.4.4","N","N","N","N","N"
3+
"1.3.6.1.4.1.2.267.11.6.5","N","N","N","N","N"
4+
"1.3.6.1.4.1.2.267.11.8.7","N","N","N","N","N"
5+
"1.3.6.1.4.1.2.267.7.4.4","N","N","N","N","N"
6+
"1.3.6.1.4.1.2.267.7.6.5","N","N","N","N","N"
7+
"1.3.6.1.4.1.2.267.7.8.7","N","N","N","N","N"
8+
"1.3.9999.3.1","N","N","N","N","N"
9+
"1.3.9999.3.4","N","N","N","N","N"
10+
"1.3.9999.6.4.1","N","N","N","N","N"

providers/entrust/default/artifacts.zip

100644100755
-4.64 MB
Binary file not shown.
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,102 @@
1+
$INDIR=$args[0] + ".\artifacts"
2+
3+
$compatMatrixFile = "compatMatrix.csv"
4+
Remove-Item $compatMatrixFile -ErrorAction SilentlyContinue
5+
6+
7+
Expand-Archive -Force -Path "$INDIR.zip" -DestinationPath $INDIR
8+
9+
foreach ($oiddir in Get-ChildItem -Directory $INDIR ) {
10+
11+
$oid = $oiddir.FullName.split('\')[-1]
12+
$compatMatrixEntry =[pscustomobject]@{
13+
'key_algorithm_oid' = $oid
14+
'ta' = ''
15+
'ca' = ''
16+
'ee' = ''
17+
'crl_ta' = ''
18+
'crl_ca' = ''
19+
}
20+
21+
22+
"" | Write-Output # newline to cluster OID groups
23+
foreach ($dir in Get-ChildItem -Directory $oiddir.FullName) {
24+
25+
$fullDir = $dir.FullName
26+
$basedir = $fullDir.Split('\')[-1]
27+
switch ($baseDir)
28+
{
29+
"ta" {
30+
$stdout = (.\pqutil.bat verify -certchain "$fullDir\ta.der") | Out-String
31+
32+
if ($stdout.Contains("Certificate Chain Verified!")) {
33+
"Passed: $oid TA Certificate" | Write-Output
34+
$compatMatrixEntry.ta = 'Y'
35+
36+
} else {
37+
"FAILED: $oid TA Certificate." | Write-Output
38+
$compatMatrixEntry.ta = 'N'
39+
}
40+
}
41+
42+
"ca" {
43+
$stdout = (.\pqutil.bat verify -certchain "$fullDir\ca.der" -certchain "$fullDir\..\ta\ta.der") | Out-String
44+
45+
if ($stdout.Contains("Certificate Chain Verified!")) {
46+
"Passed: $oid CA Certificate." | Write-Output
47+
$compatMatrixEntry.ca = 'Y'
48+
49+
} else {
50+
"FAILED: $oid CA Certificate." | Write-Output
51+
$compatMatrixEntry.ca = 'N'
52+
}
53+
}
54+
"ee" {
55+
# check the EE CSR
56+
# TODO: this one's broken.
57+
# .\pqutil.bat verify -csr "$fullDir\ee.csr"
58+
59+
# check the EE cert
60+
$stdout = (.\pqutil.bat verify -cer "$fullDir\cert.der" -certchain "$fullDir\..\ta\ta.der" -certchain "$fullDir\..\ca\ca.der") | Out-String
61+
62+
if ($stdout.Contains("Certificate Chain Verified!")) {
63+
"Passed: $oid EE Certificate Chain." | Write-Output
64+
$compatMatrixEntry.ee = 'Y'
65+
66+
} else {
67+
"FAILED: $oid EE Certificate Chain." | Write-Output
68+
$compatMatrixEntry.ee = 'N'
69+
}
70+
}
71+
"crl" {
72+
# verify TA crl
73+
$stdout = (.\pqutil.bat verify -crl "$fullDir\crl_ta.crl" -certchain "$fullDir\..\ta\ta.der") | Out-String
74+
75+
if ($stdout.Contains("Certificate Chain Verified!")) {
76+
"Passed: $oid TA CRL." | Write-Output
77+
$compatMatrixEntry.crl_ta = 'Y'
78+
79+
} else {
80+
"FAILED: $oid TA CRL." | Write-Output
81+
$compatMatrixEntry.crl_ta = 'N'
82+
}
83+
84+
85+
# # verify CA CRL
86+
$stdout = (.\pqutil.bat verify -crl "$fullDir\crl_ca.crl" -certchain "$fullDir\..\ta\ta.der" -certchain "$fullDir\..\ca\ca.der") | Out-String
87+
88+
if ($stdout.Contains("Certificate Chain Verified!")) {
89+
"Passed: $oid CA CRL." | Write-Output
90+
$compatMatrixEntry.crl_ca = 'Y'
91+
92+
} else {
93+
"FAILED: $oid CA CRL." | Write-Output
94+
$compatMatrixEntry.crl_ca = 'N'
95+
}
96+
}
97+
"ocsp" {echo "It's OCSP. ... not implemented yet."}
98+
}
99+
}
100+
$compatMatrixEntry | Export-CSV $compatMatrixFile -Append -NoTypeInformation
101+
}
102+
+127
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,127 @@
1+
$OUTDIR=".\artifacts"
2+
3+
4+
5+
6+
Function Create-TA([string] $OUTDIR, [string] $KEYALG, [string] $SIGALG) {
7+
mkdir -Force $OUTDIR\ta
8+
.\pqutil.bat keygen -alg $KEYALG -pubout "$OUTDIR\ta\ta_pub.der" -privout "$OUTDIR\ta\ta_priv.der"
9+
.\pqutil.bat newcsr -pubkey "$OUTDIR\ta\ta_pub.der" -privkey "$OUTDIR\ta\ta_priv.der" -csrout "$OUTDIR\ta\ta.csr" -sigalg $SIGALG.Split(" ")
10+
.\pqutil.bat newca -capubkey "$OUTDIR\ta\ta_pub.der" -caprivkey "$OUTDIR\ta\ta_priv.der" -certout "$OUTDIR\ta\ta.der" -sigalg $SIGALG
11+
}
12+
13+
14+
Function Create-CA([string] $OUTDIR, [string] $KEYALG, [string] $SIGALG) {
15+
mkdir -Force $OUTDIR\ca
16+
.\pqutil.bat keygen -alg $KEYALG -pubout "$OUTDIR\ca\ca_pub.der" -privout "$OUTDIR\ca\ca_priv.der"
17+
.\pqutil.bat newcsr -pubkey "$OUTDIR\ca\ca_pub.der" -privkey "$OUTDIR\ca\ca_priv.der" -csrout "$OUTDIR\ca\ca.csr" -sigalg $SIGALG.Split(" ")
18+
.\pqutil.bat issue -csr "$OUTDIR\ca\ca.csr.der" -caprivkey "$OUTDIR\ta\ta_priv.der" -certout "$OUTDIR\ca\ca.der" -sigalg $SIGALG.Split(" ") -subca
19+
}
20+
21+
Function Create-EE([string] $OUTDIR, [string] $KEYALG, [string] $SIGALG) {
22+
mkdir -Force $OUTDIR\ee
23+
.\pqutil.bat keygen -alg $KEYALG -pubout "$OUTDIR\ee\cert_pub.der" -privout "$OUTDIR\ee\cert_priv.der"
24+
.\pqutil.bat newcsr -pubkey "$OUTDIR\ee\cert_pub.der" -privkey "$OUTDIR\ee\cert_priv.der" -csrout "$OUTDIR\ee\cert.csr" -sigalg $SIGALG.Split(" ")
25+
.\pqutil.bat issue -csr "$OUTDIR\ee\cert.csr.der" -caprivkey "$OUTDIR\ca\ca_priv.der" -certout "$OUTDIR\ee\cert.der" -sigalg $SIGALG.Split(" ")
26+
}
27+
28+
Function Create-CRLs([string] $OUTDIR, [string] $SIGALG) {
29+
mkdir -Force $OUTDIR\crl
30+
31+
# CRL for TA
32+
.\pqutil.bat issuecrl -cacert "$OUTDIR\ta\ta.der" -caprivkey "$OUTDIR\ta\ta_priv.der" -crlfile "$OUTDIR\crl\crl_ta.crl" -createnew -sigalg $SIGALG.Split(" ")
33+
34+
# Create an EE to revoke
35+
.\pqutil.bat issue -csr "$OUTDIR\ee\cert.csr.der" -caprivkey "$OUTDIR\ca\ca_priv.der" -certout "$OUTDIR\crl\revoked.der" -sigalg $SIGALG.Split(" ")
36+
37+
# CRL for CA
38+
.\pqutil.bat issuecrl -cacert "$OUTDIR\ca\ca.der" -caprivkey "$OUTDIR\ca\ca_priv.der" -crlfile "$OUTDIR\crl\crl_ca.crl.der" -createnew -addrevocation "$OUTDIR\crl\revoked.der" -sigalg $SIGALG
39+
40+
}
41+
42+
Function Create([string] $OUTDIR, [string] $KEYALG, [string] $SIGALG) {
43+
Create-TA -OUTDIR $OUTDIR -KEYALG $KEYALG -SIGALG $SIGALG
44+
Create-CA -OUTDIR $OUTDIR -KEYALG $KEYALG -SIGALG $SIGALG
45+
Create-EE -OUTDIR $OUTDIR -KEYALG $KEYALG -SIGALG $SIGALG
46+
Create-CRLs -OUTDIR $OUTDIR -SIGALG $SIGALG
47+
}
48+
49+
50+
51+
Function Create-Composite-TA([string] $OUTDIR, [string] $KEYALG1, [string] $KEYALG2, [string] $SIGALG1, [string] $SIGALG2) {
52+
mkdir -Force $OUTDIR\ta
53+
.\pqutil.bat keygen -alg $KEYALG1.Split(" ") -alg $KEYALG2.Split(" ") -pubout "$OUTDIR\ta\ta_pub.der" -privout "$OUTDIR\ta\ta_priv.der"
54+
.\pqutil.bat newcsr -pubkey "$OUTDIR\ta\ta_pub.der" -privkey "$OUTDIR\ta\ta_priv.der" -csrout "$OUTDIR\ta\ta.csr" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
55+
.\pqutil.bat newca -capubkey "$OUTDIR\ta\ta_pub.der" -caprivkey "$OUTDIR\ta\ta_priv.der" -certout "$OUTDIR\ta\ta.der" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
56+
}
57+
58+
59+
Function Create-Composite-CA([string] $OUTDIR, [string] $KEYALG1, [string] $KEYALG2, [string] $SIGALG1, [string] $SIGALG2) {
60+
mkdir -Force $OUTDIR\ca
61+
.\pqutil.bat keygen -alg $KEYALG1.Split(" ").Split(" ") -alg $KEYALG2.Split(" ") -pubout "$OUTDIR\ca\ca_pub.der" -privout "$OUTDIR\ca\ca_priv.der"
62+
.\pqutil.bat newcsr -pubkey "$OUTDIR\ca\ca_pub.der" -privkey "$OUTDIR\ca\ca_priv.der" -csrout "$OUTDIR\ca\ca.csr.der" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
63+
.\pqutil.bat issue -csr "$OUTDIR\ca\ca.csr.der" -caprivkey "$OUTDIR\ta\ta_priv.der" -certout "$OUTDIR\ca\ca.der" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ") -subca
64+
}
65+
66+
Function Create-Composite-EE([string] $OUTDIR, [string] $KEYALG1, [string] $KEYALG2, [string] $SIGALG1, [string] $SIGALG2) {
67+
mkdir -Force $OUTDIR\ee
68+
.\pqutil.bat keygen -alg $KEYALG1.Split(" ") -alg $KEYALG2.Split(" ") -pubout "$OUTDIR\ee\cert_pub.der" -privout "$OUTDIR\ee\cert_priv.der"
69+
.\pqutil.bat newcsr -pubkey "$OUTDIR\ee\cert_pub.der" -privkey "$OUTDIR\ee\cert_priv.der" -csrout "$OUTDIR\ee\cert.csr.der" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
70+
.\pqutil.bat issue -csr "$OUTDIR\ee\cert.csr.der" -caprivkey "$OUTDIR\ca\ca_priv.der" -certout "$OUTDIR\ee\cert.der" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
71+
}
72+
73+
Function Create-Composite-CRLs([string] $OUTDIR, [string] $SIGALG1, [string] $SIGALG2) {
74+
mkdir -Force $OUTDIR\crl
75+
76+
# CRL for TA
77+
.\pqutil.bat issuecrl -cacert "$OUTDIR\ta\ta.der" -caprivkey "$OUTDIR\ta\ta_priv.der" -crlfile "$OUTDIR\crl\crl_ta.crl.der" -createnew -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
78+
79+
# Create an EE to revoke
80+
.\pqutil.bat issue -csr "$OUTDIR\ee\cert.csr.der" -caprivkey "$OUTDIR\ca\ca_priv.der" -certout "$OUTDIR\crl\revoked.der" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
81+
82+
# CRL for CA
83+
.\pqutil.bat issuecrl -cacert "$OUTDIR\ca\ca.der" -caprivkey "$OUTDIR\ca\ca_priv.der" -crlfile "$OUTDIR\crl\crl_ca.crl.der" -createnew -addrevocation "$OUTDIR\crl\revoked.der" -sigalg $SIGALG1.Split(" ") -sigalg $SIGALG2.Split(" ")
84+
85+
}
86+
87+
Function Create-Composite([string] $OUTDIR, [string] $KEYALG1, [string] $KEYALG2, [string] $SIGALG1, [string] $SIGALG2) {
88+
Create-Composite-TA -OUTDIR $OUTDIR -KEYALG1 $KEYALG1 -KEYALG2 $KEYALG2 -SIGALG1 $SIGALG1 -SIGALG2 $SIGALG2
89+
Create-Composite-CA -OUTDIR $OUTDIR -KEYALG1 $KEYALG1 -KEYALG2 $KEYALG2 -SIGALG1 $SIGALG1 -SIGALG2 $SIGALG2
90+
Create-Composite-EE -OUTDIR $OUTDIR -KEYALG1 $KEYALG1 -KEYALG2 $KEYALG2 -SIGALG1 $SIGALG1 -SIGALG2 $SIGALG2
91+
Create-Composite-CRLs -OUTDIR $OUTDIR -SIGALG1 $SIGALG1 -SIGALG2 $SIGALG2
92+
}
93+
94+
95+
96+
97+
#Create -OUTDIR $OUTDIR\"1.3.6.1.4.1.2.267.7.4.4" -KEYALG "Dilithium2" -SIGALG "Dilithium2"
98+
#Create -OUTDIR $OUTDIR\"1.3.6.1.4.1.2.267.7.6.5" -KEYALG "Dilithium3" -SIGALG "Dilithium3"
99+
#Create -OUTDIR $OUTDIR\"1.3.6.1.4.1.2.267.7.8.7" -KEYALG "Dilithium5" -SIGALG "Dilithium5"
100+
#Create -OUTDIR $OUTDIR\"1.3.6.1.4.1.2.267.11.4.4" -KEYALG "Dilithium2-AES" -SIGALG "Dilithium2-AES"
101+
#Create -OUTDIR $OUTDIR\"1.3.6.1.4.1.2.267.11.6.5" -KEYALG "Dilithium3-AES" -SIGALG "Dilithium3-AES"
102+
#Create -OUTDIR $OUTDIR\"1.3.6.1.4.1.2.267.11.8.7" -KEYALG "Dilithium5-AES" -SIGALG "Dilithium5-AES"
103+
#Create -OUTDIR $OUTDIR\"1.3.9999.3.1" -KEYALG "Falcon-512" -SIGALG "Falcon-512"
104+
#Create -OUTDIR $OUTDIR\"1.3.9999.3.4" -KEYALG "Falcon-1024" -SIGALG "Falcon-1024"
105+
106+
# @John -- these ones throw an error in the toolkit about key length. You'll need to debug that.
107+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.4.1" -KEYALG "SPHINCS+-SHA256-128f-robust" -SIGALG "SPHINCS+-SHA256-128f-robust"
108+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.4.4" -KEYALG "SPHINCS+-SHA256-128f-simple" -SIGALG "SPHINCS+-SHA256-128f-simple"
109+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.4.7" -KEYALG "SPHINCS+-SHA256-128s-robust" -SIGALG "SPHINCS+-SHA256-128s-robust"
110+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.4.10" -KEYALG "SPHINCS+-SHA256-128s-simple" -SIGALG "SPHINCS+-SHA256-128s-simple"
111+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.5.1" -KEYALG "SPHINCS+-SHA256-192f-robust" -SIGALG "SPHINCS+-SHA256-192f-robust"
112+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.5.3" -KEYALG "SPHINCS+-SHA256-192f-simple" -SIGALG "SPHINCS+-SHA256-192f-simple"
113+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.5.5" -KEYALG "SPHINCS+-SHA256-192s-robust" -SIGALG "SPHINCS+-SHA256-192s-robust"
114+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.5.7" -KEYALG "SPHINCS+-SHA256-192s-simple" -SIGALG "SPHINCS+-SHA256-192s-simple"
115+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.6.1" -KEYALG "SPHINCS+-SHA256-256f-robust" -SIGALG "SPHINCS+-SHA256-256f-robust"
116+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.6.3" -KEYALG "SPHINCS+-SHA256-256f-simple" -SIGALG "SPHINCS+-SHA256-256f-simple"
117+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.6.5" -KEYALG "SPHINCS+-SHA256-256s-robust" -SIGALG "SPHINCS+-SHA256-256s-robust"
118+
# Create -OUTDIR $OUTDIR\"1.3.9999.6.6.7" -KEYALG "SPHINCS+-SHA256-256s-simple" -SIGALG "SPHINCS+-SHA256-256s-simple"
119+
120+
121+
Create-Composite -OUTDIR $OUTDIR\"2.16.840.1.114027.80.4.1" -KEYALG1 "Dilithium3" -KEYALG2 "ECDSA P-256" -SIGALG1 "Dilithium3" -SIGALG2 "SHA256withECDSA"
122+
123+
# TODO: @John add explicit composites
124+
125+
126+
# zip it up
127+
Compress-Archive -Force -Path "$OUTDIR\*" -DestinationPath "$OUTDIR.zip"
16 Bytes
Binary file not shown.

src/pqc_report_writer.py

+1-1
Original file line numberDiff line numberDiff line change
@@ -111,7 +111,7 @@ def main():
111111
m = _FILENAME_REGEX.match(os.path.basename(file))
112112

113113
if m is None:
114-
raise ValueError(f'Invalid file name: "{file}"')
114+
raise ValueError(f'File name does not match naming convention: "{os.path.basename(file)}"')
115115

116116
with open(file, 'r') as f:
117117
generator = m['generator']

0 commit comments

Comments
 (0)