- permit RSA/{sha1,sha256,sha384,sha512} signature verification.

CVS patchset: 7805
CVS date: 2005/03/13 01:56:50

diff --git a/.exclude b/.exclude
index 3bbafb9..8a3de7b 100644 (file)
--- a/.exclude
+++ b/.exclude
@@ -3,6 +3,7 @@ CVS
 .depend
 .depend-done
 .libs
+aclocal.m4
 apidocs
 autodeps
 autom4te.cache

diff --git a/CHANGES b/CHANGES
index 34d376e..573e2fb 100644 (file)
--- a/CHANGES
+++ b/CHANGES
@@ -8,8 +8,9 @@
        - remove remnant -I/opt/local hacks, --prefix=/usr is recommended.
        - rework configure.ac et al to lose internal library baggage flexibly.
        - updated sv.po <goeran@uddrborg.se>.
-       - permit gpg to be used for RSA/MD5 signatures.
+       - permit gpg to be used for RSA signatures.
        - permit RSA key sizes larger than 1024 bits.
+       - permit RSA/{sha1,sha256,sha384,sha512} signature verification.
 
 4.4 -> 4.4.1:
        - force *.py->*.pyo byte code compilation with brp-python-bytecompile.

diff --git a/rpm.spec.in b/rpm.spec.in
index 3a4dd52..6b81c72 100644 (file)
--- a/rpm.spec.in
+++ b/rpm.spec.in
@@ -499,8 +499,9 @@ exit 0
 
 %changelog
 * Wed Mar  9 2005 Jeff Johnson <jbj@jbj.org> 4.4.2-0.6
-- permit gpg to be used for RSA/MD5 signatures.
+- permit gpg to be used for RSA signatures.
 - permit RSA key sizes larger than 1024 bits.
+- permit RSA/{sha1,sha256,sha384,sha512} signature verification.
 
 * Sun Feb 20 2005 Jeff Johnson <jbj@jbj.org> 4.4.2-0.5
 - updated sv.po <goeran@uddrborg.se>.

diff --git a/rpmqv.c b/rpmqv.c
index 21a065a..d164647 100755 (executable)
--- a/rpmqv.c
+++ b/rpmqv.c
@@ -560,18 +560,22 @@ int main(int argc, const char ** argv)
            }
 
             if (poptPeekArg(optCon)) {
-               int sigTag;
-               switch (sigTag = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY)) {
+               int sigTag = rpmLookupSignatureType(RPMLOOKUPSIG_QUERY);
+               switch (sigTag) {
                  case 0:
                    break;
                  case RPMSIGTAG_PGP:
+#ifdef DYING   /* XXX gpg can now be used for RSA signatures. */
                    if ((sigTag == RPMSIGTAG_PGP || sigTag == RPMSIGTAG_PGP5) &&
                        !rpmDetectPGPVersion(NULL)) {
                        fprintf(stderr, _("pgp not found: "));
                        ec = EXIT_FAILURE;
                        goto exit;
                    }   /*@fallthrough@*/
+#endif
                  case RPMSIGTAG_GPG:
+                 case RPMSIGTAG_DSA:
+                 case RPMSIGTAG_RSA:
                    passPhrase = rpmGetPassPhrase(_("Enter pass phrase: "), sigTag);
                    if (passPhrase == NULL) {
                        fprintf(stderr, _("Pass phrase check failed\n"));