1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-07-03 22:56:33 +02:00

* keygen.c (keygen_set_std_prefs, add_feature_mdc): Use "mdc" and "no-mdc"

in the prefs string to allow switching on and off the MDC feature.  This
is needed to properly export a key from GnuPG for use on PGP which does
not support MDC - without this, MDC-capable implementations will still try
and generate MDCs which will break PGP.

* keygen.c (keygen_get_std_prefs): Show "[mdc]" in prefs string if it is
enabled.

* options.h, g10.c (main), cipher.c (write_header), keygen.c
(keygen_set_std_prefs): For consistency, allow the user to specify
mdc/no-mdc in the --personal-preference-list.  If disabled, it acts just
like --disable-mdc.
This commit is contained in:
David Shaw 2002-05-29 20:52:51 +00:00
parent e77b643b4a
commit da3f17990c
5 changed files with 65 additions and 17 deletions

View file

@ -64,7 +64,7 @@ write_header( cipher_filter_context_t *cfx, IOBUF a )
if (opt.force_mdc)
use_mdc = 1;
if( opt.rfc2440 || opt.rfc1991 || opt.disable_mdc )
if( opt.rfc2440 || opt.rfc1991 || opt.disable_mdc || !opt.personal_mdc )
use_mdc = 0; /* override - rfc2440 does not know about MDC */
memset( &ed, 0, sizeof ed );
@ -165,5 +165,3 @@ cipher_filter( void *opaque, int control,
}
return rc;
}