Skip to content

Commit 0149fa9

Browse files
committed
Updated compat matrices
1 parent f0ec2a5 commit 0149fa9

File tree

6 files changed

+147
-5
lines changed

6 files changed

+147
-5
lines changed

providers/ossl35/check_certs.sh

+5-5
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@ if [[ $# != 1 ]]; then die 'Usage: %s <zipfile>\n' "$0"; fi
66
xxd -p </dev/null || die 'Missing xxd command\n'
77

88
case $(openssl version -v) in
9-
"OpenSSL 3.5".*) : ;;
9+
"OpenSSL 3".[56].*) : ;;
1010
*) die 'Unsupported OpenSSL version\n';;
1111
esac
1212

@@ -55,7 +55,7 @@ check_keys() {
5555
fi;;
5656
ta) openssl x509 -in "$obj" -pubkey -noout |
5757
openssl pkey -pubin -pubout -outform DER -out "$pubout" &&
58-
openssl verify -verify_depth 0 -trusted "$obj" "$obj" >/dev/null &&
58+
openssl verify -verify_depth 0 -check_ss_sig -trusted "$obj" "$obj" >/dev/null &&
5959
ta_file="$obj" &&
6060
dgst=$(openssl dgst -sha256 -binary < "$pubout" | xxd -p -c32) &&
6161
pubs=("${pubs[@]}" "$dgst") &&
@@ -68,10 +68,10 @@ check_keys() {
6868
pubs=("${pubs[@]}" "$dgst") &&
6969
printf "%s,%s,%s\n" "${oid}" "cert" "Y" ||
7070
printf "%s,%s,%s\n" "${oid}" "cert" "N";;
71-
*) openssl pkey -in "$obj" -pubout -outform DER -out "$pubout" &&
71+
*) openssl pkey -inform DER -in "$obj" -pubout -outform DER -out "$pubout" &&
7272
if [[ -n "$sigfile" ]]; then
73-
openssl pkeyutl -sign -rawin -inkey "$obj" -in "$ptext" -out "$sigfile" &&
74-
openssl pkeyutl -verify -rawin -in "$ptext" -pubin -inkey "$pubout" \
73+
openssl pkeyutl -sign -rawin -keyform DER -inkey "$obj" -in "$ptext" -out "$sigfile" &&
74+
openssl pkeyutl -verify -rawin -in "$ptext" -keyform DER -pubin -inkey "$pubout" \
7575
-sigfile "$sigfile" >/dev/null
7676
elif [[ -n "$ct_file" && -n "$ss_file" ]]; then
7777
cmp -s "$ss_file" <(
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,61 @@
1+
key_algorithm_oid,type,test_result
2+
2.16.840.1.101.3.4.3.21,priv,Y
3+
2.16.840.1.101.3.4.3.21,cert,Y
4+
2.16.840.1.101.3.4.3.21,consistent,Y
5+
2.16.840.1.101.3.4.3.20,priv,Y
6+
2.16.840.1.101.3.4.3.20,cert,Y
7+
2.16.840.1.101.3.4.3.20,consistent,Y
8+
2.16.840.1.101.3.4.3.27,priv,Y
9+
2.16.840.1.101.3.4.3.27,cert,Y
10+
2.16.840.1.101.3.4.3.27,consistent,Y
11+
2.16.840.1.101.3.4.3.26,priv,Y
12+
2.16.840.1.101.3.4.3.26,cert,Y
13+
2.16.840.1.101.3.4.3.26,consistent,Y
14+
2.16.840.1.101.3.4.3.17,seed,Y
15+
2.16.840.1.101.3.4.3.17,expandedkey,Y
16+
2.16.840.1.101.3.4.3.17,cert,Y
17+
2.16.840.1.101.3.4.3.17,consistent,Y
18+
2.16.840.1.101.3.4.4.1,seed,Y
19+
2.16.840.1.101.3.4.4.1,expandedkey,Y
20+
2.16.840.1.101.3.4.4.1,cert,Y
21+
2.16.840.1.101.3.4.4.1,consistent,Y
22+
2.16.840.1.101.3.4.3.23,priv,Y
23+
2.16.840.1.101.3.4.3.23,cert,Y
24+
2.16.840.1.101.3.4.3.23,consistent,Y
25+
2.16.840.1.101.3.4.3.22,priv,Y
26+
2.16.840.1.101.3.4.3.22,cert,Y
27+
2.16.840.1.101.3.4.3.22,consistent,Y
28+
2.16.840.1.101.3.4.3.29,priv,Y
29+
2.16.840.1.101.3.4.3.29,cert,Y
30+
2.16.840.1.101.3.4.3.29,consistent,Y
31+
2.16.840.1.101.3.4.3.28,priv,Y
32+
2.16.840.1.101.3.4.3.28,cert,Y
33+
2.16.840.1.101.3.4.3.28,consistent,Y
34+
2.16.840.1.101.3.4.3.18,seed,Y
35+
2.16.840.1.101.3.4.3.18,expandedkey,Y
36+
2.16.840.1.101.3.4.3.18,cert,Y
37+
2.16.840.1.101.3.4.3.18,consistent,Y
38+
2.16.840.1.101.3.4.4.2,seed,Y
39+
2.16.840.1.101.3.4.4.2,expandedkey,Y
40+
2.16.840.1.101.3.4.4.2,cert,Y
41+
2.16.840.1.101.3.4.4.2,consistent,Y
42+
2.16.840.1.101.3.4.3.25,priv,Y
43+
2.16.840.1.101.3.4.3.25,cert,Y
44+
2.16.840.1.101.3.4.3.25,consistent,Y
45+
2.16.840.1.101.3.4.3.24,priv,Y
46+
2.16.840.1.101.3.4.3.24,cert,Y
47+
2.16.840.1.101.3.4.3.24,consistent,Y
48+
2.16.840.1.101.3.4.3.31,priv,Y
49+
2.16.840.1.101.3.4.3.31,cert,Y
50+
2.16.840.1.101.3.4.3.31,consistent,Y
51+
2.16.840.1.101.3.4.3.30,priv,Y
52+
2.16.840.1.101.3.4.3.30,cert,Y
53+
2.16.840.1.101.3.4.3.30,consistent,Y
54+
2.16.840.1.101.3.4.3.19,seed,Y
55+
2.16.840.1.101.3.4.3.19,expandedkey,Y
56+
2.16.840.1.101.3.4.3.19,cert,Y
57+
2.16.840.1.101.3.4.3.19,consistent,Y
58+
2.16.840.1.101.3.4.4.3,seed,Y
59+
2.16.840.1.101.3.4.4.3,expandedkey,Y
60+
2.16.840.1.101.3.4.4.3,cert,Y
61+
2.16.840.1.101.3.4.4.3,consistent,Y
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,52 @@
1+
key_algorithm_oid,type,test_result
2+
2.16.840.1.101.3.4.3.21,priv,Y
3+
2.16.840.1.101.3.4.3.21,cert,Y
4+
2.16.840.1.101.3.4.3.21,consistent,Y
5+
2.16.840.1.101.3.4.3.20,priv,Y
6+
2.16.840.1.101.3.4.3.20,cert,Y
7+
2.16.840.1.101.3.4.3.20,consistent,Y
8+
2.16.840.1.101.3.4.3.27,priv,Y
9+
2.16.840.1.101.3.4.3.27,cert,Y
10+
2.16.840.1.101.3.4.3.27,consistent,Y
11+
2.16.840.1.101.3.4.3.26,priv,Y
12+
2.16.840.1.101.3.4.3.26,cert,Y
13+
2.16.840.1.101.3.4.3.26,consistent,Y
14+
2.16.840.1.101.3.4.3.17,seed,Y
15+
2.16.840.1.101.3.4.3.17,expandedkey,Y
16+
2.16.840.1.101.3.4.3.17,both,Y
17+
2.16.840.1.101.3.4.3.17,cert,Y
18+
2.16.840.1.101.3.4.3.17,consistent,Y
19+
2.16.840.1.101.3.4.3.23,priv,Y
20+
2.16.840.1.101.3.4.3.23,cert,Y
21+
2.16.840.1.101.3.4.3.23,consistent,Y
22+
2.16.840.1.101.3.4.3.22,priv,Y
23+
2.16.840.1.101.3.4.3.22,cert,Y
24+
2.16.840.1.101.3.4.3.22,consistent,Y
25+
2.16.840.1.101.3.4.3.29,priv,Y
26+
2.16.840.1.101.3.4.3.29,cert,Y
27+
2.16.840.1.101.3.4.3.29,consistent,Y
28+
2.16.840.1.101.3.4.3.28,priv,Y
29+
2.16.840.1.101.3.4.3.28,cert,Y
30+
2.16.840.1.101.3.4.3.28,consistent,Y
31+
2.16.840.1.101.3.4.3.18,seed,Y
32+
2.16.840.1.101.3.4.3.18,expandedkey,Y
33+
2.16.840.1.101.3.4.3.18,both,Y
34+
2.16.840.1.101.3.4.3.18,cert,Y
35+
2.16.840.1.101.3.4.3.18,consistent,Y
36+
2.16.840.1.101.3.4.3.25,priv,Y
37+
2.16.840.1.101.3.4.3.25,cert,Y
38+
2.16.840.1.101.3.4.3.25,consistent,Y
39+
2.16.840.1.101.3.4.3.24,priv,Y
40+
2.16.840.1.101.3.4.3.24,cert,Y
41+
2.16.840.1.101.3.4.3.24,consistent,Y
42+
2.16.840.1.101.3.4.3.31,priv,Y
43+
2.16.840.1.101.3.4.3.31,cert,Y
44+
2.16.840.1.101.3.4.3.31,consistent,Y
45+
2.16.840.1.101.3.4.3.30,priv,Y
46+
2.16.840.1.101.3.4.3.30,cert,Y
47+
2.16.840.1.101.3.4.3.30,consistent,Y
48+
2.16.840.1.101.3.4.3.19,seed,Y
49+
2.16.840.1.101.3.4.3.19,expandedkey,Y
50+
2.16.840.1.101.3.4.3.19,both,Y
51+
2.16.840.1.101.3.4.3.19,cert,Y
52+
2.16.840.1.101.3.4.3.19,consistent,Y
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,15 @@
1+
2.16.840.1.101.3.4.3.17,seed,Y
2+
2.16.840.1.101.3.4.3.17,expandedkey,Y
3+
2.16.840.1.101.3.4.3.17,both,Y
4+
2.16.840.1.101.3.4.3.17,cert,Y
5+
2.16.840.1.101.3.4.3.17,consistent,Y
6+
2.16.840.1.101.3.4.3.18,seed,Y
7+
2.16.840.1.101.3.4.3.18,expandedkey,Y
8+
2.16.840.1.101.3.4.3.18,both,Y
9+
2.16.840.1.101.3.4.3.18,cert,Y
10+
2.16.840.1.101.3.4.3.18,consistent,Y
11+
2.16.840.1.101.3.4.3.19,seed,Y
12+
2.16.840.1.101.3.4.3.19,expandedkey,Y
13+
2.16.840.1.101.3.4.3.19,both,Y
14+
2.16.840.1.101.3.4.3.19,cert,Y
15+
2.16.840.1.101.3.4.3.19,consistent,Y
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,9 @@
1+
2.16.840.1.101.3.4.3.17,both,Y
2+
2.16.840.1.101.3.4.3.17,cert,Y
3+
2.16.840.1.101.3.4.3.17,consistent,Y
4+
2.16.840.1.101.3.4.3.18,both,Y
5+
2.16.840.1.101.3.4.3.18,cert,Y
6+
2.16.840.1.101.3.4.3.18,consistent,Y
7+
2.16.840.1.101.3.4.3.19,both,Y
8+
2.16.840.1.101.3.4.3.19,cert,Y
9+
2.16.840.1.101.3.4.3.19,consistent,Y
Original file line numberDiff line numberDiff line change
@@ -0,0 +1,5 @@
1+
2.16.840.1.101.3.4.3.17,expandedkey,N
2+
2.16.840.1.101.3.4.3.17,cert,Y
3+
2.16.840.1.101.3.4.3.18,expandedkey,N
4+
2.16.840.1.101.3.4.3.18,cert,Y
5+
2.16.840.1.101.3.4.3.19,cert,Y

0 commit comments

Comments
 (0)