Skip to content

Commit 5a7df23

Browse files
committed
Enable v6 signature tests in rpm
Signed-off-by: Jakub Jelen <[email protected]>
1 parent e17bf16 commit 5a7df23

1 file changed

Lines changed: 75 additions & 0 deletions

File tree

tests/rpm.patch

Lines changed: 75 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -10,3 +10,78 @@ index 68e63c862..d4166fedb 100644
1010
RPMTEST_CHECK([[
1111
runroot rpmbuild -bs --quiet \
1212
--define "_source_filedigest_algorithm 12" \
13+
diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at
14+
index d0154aeec..dd7bc37ff 100644
15+
--- a/tests/rpmsigdig.at
16+
+++ b/tests/rpmsigdig.at
17+
@@ -2402,20 +2402,20 @@ runroot rpmsign --addsign --rpmv6 /tmp/hello-2.0-1.x86_64.rpm
18+
# In addition, rpm-sequoia 1.8 doesn't handle the v6 trailer so it's BAD
19+
# instead of NOKEY.
20+
# Header OpenPGP V6 Ed25519/SHA512 signature, key ID 0e00df3ed2d7b65e: BAD
21+
-#RPMTEST_CHECK([
22+
-#runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
23+
-#],
24+
-#[0],
25+
-#[/tmp/hello-2.0-1.x86_64.rpm:
26+
-# Header OpenPGP V6 Ed25519/SHA512 signature, key ID 6118abe481c41473: NOKEY
27+
-# Header OpenPGP RSA signature: NOTFOUND
28+
-# Header OpenPGP DSA signature: NOTFOUND
29+
-# Header SHA256 digest: OK
30+
-# Payload SHA256 digest: OK
31+
-# Legacy OpenPGP RSA signature: NOTFOUND
32+
-# Legacy OpenPGP DSA signature: NOTFOUND
33+
-#],
34+
-#[])
35+
+RPMTEST_CHECK([
36+
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
37+
+],
38+
+[0],
39+
+[/tmp/hello-2.0-1.x86_64.rpm:
40+
+ Header OpenPGP V6 Ed25519/SHA512 signature, key ID 6118abe481c41473: NOKEY
41+
+ Header OpenPGP RSA signature: NOTFOUND
42+
+ Header OpenPGP DSA signature: NOTFOUND
43+
+ Header SHA256 digest: OK
44+
+ Payload SHA256 digest: OK
45+
+ Legacy OpenPGP RSA signature: NOTFOUND
46+
+ Legacy OpenPGP DSA signature: NOTFOUND
47+
+],
48+
+[])
49+
50+
RPMTEST_CHECK([
51+
runroot rpmkeys --import /data/keys/rpm.org-v6-ed25519-test.asc
52+
@@ -2433,20 +2433,20 @@ runroot rpmkeys --list 036824f0ac60aed6f1a3256f88190469f6d7255e3d8e41c577233aa03
53+
[])
54+
55+
# This is currently failing, see the NOKEY case above
56+
-#RPMTEST_CHECK([
57+
-#runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
58+
-#],
59+
-#[0],
60+
-#[/tmp/hello-2.0-1.x86_64.rpm:
61+
-# Header OpenPGP V6 Ed25519/SHA512 signature, key fingerprint 036824f0ac60aed6f1a3256f88190469f6d7255e3d8e41c577233aa03e0bb9d3 OK
62+
-# Header OpenPGP RSA signature: NOTFOUND
63+
-# Header OpenPGP DSA signature: NOTFOUND
64+
-# Header SHA256 digest: OK
65+
-# Payload SHA256 digest: OK
66+
-# Legacy OpenPGP RSA signature: NOTFOUND
67+
-# Legacy OpenPGP DSA signature: NOTFOUND
68+
-#],
69+
-#[])
70+
+RPMTEST_CHECK([
71+
+runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
72+
+],
73+
+[0],
74+
+[/tmp/hello-2.0-1.x86_64.rpm:
75+
+ Header OpenPGP V6 Ed25519/SHA512 signature, key fingerprint 036824f0ac60aed6f1a3256f88190469f6d7255e3d8e41c577233aa03e0bb9d3 OK
76+
+ Header OpenPGP RSA signature: NOTFOUND
77+
+ Header OpenPGP DSA signature: NOTFOUND
78+
+ Header SHA256 digest: OK
79+
+ Payload SHA256 digest: OK
80+
+ Legacy OpenPGP RSA signature: NOTFOUND
81+
+ Legacy OpenPGP DSA signature: NOTFOUND
82+
+],
83+
+[])
84+
85+
RPMTEST_CHECK([
86+
runroot rpmkeys --delete 036824f0ac60aed6f1a3256f88190469f6d7255e3d8e41c577233aa03e0bb9d3
87+

0 commit comments

Comments
 (0)