diff options
| author | Werner Koch <wk@gnupg.org> | 2016-06-14 15:57:57 +0200 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2016-06-14 15:57:57 +0200 |
| commit | 5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68 (patch) | |
| tree | b26800b4ba2e45c11daffbc9be09186e24cb2a09 /sm/gpgsm.c | |
| parent | doc: Add files and envvars to a new index. (diff) | |
| download | gnupg2-5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68.tar.xz gnupg2-5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68.zip | |
gpgsm: Allow ciphers AES192 and SERPENT256
* sm/gpgsm.c (main): Add AES192 cipher. Allow SERPENT256.
--
Note that currently released Libcgrypt versions miss OIDs for Serpent
and thus Serpent can only be used with tye forthcoming Libgcrypt
1.7.1.
GnuPG-bug-id: 2273
Signed-off-by: Werner Koch <wk@gnupg.org>
Diffstat (limited to 'sm/gpgsm.c')
| -rw-r--r-- | sm/gpgsm.c | 4 |
1 files changed, 3 insertions, 1 deletions
diff --git a/sm/gpgsm.c b/sm/gpgsm.c index 8663ac8dc..9b7dd4bee 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1559,6 +1559,8 @@ main ( int argc, char **argv) else if (!strcmp (opt.def_cipher_algoid, "AES") || !strcmp (opt.def_cipher_algoid, "AES128")) opt.def_cipher_algoid = "2.16.840.1.101.3.4.1.2"; + else if (!strcmp (opt.def_cipher_algoid, "AES192") ) + opt.def_cipher_algoid = "2.16.840.1.101.3.4.1.22"; else if (!strcmp (opt.def_cipher_algoid, "AES256") ) opt.def_cipher_algoid = "2.16.840.1.101.3.4.1.42"; else if (!strcmp (opt.def_cipher_algoid, "SERPENT") @@ -1566,7 +1568,7 @@ main ( int argc, char **argv) opt.def_cipher_algoid = "1.3.6.1.4.1.11591.13.2.2"; else if (!strcmp (opt.def_cipher_algoid, "SERPENT192") ) opt.def_cipher_algoid = "1.3.6.1.4.1.11591.13.2.22"; - else if (!strcmp (opt.def_cipher_algoid, "SERPENT192") ) + else if (!strcmp (opt.def_cipher_algoid, "SERPENT256") ) opt.def_cipher_algoid = "1.3.6.1.4.1.11591.13.2.42"; else if (!strcmp (opt.def_cipher_algoid, "SEED") ) opt.def_cipher_algoid = "1.2.410.200004.1.4"; |