diff options
| -rw-r--r-- | g10/ChangeLog | 7 | ||||
| -rw-r--r-- | g10/encode.c | 16 | ||||
| -rw-r--r-- | g10/g10.c | 7 | ||||
| -rw-r--r-- | g10/sign.c | 4 |
4 files changed, 27 insertions, 7 deletions
diff --git a/g10/ChangeLog b/g10/ChangeLog index 44842724a..11e407bf2 100644 --- a/g10/ChangeLog +++ b/g10/ChangeLog @@ -1,5 +1,12 @@ 2002-08-06 David Shaw <dshaw@jabberwocky.com> + * encode.c (encode_crypt), g10.c (main), sign.c (sign_file, + clearsign_file): Use the same --pgpX warning string everywhere to + ease translations. + + * encode.c (write_pubkey_enc_from_list): Warn when using + --throw-keyid with --pgpX. Noted by Vedaal Nistar. + * revoke.c (export_minimal_pk, gen_desig_revoke, gen_revoke): Export a minimal pk along with the revocation cert when in --pgpX mode so that PGP can import it. diff --git a/g10/encode.c b/g10/encode.c index a1fa0fb00..abc25c9ca 100644 --- a/g10/encode.c +++ b/g10/encode.c @@ -345,7 +345,7 @@ encode_crypt( const char *filename, STRLIST remusr ) { log_info(_("you can only encrypt to RSA keys of 2048 bits or " "less in --pgp2 mode\n")); - log_info(_("this message may not be usable by PGP 2.x\n")); + log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); opt.pgp2=0; break; } @@ -407,7 +407,7 @@ encode_crypt( const char *filename, STRLIST remusr ) if( opt.pgp2 ) { log_info(_("unable to use the IDEA cipher for all of the keys " "you are encrypting to.\n")); - log_info(_("this message may not be usable by PGP 2.x\n")); + log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); opt.pgp2=0; } } @@ -627,6 +627,18 @@ 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; + if(opt.throw_keyid && (opt.pgp2 || opt.pgp6 || opt.pgp7)) + { + log_info(_("you may not use %s while in %s mode\n"), + "throw-keyid", + opt.pgp2?"--pgp2":opt.pgp6?"--pgp6":"--pgp7"); + + 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=opt.pgp6=opt.pgp7=0; + } + /* Okay, what's going on: We have the session key somewhere in * the structure DEK and want to encode this session key in * an integer value of n bits. pubkey_nbits gives us the @@ -264,8 +264,8 @@ enum cmd_and_opt_values { aNull = 0, oFastListMode, oListOnly, oIgnoreTimeConflict, - oIgnoreValidFrom, - oIgnoreCrcError, + oIgnoreValidFrom, + oIgnoreCrcError, oShowSessionKey, oOverrideSessionKey, oNoRandomSeedFile, @@ -1598,7 +1598,8 @@ main( int argc, char **argv ) if(unusable) { - log_info(_("this message may not be usable by PGP 2.x\n")); + log_info(_("this message may not be usable by %s\n"), + "PGP 2.x"); opt.pgp2=0; } else diff --git a/g10/sign.c b/g10/sign.c index 6a8ce2991..ac6f077d6 100644 --- a/g10/sign.c +++ b/g10/sign.c @@ -643,7 +643,7 @@ sign_file( STRLIST filenames, int detached, STRLIST locusr, { log_info(_("you can only detach-sign with PGP 2.x style keys " "while in --pgp2 mode\n")); - log_info(_("this message may not be usable by PGP 2.x\n")); + log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); opt.pgp2=0; } @@ -875,7 +875,7 @@ clearsign_file( const char *fname, STRLIST locusr, const char *outfile ) { log_info(_("you can only clearsign with PGP 2.x style keys " "while in --pgp2 mode\n")); - log_info(_("this message may not be usable by PGP 2.x\n")); + log_info(_("this message may not be usable by %s\n"),"PGP 2.x"); opt.pgp2=0; } |