diff options
author | jbj <devnull@localhost> | 2005-03-13 01:56:50 +0000 |
---|---|---|
committer | jbj <devnull@localhost> | 2005-03-13 01:56:50 +0000 |
commit | 1a42537124a5e6804821ddb17a63a0ee86724b5a (patch) | |
tree | 0b19b735972c95d9fce19d659610bd1c97e9caf1 | |
parent | 42981d3ccd4dba420beead451a658c7487066d18 (diff) | |
download | rpm-1a42537124a5e6804821ddb17a63a0ee86724b5a.tar.gz rpm-1a42537124a5e6804821ddb17a63a0ee86724b5a.tar.bz2 rpm-1a42537124a5e6804821ddb17a63a0ee86724b5a.zip |
- permit RSA/{sha1,sha256,sha384,sha512} signature verification.
CVS patchset: 7805
CVS date: 2005/03/13 01:56:50
-rw-r--r-- | .exclude | 1 | ||||
-rw-r--r-- | CHANGES | 3 | ||||
-rw-r--r-- | rpm.spec.in | 3 | ||||
-rwxr-xr-x | rpmqv.c | 8 |
4 files changed, 11 insertions, 4 deletions
@@ -3,6 +3,7 @@ CVS .depend .depend-done .libs +aclocal.m4 apidocs autodeps autom4te.cache @@ -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 3a4dd52a1..6b81c72a0 100644 --- 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>. @@ -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")); |