diff options
| author | David Shaw <[email protected]> | 2002-12-03 23:31:48 +0000 |
|---|---|---|
| committer | David Shaw <[email protected]> | 2002-12-03 23:31:48 +0000 |
| commit | e357092285709f24f84a76f25022b5761157eb4d (patch) | |
| tree | 8d9d9b26246e2ed19f770d012c297351494aeeb8 /g10/encode.c | |
| parent | Marked unused slots in the trustdb. (diff) | |
| download | gnupg-e357092285709f24f84a76f25022b5761157eb4d.tar.gz gnupg-e357092285709f24f84a76f25022b5761157eb4d.zip | |
* options.h, g10.c (main), encode.c (write_pubkey_enc_from_list),
pkclist.c (algo_available), revoke.c (gen_revoke): Add --pgp8 mode. This
is basically identical to --pgp7 in all ways except that signing subkeys,
v4 data sigs (including expiration), and SK comments are allowed.
* getkey.c (finish_lookup): Comment.
* main.h, keylist.c (reorder_keyblock), keyedit.c (keyedit_menu): Reorder
user ID display in the --edit-key menu to match that of the --list-keys
display.
* g10.c (add_notation_data): Fix initialization.
Diffstat (limited to '')
| -rw-r--r-- | g10/encode.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/g10/encode.c b/g10/encode.c index 5550af4a7..e705a6fad 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -708,16 +708,16 @@ write_pubkey_enc_from_list( PK_LIST pk_list, DEK *dek, IOBUF out ) keyid_from_pk( pk, enc->keyid ); enc->throw_keyid = (opt.throw_keyid || (pk_list->flags&1)); - if(opt.throw_keyid && (opt.pgp2 || opt.pgp6 || opt.pgp7)) + if(opt.throw_keyid && (opt.pgp2 || opt.pgp6 || opt.pgp7 || opt.pgp8)) { log_info(_("you may not use %s while in %s mode\n"), "--throw-keyid", - opt.pgp2?"--pgp2":opt.pgp6?"--pgp6":"--pgp7"); + opt.pgp2?"--pgp2":opt.pgp6?"--pgp6":opt.pgp7?"--pgp7":"--pgp8"); log_info(_("this message may not be usable by %s\n"), - opt.pgp2?"PGP 2.x":opt.pgp6?"PGP 6.x":"PGP 7.x"); + opt.pgp2?"PGP 2.x":opt.pgp6?"PGP 6.x":opt.pgp7?"PGP 7.x":"PGP 8.x"); - opt.pgp2=opt.pgp6=opt.pgp7=0; + opt.pgp2=opt.pgp6=opt.pgp7=opt.pgp8=0; } /* Okay, what's going on: We have the session key somewhere in |