-
Notifications
You must be signed in to change notification settings - Fork 364
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
Fix sinfoCmp to order signatures correctly
This requires adjusting a number of test that reflect the ordering. The changes in tests/rpmsigdig.at look straight forward and correct - just changing the order in which the signatures and checksums are presented. The changes in tests/rpmi.at seem to drop the relevant information. This might be accidental as the code just returns the first issue found. But "no signature" seems kinda weird result when before it complaint about a specific signature. The next patch tries to fix that. Resolves: #3185
- Loading branch information
Showing
4 changed files
with
24 additions
and
24 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
|
@@ -308,13 +308,13 @@ runroot rpmkeys --define '_pkgverify_level all' -Kv --nosignature /data/RPMS/hel | |
[0], | ||
[[Checking package before importing key: | ||
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY | ||
Header DSA signature: NOTFOUND | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY | ||
Header SHA256 digest: OK | ||
Header SHA1 digest: OK | ||
Payload SHA256 digest: OK | ||
RSA signature: NOTFOUND | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
MD5 digest: OK | ||
1 | ||
Importing key: | ||
|
@@ -334,8 +334,8 @@ Checking package after importing key, no digest: | |
Header V4 RSA/SHA512 Signature, key ID 15217ee0: OK | ||
Payload SHA256 digest: NOTFOUND | ||
Payload SHA256 ALT digest: NOTFOUND | ||
RSA signature: NOTFOUND | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
1 | ||
Checking package after importing key, no signature: | ||
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: | ||
|
@@ -372,13 +372,13 @@ runroot rpmkeys --define '_pkgverify_level all' -Kv --nosignature /data/RPMS/hel | |
[0], | ||
[Checking package before importing key: | ||
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY | ||
Header DSA signature: NOTFOUND | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY | ||
Header SHA256 digest: OK | ||
Header SHA1 digest: OK | ||
Payload SHA256 digest: OK | ||
RSA signature: NOTFOUND | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
MD5 digest: OK | ||
1 | ||
Importing key: | ||
|
@@ -392,13 +392,13 @@ RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650 | |
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 invalid: key is not alive])dnl | ||
RPMOUTPUT_SEQUOIA([ because: The subkey is not live])dnl | ||
RPMOUTPUT_SEQUOIA([ because: Expired on 2022-04-12T00:00:15Z])dnl | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
Header DSA signature: NOTFOUND | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
Header SHA256 digest: OK | ||
Header SHA1 digest: OK | ||
Payload SHA256 digest: OK | ||
RSA signature: NOTFOUND | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
MD5 digest: OK | ||
1 | ||
Checking package after importing key, no digest: | ||
|
@@ -408,10 +408,10 @@ RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650 | |
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 invalid: key is not alive])dnl | ||
RPMOUTPUT_SEQUOIA([ because: The subkey is not live])dnl | ||
RPMOUTPUT_SEQUOIA([ because: Expired on 2022-04-12T00:00:15Z])dnl | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
Header DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
1 | ||
Checking package after importing key, no signature: | ||
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: | ||
|
@@ -448,13 +448,13 @@ runroot rpmkeys --define '_pkgverify_level all' -Kv --nosignature /data/RPMS/hel | |
[0], | ||
[Checking package before importing key: | ||
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY | ||
Header DSA signature: NOTFOUND | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOKEY | ||
Header SHA256 digest: OK | ||
Header SHA1 digest: OK | ||
Payload SHA256 digest: OK | ||
RSA signature: NOTFOUND | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
MD5 digest: OK | ||
1 | ||
Importing key: | ||
|
@@ -466,24 +466,24 @@ Checking package after importing key: | |
RPMOUTPUT_LEGACY([error: Subkey 1f71177215217ee0 of key b3a771bfeb04e625 (Alice <[email protected]>) has been revoked])dnl | ||
RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650C36B6F41BCB3A771BFEB04E625 (Alice <[email protected]>):])dnl | ||
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 is invalid: key is revoked])dnl | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
Header DSA signature: NOTFOUND | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
Header SHA256 digest: OK | ||
Header SHA1 digest: OK | ||
Payload SHA256 digest: OK | ||
RSA signature: NOTFOUND | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
MD5 digest: OK | ||
1 | ||
Checking package after importing key, no digest: | ||
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: | ||
RPMOUTPUT_LEGACY([error: Subkey 1f71177215217ee0 of key b3a771bfeb04e625 (Alice <[email protected]>) has been revoked])dnl | ||
RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650C36B6F41BCB3A771BFEB04E625 (Alice <[email protected]>):])dnl | ||
RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 is invalid: key is revoked])dnl | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
Header DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
Header V4 RSA/SHA512 Signature, key ID 15217ee0: NOTTRUSTED | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
1 | ||
Checking package after importing key, no signature: | ||
/data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: | ||
|
@@ -864,8 +864,8 @@ runroot rpmkeys -Kv /tmp/${pkg} | |
Header SHA1 digest: OK | ||
Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc) | ||
Payload SHA256 ALT digest: NOTFOUND | ||
V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD | ||
DSA signature: NOTFOUND | ||
V4 RSA/SHA256 Signature, key ID 1964c5fc: BAD | ||
MD5 digest: BAD (Expected 137ca1d8b35cca02a1854ba301c5432e != d662cd0d81601a7107312684ad1ddf38) | ||
], | ||
[]) | ||
|
@@ -904,8 +904,8 @@ dorpm -Kv | |
Header SHA256 digest: OK | ||
Payload SHA256 digest: NOTFOUND | ||
Payload SHA256 ALT digest: NOTFOUND | ||
RSA signature: NOTFOUND | ||
DSA signature: NOTFOUND | ||
RSA signature: NOTFOUND | ||
MD5 digest: OK | ||
]], | ||
[]) | ||
|
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters