Skip to content

Commit fe6f30f

Browse files
ffestiffesti
committed
Fix tests
Output format and cli is different between rpm 6 and 4.20. Adjust the test to work with 4.20. * Use macros.rpmsign-sequoia to sign packages with sequoia. * Redirect output of rpmsign --addsign to /dev/null as everywhere else * Use short key IDs instead of long key IDs and fingerprints. * Add SHA1 and MD5 digests
1 parent e28f8ea commit fe6f30f

File tree

1 file changed

+52
-35
lines changed

1 file changed

+52
-35
lines changed

‎tests/rpmsigdig.at‎

Lines changed: 52 additions & 35 deletions
Original file line numberDiff line numberDiff line change
@@ -307,7 +307,7 @@ runroot rpmkeys --define '_pkgverify_level all' -Kv --nosignature /data/RPMS/hel
307307
[0],
308308
[[Checking package before importing key:
309309
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm:
310-
Header V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY
310+
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY
311311
Header signature: NOTFOUND
312312
Header DSA signature: NOTFOUND
313313
Header SHA256 digest: OK
@@ -372,7 +372,7 @@ runroot rpmkeys --define '_pkgverify_level all' -Kv --nosignature /data/RPMS/hel
372372
[0],
373373
[Checking package before importing key:
374374
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm:
375-
Header V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY
375+
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY
376376
Header signature: NOTFOUND
377377
Header DSA signature: NOTFOUND
378378
Header SHA256 digest: OK
@@ -393,7 +393,7 @@ RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650
393393
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 invalid: key is not alive])dnl
394394
RPMOUTPUT_SEQUOIA([ because: The subkey is not live])dnl
395395
RPMOUTPUT_SEQUOIA([ because: Expired on 2022-04-12T00:00:15Z])dnl
396-
Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED
396+
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED
397397
Header signature: NOTFOUND
398398
Header DSA signature: NOTFOUND
399399
Header SHA256 digest: OK
@@ -410,7 +410,7 @@ RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650
410410
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 invalid: key is not alive])dnl
411411
RPMOUTPUT_SEQUOIA([ because: The subkey is not live])dnl
412412
RPMOUTPUT_SEQUOIA([ because: Expired on 2022-04-12T00:00:15Z])dnl
413-
Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED
413+
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED
414414
Header signature: NOTFOUND
415415
Header DSA signature: NOTFOUND
416416
RSA signature: NOTFOUND
@@ -451,7 +451,7 @@ runroot rpmkeys --define '_pkgverify_level all' -Kv --nosignature /data/RPMS/hel
451451
[0],
452452
[Checking package before importing key:
453453
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm:
454-
Header V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY
454+
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY
455455
Header signature: NOTFOUND
456456
Header DSA signature: NOTFOUND
457457
Header SHA256 digest: OK
@@ -470,7 +470,7 @@ Checking package after importing key:
470470
RPMOUTPUT_LEGACY([error: Subkey 1f71177215217ee0 of key b3a771bfeb04e625 (Alice <[email protected]>) has been revoked])dnl
471471
RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650C36B6F41BCB3A771BFEB04E625 (Alice <[email protected]>):])dnl
472472
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 is invalid: key is revoked])dnl
473-
Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED
473+
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED
474474
Header signature: NOTFOUND
475475
Header DSA signature: NOTFOUND
476476
Header SHA256 digest: OK
@@ -485,7 +485,7 @@ Checking package after importing key, no digest:
485485
RPMOUTPUT_LEGACY([error: Subkey 1f71177215217ee0 of key b3a771bfeb04e625 (Alice <[email protected]>) has been revoked])dnl
486486
RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650C36B6F41BCB3A771BFEB04E625 (Alice <[email protected]>):])dnl
487487
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 is invalid: key is revoked])dnl
488-
Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED
488+
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED
489489
Header signature: NOTFOUND
490490
Header DSA signature: NOTFOUND
491491
RSA signature: NOTFOUND
@@ -1067,11 +1067,11 @@ AT_SKIP_IF([test x$PGP = xdummy])
10671067
RPMDB_INIT
10681068

