diff options
author | David Shaw <[email protected]> | 2002-10-02 22:01:29 +0000 |
---|---|---|
committer | David Shaw <[email protected]> | 2002-10-02 22:01:29 +0000 |
commit | 58972f24c406ab1619efac2b3ff91e13923efe5f (patch) | |
tree | a7d38634c3621ec7b8412eda3f3641d5be8fbd73 /g10/revoke.c | |
parent | * longlong.h: Some whitespace changes in HPPA to fix assembler problems on (diff) | |
download | gnupg-58972f24c406ab1619efac2b3ff91e13923efe5f.tar.gz gnupg-58972f24c406ab1619efac2b3ff91e13923efe5f.zip |
* import.c (import_secret_one): Check for an illegal (>110) protection
cipher when importing a secret key.
* keylist.c (list_keyblock_print): Show a '#' for a secret-parts-missing
key.
* parse_packet.c (parse_key): Some comments.
* revoke.c (gen_revoke): Remove some debugging code.
* trustdb.c (verify_own_keys): Make trusted-key a non-deprecated option
again.
* seckey-cert.c (do_check): Don't give the IDEA warning unless the cipher
in question is in fact IDEA.
Diffstat (limited to '')
-rw-r--r-- | g10/revoke.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/g10/revoke.c b/g10/revoke.c index d90bcb581..b6e9e6398 100644 --- a/g10/revoke.c +++ b/g10/revoke.c @@ -551,7 +551,9 @@ gen_revoke( const char *uname ) if(opt.pgp2 || opt.pgp6 || opt.pgp7) { - rc=export_minimal_pk(out,NULL /*pub_keyblock*/,sig,NULL); + /* Use a minimal pk for PGPx mode, since PGP can't import bare + revocation certificates. */ + rc=export_minimal_pk(out,pub_keyblock,sig,NULL); if(rc) goto leave; } |