security-and-privacy/gnupg
security-and-privacy/gnupg
1
0
Fork 0
mirror of git://git.gnupg.org/gnupg.git synced 2025-03-26 22:29:58 +01:00
Code Activity

* gpg.c (main): Disable --rfc2440-text and --force-v3-sigs by default.

Browse Source 
Enable --require-cross-certification by default.  --openpgp
(--rfc4880) is the same as --rfc2440 except with "--enable-dsa2
--no-rfc2440-text --escape-from-lines".
This commit is contained in:
David Shaw 2007-10-23 00:36:59 +00:00
parent f3abec2002
commit b550330067
2 changed files with 16 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
g10/ChangeLog
View File

@ -1,3 +1,10 @@
2007-10-22 David Shaw <dshaw@jabberwocky.com>
* gpg.c (main): Disable --rfc2440-text and --force-v3-sigs by
default. Enable --require-cross-certification by default.
--openpgp (--rfc4880) is the same as --rfc2440 except with
"--enable-dsa2 --no-rfc2440-text --escape-from-lines".
2007-10-21 David Shaw <dshaw@jabberwocky.com> 2007-10-21 David Shaw <dshaw@jabberwocky.com>
* misc.c (compliance_option_string, compliance_failure): Minor * misc.c (compliance_option_string, compliance_failure): Minor

18
g10/gpg.c
View File

@ -1810,8 +1810,8 @@ main (int argc, char **argv )
opt.marginals_needed = 3; opt.marginals_needed = 3;
opt.max_cert_depth = 5; opt.max_cert_depth = 5;
opt.pgp2_workarounds = 1; opt.pgp2_workarounds = 1;
opt.force_v3_sigs = 1;
opt.escape_from = 1; opt.escape_from = 1;
opt.flags.require_cross_cert = 1;
opt.import_options=IMPORT_SK2PK; opt.import_options=IMPORT_SK2PK;
opt.export_options=EXPORT_ATTRIBUTES; opt.export_options=EXPORT_ATTRIBUTES;
opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG; opt.keyserver_options.import_options=IMPORT_REPAIR_PKS_SUBKEY_BUG;
@ -1825,7 +1825,6 @@ main (int argc, char **argv )
opt.min_cert_level=2; opt.min_cert_level=2;
set_screen_dimensions(); set_screen_dimensions();
opt.keyid_format=KF_SHORT; opt.keyid_format=KF_SHORT;
opt.rfc2440_text=1;
opt.def_sig_expire="0"; opt.def_sig_expire="0";
opt.def_cert_expire="0"; opt.def_cert_expire="0";
set_homedir ( default_homedir () ); set_homedir ( default_homedir () );
@ -2258,14 +2257,16 @@ main (int argc, char **argv )
break; break;
case oOpenPGP: case oOpenPGP:
case oRFC4880: case oRFC4880:
/* Note these are the same defaults as CO_RFC2440. Update /* This is effectively the same as RFC2440, but with
this. */ "--enable-dsa2 --no-rfc2440-text
--escape-from-lines". */
opt.compliance = CO_RFC4880; opt.compliance = CO_RFC4880;
opt.rfc2440_text=1; opt.flags.dsa2 = 1;
opt.rfc2440_text = 0;
opt.allow_non_selfsigned_uid = 1; opt.allow_non_selfsigned_uid = 1;
opt.allow_freeform_uid = 1; opt.allow_freeform_uid = 1;
opt.pgp2_workarounds = 0; opt.pgp2_workarounds = 0;
opt.escape_from = 0; opt.escape_from = 1;
opt.force_v3_sigs = 0; opt.force_v3_sigs = 0;
opt.compress_keys = 0; /* not mandated, but we do it */ opt.compress_keys = 0; /* not mandated, but we do it */
opt.compress_sigs = 0; /* ditto. */ opt.compress_sigs = 0; /* ditto. */
@ -2279,10 +2280,9 @@ main (int argc, char **argv )
opt.s2k_cipher_algo = CIPHER_ALGO_3DES; opt.s2k_cipher_algo = CIPHER_ALGO_3DES;
break; break;
case oRFC2440: case oRFC2440:
/* TODO: When 2440bis becomes a RFC, set new values for
oOpenPGP. */
opt.compliance = CO_RFC2440; opt.compliance = CO_RFC2440;
opt.rfc2440_text=1; opt.flags.dsa2 = 0;
opt.rfc2440_text = 1;
opt.allow_non_selfsigned_uid = 1; opt.allow_non_selfsigned_uid = 1;
opt.allow_freeform_uid = 1; opt.allow_freeform_uid = 1;
opt.pgp2_workarounds = 0; opt.pgp2_workarounds = 0;