mirror of
git://git.gnupg.org/gnupg.git
synced 2025-01-10 13:04:23 +01:00
* options.h, g10.c (main), mainproc.c (proc_encrypted): --ignore-mdc-error
option to turn a MDC check error into a warning.
This commit is contained in:
parent
58b0a36d6b
commit
63a71c1ff9
@ -1,5 +1,9 @@
|
|||||||
2002-08-06 David Shaw <dshaw@jabberwocky.com>
|
2002-08-06 David Shaw <dshaw@jabberwocky.com>
|
||||||
|
|
||||||
|
* options.h, g10.c (main), mainproc.c (proc_encrypted):
|
||||||
|
--ignore-mdc-error option to turn a MDC check error into a
|
||||||
|
warning.
|
||||||
|
|
||||||
* encode.c (encode_crypt), g10.c (main), sign.c (sign_file,
|
* encode.c (encode_crypt), g10.c (main), sign.c (sign_file,
|
||||||
clearsign_file): Use the same --pgpX warning string everywhere to
|
clearsign_file): Use the same --pgpX warning string everywhere to
|
||||||
ease translations.
|
ease translations.
|
||||||
|
@ -630,7 +630,7 @@ write_pubkey_enc_from_list( PK_LIST pk_list, DEK *dek, IOBUF out )
|
|||||||
if(opt.throw_keyid && (opt.pgp2 || opt.pgp6 || opt.pgp7))
|
if(opt.throw_keyid && (opt.pgp2 || opt.pgp6 || opt.pgp7))
|
||||||
{
|
{
|
||||||
log_info(_("you may not use %s while in %s mode\n"),
|
log_info(_("you may not use %s while in %s mode\n"),
|
||||||
"throw-keyid",
|
"--throw-keyid",
|
||||||
opt.pgp2?"--pgp2":opt.pgp6?"--pgp6":"--pgp7");
|
opt.pgp2?"--pgp2":opt.pgp6?"--pgp6":"--pgp7");
|
||||||
|
|
||||||
log_info(_("this message may not be usable by %s\n"),
|
log_info(_("this message may not be usable by %s\n"),
|
||||||
|
@ -266,6 +266,7 @@ enum cmd_and_opt_values { aNull = 0,
|
|||||||
oIgnoreTimeConflict,
|
oIgnoreTimeConflict,
|
||||||
oIgnoreValidFrom,
|
oIgnoreValidFrom,
|
||||||
oIgnoreCrcError,
|
oIgnoreCrcError,
|
||||||
|
oIgnoreMDCError,
|
||||||
oShowSessionKey,
|
oShowSessionKey,
|
||||||
oOverrideSessionKey,
|
oOverrideSessionKey,
|
||||||
oNoRandomSeedFile,
|
oNoRandomSeedFile,
|
||||||
@ -555,6 +556,7 @@ static ARGPARSE_OPTS opts[] = {
|
|||||||
{ oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" },
|
{ oIgnoreTimeConflict, "ignore-time-conflict", 0, "@" },
|
||||||
{ oIgnoreValidFrom, "ignore-valid-from", 0, "@" },
|
{ oIgnoreValidFrom, "ignore-valid-from", 0, "@" },
|
||||||
{ oIgnoreCrcError, "ignore-crc-error", 0,"@" },
|
{ oIgnoreCrcError, "ignore-crc-error", 0,"@" },
|
||||||
|
{ oIgnoreMDCError, "ignore-mdc-error", 0,"@" },
|
||||||
{ oShowSessionKey, "show-session-key", 0, "@" },
|
{ oShowSessionKey, "show-session-key", 0, "@" },
|
||||||
{ oOverrideSessionKey, "override-session-key", 2, "@" },
|
{ oOverrideSessionKey, "override-session-key", 2, "@" },
|
||||||
{ oNoRandomSeedFile, "no-random-seed-file", 0, "@" },
|
{ oNoRandomSeedFile, "no-random-seed-file", 0, "@" },
|
||||||
@ -1420,6 +1422,7 @@ main( int argc, char **argv )
|
|||||||
case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
|
case oIgnoreTimeConflict: opt.ignore_time_conflict = 1; break;
|
||||||
case oIgnoreValidFrom: opt.ignore_valid_from = 1; break;
|
case oIgnoreValidFrom: opt.ignore_valid_from = 1; break;
|
||||||
case oIgnoreCrcError: opt.ignore_crc_error = 1; break;
|
case oIgnoreCrcError: opt.ignore_crc_error = 1; break;
|
||||||
|
case oIgnoreMDCError: opt.ignore_mdc_error = 1; break;
|
||||||
case oNoRandomSeedFile: use_random_seed = 0; break;
|
case oNoRandomSeedFile: use_random_seed = 0; break;
|
||||||
case oAutoKeyRetrieve:
|
case oAutoKeyRetrieve:
|
||||||
case oNoAutoKeyRetrieve:
|
case oNoAutoKeyRetrieve:
|
||||||
|
@ -492,11 +492,11 @@ proc_encrypted( CTX c, PACKET *pkt )
|
|||||||
m_free(c->dek); c->dek = NULL;
|
m_free(c->dek); c->dek = NULL;
|
||||||
if( result == -1 )
|
if( result == -1 )
|
||||||
;
|
;
|
||||||
else if( !result ) {
|
else if( !result || (result==G10ERR_BAD_SIGN && opt.ignore_mdc_error)) {
|
||||||
write_status( STATUS_DECRYPTION_OKAY );
|
write_status( STATUS_DECRYPTION_OKAY );
|
||||||
if( opt.verbose > 1 )
|
if( opt.verbose > 1 )
|
||||||
log_info(_("decryption okay\n"));
|
log_info(_("decryption okay\n"));
|
||||||
if( pkt->pkt.encrypted->mdc_method )
|
if( pkt->pkt.encrypted->mdc_method && !result )
|
||||||
write_status( STATUS_GOODMDC );
|
write_status( STATUS_GOODMDC );
|
||||||
else if(!opt.no_mdc_warn)
|
else if(!opt.no_mdc_warn)
|
||||||
log_info ("WARNING: message was not integrity protected\n");
|
log_info ("WARNING: message was not integrity protected\n");
|
||||||
|
@ -161,6 +161,7 @@ struct {
|
|||||||
int ignore_time_conflict;
|
int ignore_time_conflict;
|
||||||
int ignore_valid_from;
|
int ignore_valid_from;
|
||||||
int ignore_crc_error;
|
int ignore_crc_error;
|
||||||
|
int ignore_mdc_error;
|
||||||
int command_fd;
|
int command_fd;
|
||||||
const char *override_session_key;
|
const char *override_session_key;
|
||||||
int show_session_key;
|
int show_session_key;
|
||||||
|
Loading…
x
Reference in New Issue
Block a user