diff --git a/lib/rpmvs.cc b/lib/rpmvs.cc index 3652c77a52..9651a71a26 100644 --- a/lib/rpmvs.cc +++ b/lib/rpmvs.cc @@ -287,11 +287,11 @@ const char *rpmsinfoDescr(struct rpmsinfo_s *sinfo) case RPMSIG_SIGNATURE_TYPE: if (sinfo->sig) { char *t = pgpIdentItem(sinfo->sig); - rasprintf(&sinfo->descr, _("%s%s"), + rasprintf(&sinfo->descr, _("%sOpenPGP %s"), rangeName(sinfo->range), t); free(t); } else { - rasprintf(&sinfo->descr, _("%s%s%s %s"), + rasprintf(&sinfo->descr, _("%sOpenPGP %s%s %s"), rangeName(sinfo->range), pgpValString(PGPVAL_PUBKEYALGO, sinfo->sigalgo), sinfo->alt ? " ALT" : "", diff --git a/tests/rpmi.at b/tests/rpmi.at index 7cece7b18c..abdbf61be6 100644 --- a/tests/rpmi.at +++ b/tests/rpmi.at @@ -292,7 +292,7 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \ ], [0], [], -[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY +[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY ]) RPMTEST_CLEANUP @@ -308,8 +308,8 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \ ], [1], [], -[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY - package hello-2.0-1.x86_64 does not verify: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY +[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + package hello-2.0-1.x86_64 does not verify: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY ]) RPMTEST_CLEANUP @@ -361,9 +361,9 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \ [1], [], [`if test x$PGP = xlegacy; then - echo 'error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header RSA signature: BAD (package tag 268: invalid OpenPGP signature: Corrupt PGP packet)' + echo 'error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP RSA signature: BAD (package tag 268: invalid OpenPGP signature: Corrupt PGP packet)' else - echo 'error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header RSA signature: BAD (package tag 268: invalid OpenPGP signature: Parsing an OpenPGP packet:' + echo 'error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP RSA signature: BAD (package tag 268: invalid OpenPGP signature: Parsing an OpenPGP packet:' echo ' Failed to parse Signature Packet' echo ' because: Malformed packet: Subpacket extends beyond the end of the subpacket area)' fi` @@ -387,7 +387,7 @@ runroot rpm -U --ignorearch --ignoreos --nodeps \ ], [1], [], -[error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD +[error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82) error: /tmp/hello-2.0-1.x86_64-signed.rpm: Header SHA1 digest: BAD (Expected 5cd9874c510b67b44483f9e382a1649ef7743bac != 4261b2c1eb861a4152c2239bce20bfbcaa8971ba) error: /tmp/hello-2.0-1.x86_64-signed.rpm cannot be installed @@ -434,19 +434,19 @@ runroot rpm -U --ignorearch --ignoreos --nodeps --noverify \ ], [1], [INSTALL 1 -warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY +warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY error: unpacking of archive failed: cpio: Bad magic error: hello-2.0-1.x86_64: install failed INSTALL 2 error: unpacking of archive failed: cpio: Bad magic error: hello-2.0-1.x86_64: install failed INSTALL 3 -warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY - package hello-2.0-1.x86_64 does not verify: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY +warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + package hello-2.0-1.x86_64 does not verify: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY INSTALL 4 package hello-2.0-1.x86_64 does not verify: no signature INSTALL 5 -warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY +warning: /tmp/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY error: unpacking of archive failed: cpio: Bad magic error: hello-2.0-1.x86_64: install failed ], diff --git a/tests/rpmpython.at b/tests/rpmpython.at index f92cacc937..0fb516e3bf 100644 --- a/tests/rpmpython.at +++ b/tests/rpmpython.at @@ -367,8 +367,8 @@ public key not available public key not available public key not available ], -[warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: Header V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY -warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: Header V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY] +[warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: Header OpenPGP V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY +warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: Header OpenPGP V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY] ) RPMPY_TEST([transaction callback 1],[ diff --git a/tests/rpmquery.at b/tests/rpmquery.at index f5969d617a..abdc941d48 100644 --- a/tests/rpmquery.at +++ b/tests/rpmquery.at @@ -418,7 +418,7 @@ runroot rpm \ ], [0], [RSA/SHA256, Thu Apr 6 13:02:33 2017, Key ID 4344591e1964c5fc], -[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY +[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY ]) RPMTEST_CLEANUP diff --git a/tests/rpmsigdig.at b/tests/rpmsigdig.at index 4942bcc1d2..da6534b66b 100644 --- a/tests/rpmsigdig.at +++ b/tests/rpmsigdig.at @@ -19,12 +19,12 @@ runroot rpm -qp \ /data/RPMS/hello-2.0-1.x86_64-v3-signed.rpm 2>&1 ], [0], -[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY +[warning: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY hello-2.0-1.x86_64 -warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: Header V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY +warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: Header OpenPGP V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY hello-2.0-1.x86_64 hello-2.0-1.x86_64 -warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm: Header V4 EdDSA/SHA512 signature, key ID 6323c42711450b6c: NOKEY +warning: /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm: Header OpenPGP V4 EdDSA/SHA512 signature, key ID 6323c42711450b6c: NOKEY hello-2.0-1.x86_64 hello-2.0-1.x86_64 ], @@ -71,7 +71,7 @@ runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm ], [1], [/data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm: - Header V4 EdDSA/SHA512 signature, key ID 6323c42711450b6c: NOKEY + Header OpenPGP V4 EdDSA/SHA512 signature, key ID 6323c42711450b6c: NOKEY Header SHA256 digest: OK Payload SHA256 digest: OK ], @@ -93,7 +93,7 @@ runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm ], [0], [/data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm: - Header V4 EdDSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 EdDSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Payload SHA256 digest: OK ], @@ -196,7 +196,7 @@ runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm ], [1], [/data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm: - Header V4 EdDSA/SHA512 signature, key ID 6323c42711450b6c: NOKEY + Header OpenPGP V4 EdDSA/SHA512 signature, key ID 6323c42711450b6c: NOKEY Header SHA256 digest: OK Payload SHA256 digest: OK ], @@ -219,7 +219,7 @@ runroot rpmkeys -Kv /data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm ], [0], [/data/RPMS/hello-2.0-1.x86_64-signed-with-new-subkey.rpm: - Header V4 EdDSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 EdDSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Payload SHA256 digest: OK ], @@ -555,12 +555,12 @@ 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 1f71177215217ee0: NOKEY - Header DSA signature: NOTFOUND + Header OpenPGP V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY + Header OpenPGP DSA signature: NOTFOUND Header SHA256 digest: OK Payload SHA256 digest: OK - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 1 Importing key: 0 @@ -568,17 +568,17 @@ Checking for key: b6542f92f30650c36b6f41bcb3a771bfeb04e625 Alice public key Checking package after importing key: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: - Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: OK + Header OpenPGP V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: OK Header SHA256 digest: OK Payload SHA256 digest: OK 0 Checking package after importing key, no digest: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: - Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: OK + Header OpenPGP V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: OK Payload SHA256 digest: NOTFOUND Payload SHA256 ALT digest: NOTFOUND - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 1 Checking package after importing key, no signature: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: @@ -613,12 +613,12 @@ 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 1f71177215217ee0: NOKEY - Header DSA signature: NOTFOUND + Header OpenPGP V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY + Header OpenPGP DSA signature: NOTFOUND Header SHA256 digest: OK Payload SHA256 digest: OK - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 1 Importing key: 0 @@ -631,12 +631,12 @@ 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 fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED - Header DSA signature: NOTFOUND + Header OpenPGP V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED + Header OpenPGP DSA signature: NOTFOUND Header SHA256 digest: OK Payload SHA256 digest: OK - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 1 Checking package after importing key, no digest: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: @@ -645,10 +645,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 fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED - Header DSA signature: NOTFOUND - RSA signature: NOTFOUND - DSA signature: NOTFOUND + Header OpenPGP V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED + Header OpenPGP DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 1 Checking package after importing key, no signature: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: @@ -683,12 +683,12 @@ 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 1f71177215217ee0: NOKEY - Header DSA signature: NOTFOUND + Header OpenPGP V4 RSA/SHA512 signature, key ID 1f71177215217ee0: NOKEY + Header OpenPGP DSA signature: NOTFOUND Header SHA256 digest: OK Payload SHA256 digest: OK - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 1 Importing key: 0 @@ -699,22 +699,22 @@ Checking package after importing key: RPMOUTPUT_LEGACY([error: Subkey 1f71177215217ee0 of key b3a771bfeb04e625 (Alice ) has been revoked])dnl RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650C36B6F41BCB3A771BFEB04E625 (Alice ):])dnl RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 is invalid: key is revoked])dnl - Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED - Header DSA signature: NOTFOUND + Header OpenPGP V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED + Header OpenPGP DSA signature: NOTFOUND Header SHA256 digest: OK Payload SHA256 digest: OK - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 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 ) has been revoked])dnl RPMOUTPUT_SEQUOIA([error: Verifying a signature using certificate B6542F92F30650C36B6F41BCB3A771BFEB04E625 (Alice ):])dnl RPMOUTPUT_SEQUOIA([ Key 1F71177215217EE0 is invalid: key is revoked])dnl - Header V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED - Header DSA signature: NOTFOUND - RSA signature: NOTFOUND - DSA signature: NOTFOUND + Header OpenPGP V4 RSA/SHA512 signature, key fingerprint: b6542f92f30650c36b6f41bcb3a771bfeb04e625: NOTTRUSTED + Header OpenPGP DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND 1 Checking package after importing key, no signature: /data/RPMS/hello-2.0-1.x86_64-signed-with-subkey.rpm: @@ -892,37 +892,37 @@ runroot rpmkeys -Kv --nosignature /data/RPMS/hello-2.0-1.x86_64-signed.rpm; echo ], [0], [/data/RPMS/hello-2.0-1.x86_64-v3-signed.rpm: - Header V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY Header SHA256 digest: OK Payload SHA256 digest: OK - V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + OpenPGP V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY 1 /data/RPMS/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY Header SHA256 digest: OK Payload SHA256 digest: OK - V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY 1 0 /data/RPMS/hello-2.0-1.x86_64-v3-signed.rpm: - Header V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Payload SHA256 digest: OK - V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + OpenPGP V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK 0 /data/RPMS/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Payload SHA256 digest: OK - V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK 0 /data/RPMS/hello-2.0-1.x86_64-v3-signed.rpm: - Header V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK - V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + OpenPGP V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK 0 /data/RPMS/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK - V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK 0 /data/RPMS/hello-2.0-1.x86_64-v3-signed.rpm: Header SHA256 digest: OK @@ -955,23 +955,23 @@ runroot rpmkeys -Kv /tmp/${pkg} ], [1], [/tmp/hello-2.0-1.x86_64-signed.rpm: -RPMOUTPUT_LEGACY([ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature: signature without creation time)])dnl -RPMOUTPUT_SEQUOIA([ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature: Parsing an OpenPGP packet:])dnl +RPMOUTPUT_LEGACY([ Header OpenPGP RSA signature: BAD (package tag 268: invalid OpenPGP signature: signature without creation time)])dnl +RPMOUTPUT_SEQUOIA([ Header OpenPGP RSA signature: BAD (package tag 268: invalid OpenPGP signature: Parsing an OpenPGP packet:])dnl RPMOUTPUT_SEQUOIA([ Failed to parse Signature Packet])dnl RPMOUTPUT_SEQUOIA([ because: Signature appears to be created by a non-conformant OpenPGP implementation, see .])dnl RPMOUTPUT_SEQUOIA([ because: Malformed MPI: leading bit is not set: expected bit 1 to be set in 0 (0))])dnl Header SHA256 digest: OK Payload SHA256 digest: OK - V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY /tmp/hello-2.0-1.x86_64-signed.rpm: -RPMOUTPUT_LEGACY([ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature: signature without creation time)])dnl -RPMOUTPUT_SEQUOIA([ Header RSA signature: BAD (package tag 268: invalid OpenPGP signature: Parsing an OpenPGP packet:])dnl +RPMOUTPUT_LEGACY([ Header OpenPGP RSA signature: BAD (package tag 268: invalid OpenPGP signature: signature without creation time)])dnl +RPMOUTPUT_SEQUOIA([ Header OpenPGP RSA signature: BAD (package tag 268: invalid OpenPGP signature: Parsing an OpenPGP packet:])dnl RPMOUTPUT_SEQUOIA([ Failed to parse Signature Packet])dnl RPMOUTPUT_SEQUOIA([ because: Signature appears to be created by a non-conformant OpenPGP implementation, see .])dnl RPMOUTPUT_SEQUOIA([ because: Malformed MPI: leading bit is not set: expected bit 1 to be set in 0 (0))])dnl Header SHA256 digest: OK Payload SHA256 digest: OK - V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK ], []) RPMTEST_CLEANUP @@ -995,18 +995,18 @@ runroot rpmkeys -Kv /tmp/${pkg} ], [1], [/tmp/hello-2.0-1.x86_64-v3-signed.rpm: - Header V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD + Header OpenPGP V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 63a0502eb7f5eaa07d43fe8fa805665b86e58d53db38ccf625bbbf01e3cd67ab) Header SHA1 digest: NOTFOUND Payload SHA256 digest: OK - V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD + OpenPGP V3 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD MD5 digest: NOTFOUND /tmp/hello-2.0-1.x86_64-v3-signed.rpm: - Header V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD + Header OpenPGP V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 63a0502eb7f5eaa07d43fe8fa805665b86e58d53db38ccf625bbbf01e3cd67ab) Header SHA1 digest: NOTFOUND Payload SHA256 digest: OK - V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD + OpenPGP V3 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD MD5 digest: NOTFOUND ], []) @@ -1030,18 +1030,18 @@ runroot rpmkeys -Kv /tmp/${pkg} ], [1], [/tmp/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD + Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82) Header SHA1 digest: NOTFOUND Payload SHA256 digest: OK - V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD + OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD MD5 digest: NOTFOUND /tmp/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD Header SHA256 digest: BAD (Expected ef920781af3bf072ae9888eec3de1c589143101dff9cc0b561468d395fb766d9 != 29fdfe92782fb0470a9a164a6c94af87d3b138c63b39d4c30e0223ca1202ba82) Header SHA1 digest: NOTFOUND Payload SHA256 digest: OK - V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD + OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD MD5 digest: NOTFOUND ], []) @@ -1066,19 +1066,19 @@ runroot rpmkeys -Kv /tmp/${pkg} ], [1], [/tmp/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY Header SHA256 digest: OK Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc) Payload SHA256 ALT digest: NOTFOUND - V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD + OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: BAD MD5 digest: NOTFOUND /tmp/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Payload SHA256 digest: BAD (Expected 84a7338287bf19715c4eed0243f5cdb447eeb0ade37b2af718d4060aefca2f7c != bea903609dceac36e1f26a983c493c98064d320fdfeb423034ed63d649b2c8dc) Payload SHA256 ALT digest: NOTFOUND - V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD - DSA signature: NOTFOUND + OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: BAD + OpenPGP DSA signature: NOTFOUND MD5 digest: NOTFOUND ], []) @@ -1108,17 +1108,17 @@ dorpm -Kv [0], [[/data/RPMS/hello-2.0-1.x86_64-corrupted.rpm: digests SIGNATURES NOT OK /data/RPMS/hello-2.0-1.x86_64-corrupted.rpm: - Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY Header SHA256 digest: OK MD5 digest: OK /data/RPMS/hello-2.0-1.x86_64-corrupted.rpm: DIGESTS SIGNATURES NOT OK /data/RPMS/hello-2.0-1.x86_64-corrupted.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Payload SHA256 digest: NOTFOUND Payload SHA256 ALT digest: NOTFOUND - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND MD5 digest: OK ]], []) @@ -1152,12 +1152,12 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest [0], [PRE-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY - V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY POST-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK - V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK POST-DELSIGN /tmp/hello-2.0-1.x86_64.rpm: ], @@ -1181,10 +1181,10 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest [0], [PRE-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY POST-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK POST-DELSIGN /tmp/hello-2.0-1.x86_64.rpm: ], @@ -1332,10 +1332,10 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest [0], [PRE-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 RSA/SHA512 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V4 RSA/SHA512 signature, key ID 4344591e1964c5fc: NOKEY POST-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA512 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK POST-DELSIGN /tmp/hello-2.0-1.x86_64.rpm: ], @@ -1347,7 +1347,7 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm ], [1], [/tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA512 signature, key ID b0645aec757bf69e: NOKEY + Header OpenPGP V4 EdDSA/SHA512 signature, key ID b0645aec757bf69e: NOKEY Header SHA256 digest: OK Payload SHA256 digest: OK ], @@ -1372,8 +1372,8 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64-signed.rpm|grep -v digest [0], [PRE-DELSIGN /tmp/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY - V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + Header OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY + OpenPGP V4 RSA/SHA256 signature, key ID 4344591e1964c5fc: NOKEY POST-DELSIGN /tmp/hello-2.0-1.x86_64-signed.rpm: ], @@ -1396,7 +1396,7 @@ runroot rpm -qp /data/RPMS/hello-2.0-1.x86_64-signed.rpm ], [1], [], -[error: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header RSA signature: BAD (package tag 268: invalid OpenPGP signature: RPM was compiled without OpenPGP support) +[error: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: Header OpenPGP RSA signature: BAD (package tag 268: invalid OpenPGP signature: RPM was compiled without OpenPGP support) error: /data/RPMS/hello-2.0-1.x86_64-signed.rpm: not an rpm package (or package manifest) ]) RPMTEST_CLEANUP @@ -1425,10 +1425,10 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest [0], [PRE-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA512 signature, key ID b0645aec757bf69e: NOKEY + Header OpenPGP V4 EdDSA/SHA512 signature, key ID b0645aec757bf69e: NOKEY POST-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA512 signature, key fingerprint: 152bb32fd9ca982797e835cfb0645aec757bf69e: OK + Header OpenPGP V4 EdDSA/SHA512 signature, key fingerprint: 152bb32fd9ca982797e835cfb0645aec757bf69e: OK ], []) gpgconf --kill gpg-agent @@ -1458,10 +1458,10 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest [0], [PRE-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 ECDSA/SHA256 signature, key ID 7f1c21f95f65bbe8: NOKEY + Header OpenPGP V4 ECDSA/SHA256 signature, key ID 7f1c21f95f65bbe8: NOKEY POST-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 ECDSA/SHA256 signature, key fingerprint: e8a62c0512b06b5d2183ba207f1c21f95f65bbe8: OK + Header OpenPGP V4 ECDSA/SHA256 signature, key fingerprint: e8a62c0512b06b5d2183ba207f1c21f95f65bbe8: OK ], []) @@ -1493,12 +1493,12 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest [0], [PRE-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA256 signature, key ID 42655a75156b3de0: NOKEY + Header OpenPGP V4 EdDSA/SHA256 signature, key ID 42655a75156b3de0: NOKEY POST-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA256 signature, key fingerprint: 94706f8da571389e8642bdfd42655a75156b3de0: BAD + Header OpenPGP V4 EdDSA/SHA256 signature, key fingerprint: 94706f8da571389e8642bdfd42655a75156b3de0: BAD /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA256 signature, key fingerprint: 79cc07f167fee8841829acaa42655a75156b3de0: OK + Header OpenPGP V4 EdDSA/SHA256 signature, key fingerprint: 79cc07f167fee8841829acaa42655a75156b3de0: OK ], [error: Verifying a signature using certificate 94706F8DA571389E8642BDFD42655A75156B3DE0 (): Certificate 42655A75156B3DE0 does not contain key 79CC07F167FEE8841829ACAA42655A75156B3DE0 or it is not valid @@ -1532,12 +1532,12 @@ runroot rpmkeys -Kv /tmp/hello-2.0-1.x86_64.rpm|grep -v digest [0], [PRE-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA256 signature, key ID 42655a75156b3de0: NOKEY + Header OpenPGP V4 EdDSA/SHA256 signature, key ID 42655a75156b3de0: NOKEY POST-IMPORT /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA256 signature, key fingerprint: 79cc07f167fee8841829acaa42655a75156b3de0: BAD + Header OpenPGP V4 EdDSA/SHA256 signature, key fingerprint: 79cc07f167fee8841829acaa42655a75156b3de0: BAD /tmp/hello-2.0-1.x86_64.rpm: - Header V4 EdDSA/SHA256 signature, key fingerprint: 94706f8da571389e8642bdfd42655a75156b3de0: OK + Header OpenPGP V4 EdDSA/SHA256 signature, key fingerprint: 94706f8da571389e8642bdfd42655a75156b3de0: OK ], [error: Verifying a signature using certificate 79CC07F167FEE8841829ACAA42655A75156B3DE0 (): Certificate 42655A75156B3DE0 does not contain key 94706F8DA571389E8642BDFD42655A75156B3DE0 or it is not valid diff --git a/tests/rpmvfylevel.at b/tests/rpmvfylevel.at index c0937718a1..2fbf669cc6 100644 --- a/tests/rpmvfylevel.at +++ b/tests/rpmvfylevel.at @@ -319,7 +319,7 @@ done [0], [nopls /data/RPMS/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Header SHA1 digest: OK Payload SHA256 digest: OK @@ -327,13 +327,13 @@ done 0 noplds /data/RPMS/hello-2.0-1.x86_64-signed.rpm: - Header V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + Header OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK Header SHA256 digest: OK Header SHA1 digest: OK Payload SHA256 digest: NOTFOUND Payload SHA256 ALT digest: NOTFOUND - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND MD5 digest: OK 1 nohdrs @@ -341,18 +341,18 @@ nohdrs Header SHA256 digest: OK Header SHA1 digest: OK Payload SHA256 digest: OK - V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK + OpenPGP V4 RSA/SHA256 signature, key fingerprint: 771b18d3d7baa28734333c424344591e1964c5fc: OK MD5 digest: OK 0 nosig /data/RPMS/hello-2.0-1.x86_64-signed.rpm: - Header RSA signature: NOTFOUND - Header DSA signature: NOTFOUND + Header OpenPGP RSA signature: NOTFOUND + Header OpenPGP DSA signature: NOTFOUND Header SHA256 digest: OK Header SHA1 digest: OK Payload SHA256 digest: OK - RSA signature: NOTFOUND - DSA signature: NOTFOUND + OpenPGP RSA signature: NOTFOUND + OpenPGP DSA signature: NOTFOUND MD5 digest: OK 1 ],