From 67cd81ed90ad88cbe607b7f7d1a0b1e08b8ac1f1 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Tue, 14 Jun 2016 15:57:57 +0200 Subject: [PATCH] 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. (backport of master commit 5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68) GnuPG-bug-id: 2273, 2934 Signed-off-by: Werner Koch --- sm/gpgsm.c | 4 +++- 1 file changed, 3 insertions(+), 1 deletion(-) diff --git a/sm/gpgsm.c b/sm/gpgsm.c index ef01a5cdf..ebb7ed18c 100644 --- a/sm/gpgsm.c +++ b/sm/gpgsm.c @@ -1489,6 +1489,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") @@ -1496,7 +1498,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";