10691069
RPMTEST_CHECK([
1070+
RPM_DOCDIR=$(runroot rpm --eval '%_defaultdocdir')
1071+
cat "${RPMTEST}${RPM_DOCDIR}/rpm/macros.rpmsign-sequoia" >> ${HOME}/.rpmmacros
10701072
cat << EOF >> ${HOME}/.rpmmacros
1071-
%_openpgp_sign sq
1072-
%_openpgp_sign_id 771B18D3D7BAA28734333C424344591E1964C5FC
1073+
%_gpg_name 771B18D3D7BAA28734333C424344591E1964C5FC
10731074
EOF
1074-
10751075
runroot_other sq key import /data/keys/*.secret
10761076
],
10771077
[0],
@@ -1094,29 +1094,31 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest
10941094
],
10951095
[0],
10961096
[SIGN
1097-
/tmp/hello-2.0-1.x86_64.rpm
1097+
/tmp/hello-2.0-1.x86_64.rpm:
10981098
PRE-IMPORT
10991099
/tmp/hello-2.0-1.x86_64.rpm:
1100-
Header V4 RSA/SHA512 signature, key ID 4344591e1964c5fc: NOKEY
1100+
Header V4 RSA/SHA512 Signature, key ID 1964c5fc: NOKEY
11011101
POST-IMPORT
11021102
/tmp/hello-2.0-1.x86_64.rpm:
1103-
Header V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK
1103+
Header V4 RSA/SHA512 Signature, key ID 1964c5fc: OK
11041104
DELSIGN
1105-
/tmp/hello-2.0-1.x86_64.rpm
1105+
/tmp/hello-2.0-1.x86_64.rpm:
11061106
POST-DELSIGN
11071107
/tmp/hello-2.0-1.x86_64.rpm:
11081108
],
11091109
[ignore])
11101110

11111111
RPMTEST_CHECK([
1112-
runroot rpmsign --addsign --key-id 152bb32fd9ca982797e835cfb0645aec757bf69e /tmp/hello-2.0-1.x86_64.rpm
1112+
runroot rpmsign --addsign --key-id 152bb32fd9ca982797e835cfb0645aec757bf69e /tmp/hello-2.0-1.x86_64.rpm > /dev/null
11131113
runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
11141114
],
11151115
[1],
11161116
[/tmp/hello-2.0-1.x86_64.rpm:
1117-
Header V4 EdDSA/SHA512 signature, key ID b0645aec757bf69e: NOKEY
1117+
Header V4 EdDSA/SHA512 Signature, key ID 757bf69e: NOKEY
11181118
Header SHA256 digest: OK
1119+
Header SHA1 digest: OK
11191120
Payload SHA256 digest: OK
1121+
MD5 digest: OK
11201122
],
11211123
[ignore])
11221124
RPMTEST_CLEANUP
@@ -1127,9 +1129,10 @@ AT_SKIP_IF([test x$PGP = xdummy])
11271129
RPMDB_INIT
11281130

11291131
RPMTEST_CHECK([
1132+
RPM_DOCDIR=$(runroot rpm --eval '%_defaultdocdir')
1133+
cat "${RPMTEST}${RPM_DOCDIR}/rpm/macros.rpmsign-sequoia" >> ${HOME}/.rpmmacros
11301134
cat << EOF >> ${HOME}/.rpmmacros
1131-
%_openpgp_sign sq
1132-
%_openpgp_sign_id 771B18D3D7BAA28734333C424344591E1964C5FC
1135+
%_gpg_name 771B18D3D7BAA28734333C424344591E1964C5FC
11331136
EOF
11341137

11351138
runroot_other sq key import /data/keys/*.secret
@@ -1146,9 +1149,11 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
11461149
],
11471150
[0],
11481151
[/tmp/hello-2.0-1.x86_64.rpm:
1149-
Header V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK
1152+
Header V4 RSA/SHA512 Signature, key ID 1964c5fc: OK
11501153
Header SHA256 digest: OK
1154+
Header SHA1 digest: OK
11511155
Payload SHA256 digest: OK
1156+
MD5 digest: OK
11521157
],
11531158
[])
11541159

@@ -1159,9 +1164,11 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
11591164
],
11601165
[0],
11611166
[/tmp/hello-2.0-1.x86_64.rpm:
1162-
Header V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK
1167+
Header V4 RSA/SHA512 Signature, key ID 1964c5fc: OK
11631168
Header SHA256 digest: OK
1169+
Header SHA1 digest: OK
11641170
Payload SHA256 digest: OK
1171+
MD5 digest: OK
11651172
],
11661173
[])
11671174

@@ -1171,10 +1178,12 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
11711178
],
11721179
[0],
11731180
[/tmp/hello-2.0-1.x86_64.rpm:
1174-
Header V4 EdDSA/SHA512 signature, key fingerprint: 152bb32fd9ca982797e835cfb0645aec757bf69e: OK
1175-
Header V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK
1181+
Header V4 EdDSA/SHA512 Signature, key ID 757bf69e: OK
1182+
Header V4 RSA/SHA512 Signature, key ID 1964c5fc: OK
11761183
Header SHA256 digest: OK
1184+
Header SHA1 digest: OK
11771185
Payload SHA256 digest: OK
1186+
MD5 digest: OK
11781187
],
11791188
[])
11801189

@@ -1184,25 +1193,29 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
11841193
],
11851194
[0],
11861195
[/tmp/hello-2.0-1.x86_64.rpm:
1187-
Header V4 ECDSA/SHA512 signature, key fingerprint: e8a62c0512b06b5d2183ba207f1c21f95f65bbe8: OK
1188-
Header V4 EdDSA/SHA512 signature, key fingerprint: 152bb32fd9ca982797e835cfb0645aec757bf69e: OK
1189-
Header V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK
1196+
Header V4 ECDSA/SHA512 Signature, key ID 5f65bbe8: OK
1197+
Header V4 EdDSA/SHA512 Signature, key ID 757bf69e: OK
1198+
Header V4 RSA/SHA512 Signature, key ID 1964c5fc: OK
11901199
Header SHA256 digest: OK
1200+
Header SHA1 digest: OK
11911201
Payload SHA256 digest: OK
1202+
MD5 digest: OK
11921203
],
11931204
[])
11941205

11951206
RPMTEST_CHECK([
1196-
runroot rpmkeys --delete 152bb32fd9ca982797e835cfb0645aec757bf69e
1207+
runroot rpmkeys --delete 757bf69e-661d22a8
11971208
runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
11981209
],
11991210
[1],
12001211
[/tmp/hello-2.0-1.x86_64.rpm:
1201-
Header V4 ECDSA/SHA512 signature, key fingerprint: e8a62c0512b06b5d2183ba207f1c21f95f65bbe8: OK
1202-
Header V4 EdDSA/SHA512 signature, key ID b0645aec757bf69e: NOKEY
1203-
Header V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK
1212+
Header V4 ECDSA/SHA512 Signature, key ID 5f65bbe8: OK
1213+
Header V4 EdDSA/SHA512 Signature, key ID 757bf69e: NOKEY
1214+
Header V4 RSA/SHA512 Signature, key ID 1964c5fc: OK
12041215
Header SHA256 digest: OK
1216+
Header SHA1 digest: OK
12051217
Payload SHA256 digest: OK
1218+
MD5 digest: OK
12061219
],
12071220
[])
12081221

@@ -1212,9 +1225,11 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
12121225
],
12131226
[0],
12141227
[/tmp/hello-2.0-1.x86_64.rpm:
1215-
Header V4 ECDSA/SHA512 signature, key fingerprint: e8a62c0512b06b5d2183ba207f1c21f95f65bbe8: OK
1228+
Header V4 ECDSA/SHA512 Signature, key ID 5f65bbe8: OK
12161229
Header SHA256 digest: OK
1230+
Header SHA1 digest: OK
12171231
Payload SHA256 digest: OK
1232+
MD5 digest: OK
12181233
],
12191234
[])
12201235

@@ -1225,7 +1240,9 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm
12251240
[0],
12261241
[/tmp/hello-2.0-1.x86_64.rpm:
12271242
Header SHA256 digest: OK
1243+
Header SHA1 digest: OK
12281244
Payload SHA256 digest: OK
1245+
MD5 digest: OK
12291246
],
12301247
[])
12311248

@@ -1237,9 +1254,10 @@ AT_SKIP_IF([test x$PGP = xdummy])
12371254
RPMDB_INIT
12381255

12391256
RPMTEST_CHECK([
1257+
RPM_DOCDIR=$(runroot rpm --eval '%_defaultdocdir')
1258+
cat "${RPMTEST}${RPM_DOCDIR}/rpm/macros.rpmsign-sequoia" >> ${HOME}/.rpmmacros
12401259
cat << EOF >> ${HOME}/.rpmmacros
1241-
%_openpgp_sign sq
1242-
%_openpgp_sign_id 771B18D3D7BAA28734333C424344591E1964C5FC
1260+
%_gpg_name 771B18D3D7BAA28734333C424344591E1964C5FC
12431261
EOF
12441262

12451263
runroot_other sq key import /data/keys/*.secret
@@ -1253,7 +1271,7 @@ RPMTEST_CHECK([
12531271
runroot rpmbuild -bb --quiet \
12541272
--define "_rpmfilever 6" \
12551273
/data/SPECS/attrtest.spec
1256-
runroot rpmsign --addsign /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
1274+
runroot rpmsign --addsign /build/RPMS/noarch/attrtest-1.0-1.noarch.rpm > /dev/null
12571275
],
12581276
[0],
12591277
[],
@@ -1274,7 +1292,6 @@ done
12741292
],
12751293
[ignore],
12761294
[DSAHEADER: (none)
1277-
RSAHEADER: (none)
12781295
SIGGPG: (none)
12791296
SIGPGP: (none)
12801297
],
@@ -1283,7 +1300,7 @@ SIGPGP: (none)
12831300
RPMTEST_CHECK([
12841301
runroot rpmsign --resign --rpmv4 \
12851302
--key-id E8A62C0512B06B5D2183BA207F1C21F95F65BBE8 \
1286-
/build/RPMS/noarch/attrtest-1.0-1.noarch.rpm
1303+
/build/RPMS/noarch/attrtest-1.0-1.noarch.rpm > /dev/null
12871304
],
12881305
[0],
12891306
[],

0 commit comments

Comments
 (0)