mirror of
git://git.gnupg.org/gnupg.git
synced 2025-07-03 22:56:33 +02:00
* g10.c (main): --openpgp disables --pgpX.
* keyedit.c (show_prefs): Make strings translatable.
This commit is contained in:
parent
2bffa31fcc
commit
9a80333f49
3 changed files with 22 additions and 6 deletions
|
@ -1454,6 +1454,10 @@ main( int argc, char **argv )
|
|||
opt.s2k_mode = 3; /* iterated+salted */
|
||||
opt.s2k_digest_algo = DIGEST_ALGO_SHA1;
|
||||
opt.s2k_cipher_algo = CIPHER_ALGO_CAST5;
|
||||
opt.pgp2 = 0;
|
||||
opt.pgp6 = 0;
|
||||
opt.pgp7 = 0;
|
||||
opt.pgp8 = 0;
|
||||
break;
|
||||
case oPGP2: opt.pgp2 = 1; break;
|
||||
case oNoPGP2: opt.pgp2 = 0; break;
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue