[git] GnuPG - branch, STABLE-BRANCH-2-0, updated. gnupg-2.0.30-30-g67cd81e

[by Werner Koch]

This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU Privacy Guard".

The branch, STABLE-BRANCH-2-0 has been updated
       via  67cd81ed90ad88cbe607b7f7d1a0b1e08b8ac1f1 (commit)
      from  2975eee420007557a138445d0505f1d590d88d7e (commit)

Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.

- Log -----------------------------------------------------------------
commit 67cd81ed90ad88cbe607b7f7d1a0b1e08b8ac1f1
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.
    
    (backport of master commit 5f9bd7a9e1ed4edcbb6c4e908d4bea5cd7dc9e68)
    
    GnuPG-bug-id: 2273, 2934
    Signed-off-by: Werner Koch <wk at gnupg.org>

diff --git a/sm/gpgsm.c b/sm/gpgsm.c
index ef01a5c..ebb7ed1 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";

-----------------------------------------------------------------------

Summary of changes:
 sm/gpgsm.c | 4 +++-
 1 file changed, 3 insertions(+), 1 deletion(-)


hooks/post-receive
-- 
The GNU Privacy Guard
http://git.gnupg.org