mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
Some compatibility polish for PGP2. Add a fake IDEA preference for v3
keys (this is in the RFC), so that they can be (sometimes) used along OpenPGP keys. Do not force using IDEA on an OpenPGP key, as this may violate its prefs. Also, revise the help text for the sig class explanation.
This commit is contained in:
parent
5a92c6052f
commit
1dbd67b96a
9 changed files with 94 additions and 17 deletions
11
g10/keygen.c
11
g10/keygen.c
|
@ -217,8 +217,15 @@ keygen_set_std_prefs (const char *string)
|
|||
const char *s, *s2;
|
||||
int rc = 0;
|
||||
|
||||
if (!string || !ascii_strcasecmp (string, "default"))
|
||||
string = "S7 S10 S3 S4 H3 H2 Z2 Z1";
|
||||
if (!string || !ascii_strcasecmp (string, "default")) {
|
||||
if ( !check_cipher_algo(CIPHER_ALGO_IDEA) )
|
||||
string = "S7 S10 S3 S4 S2 S1 H3 H2 Z2 Z1";
|
||||
else
|
||||
string = "S7 S10 S3 S4 S2 H3 H2 Z2 Z1";
|
||||
|
||||
/* If we have it, IDEA goes *after* 3DES so it won't be used
|
||||
unless we're encrypting along with a V3 key. */
|
||||
}
|
||||
else if (!ascii_strcasecmp (string, "none"))
|
||||
string = "";
|
||||
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue