mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-02 22:46:30 +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
|
@ -1303,7 +1303,7 @@ main( int argc, char **argv )
|
|||
"while in --pgp2 mode\n"));
|
||||
unusable=1;
|
||||
}
|
||||
else if(cmd==aSignEncr)
|
||||
else if(cmd==aSignEncr || cmd==aSignSym)
|
||||
{
|
||||
log_info(_("you can't sign and encrypt at the "
|
||||
"same time while in --pgp2 mode\n"));
|
||||
|
@ -1329,7 +1329,7 @@ main( int argc, char **argv )
|
|||
idea_cipher_warn(1);
|
||||
unusable=1;
|
||||
}
|
||||
else
|
||||
else if(cmd==aSym)
|
||||
{
|
||||
m_free(def_cipher_string);
|
||||
def_cipher_string = m_strdup("idea");
|
||||
|
@ -1338,7 +1338,7 @@ main( int argc, char **argv )
|
|||
|
||||
if(unusable)
|
||||
{
|
||||
log_info(_("this message will not be usable by PGP 2.x\n"));
|
||||
log_info(_("this message may not be usable by PGP 2.x\n"));
|
||||
opt.pgp2=0;
|
||||
}
|
||||
else
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue