[Pkg-gnupg-commit] [gnupg2] 83/102: gpgsm: Allow ciphers AES192 and SERPENT256

[Daniel Kahn Gillmor]

This is an automated email from the git hooks/post-receive script.

dkg pushed a commit to branch experimental
in repository gnupg2.

commit 5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68
Author: Werner Koch <wk at gnupg.org>
Date:   Tue Jun 14 15:57:57 2016 +0200

    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 at gnupg.org>
---
 sm/gpgsm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)

diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index 8663ac8..9b7dd4b 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";

-- 
Alioth's /usr/local/bin/git-commit-notice on /srv/git.debian.org/git/pkg-gnupg/gnupg2.git