[svn] gcry - r1284 - in trunk: . cipher src tests

svn author wk cvs at cvs.gnupg.org
Fri Apr 18 13:44:12 CEST 2008


Author: wk
Date: 2008-04-18 13:44:07 +0200 (Fri, 18 Apr 2008)
New Revision: 1284

Modified:
   trunk/ChangeLog
   trunk/NEWS
   trunk/cipher/ChangeLog
   trunk/cipher/ac.c
   trunk/cipher/camellia-glue.c
   trunk/cipher/camellia.h
   trunk/cipher/cipher.c
   trunk/cipher/rndw32.c
   trunk/cipher/sha1.c
   trunk/configure.ac
   trunk/src/ChangeLog
   trunk/src/missing-string.c
   trunk/tests/basic.c
   trunk/tests/pubkey.c
Log:
Collected changes.  See ChnageLogs.


[The diff below has been truncated]

Modified: trunk/ChangeLog
===================================================================
--- trunk/ChangeLog	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/ChangeLog	2008-04-18 11:44:07 UTC (rev 1284)
@@ -1,3 +1,20 @@
+2008-04-18  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (AH_BOTTOM): Add CAMELLIA_EXT_SYM_PREFIX.
+
+2008-04-01  Werner Koch  <wk at g10code.com>
+
+	* configure.ac (AC_INIT): Fix quoting.
+
+2008-03-19  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Fix the tests for USE_<algo> to either define or
+	undef the macros.  Suggested by Dirk Stoecker.
+
+2008-03-18  Werner Koch  <wk at g10code.com>
+
+	* configure.ac: Test for uintptr_t.
+
 2008-02-18  Werner Koch  <wk at g10code.com>
 
 	* configure.ac (IS_DEVELOPMENT_VERSION): Set depending on the my_svn.
@@ -1248,7 +1265,7 @@
 
 	
  Copyright 1998, 1999, 2000, 2001, 2002, 2003,
-	   2004, 2006 Free Software Foundation, Inc.
+	   2004, 2006, 2007, 2008 Free Software Foundation, Inc.
 
  This file is free software; as a special exception the author gives
  unlimited permission to copy and/or distribute it, with or without

Modified: trunk/cipher/ChangeLog
===================================================================
--- trunk/cipher/ChangeLog	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/cipher/ChangeLog	2008-04-18 11:44:07 UTC (rev 1284)
@@ -1,3 +1,27 @@
+2008-04-18  Werner Koch  <wk at g10code.com>
+
+	* ac.c (ac_data_extract): Make static.
+
+	* camellia.h [HAVE_CONFIG_H]: Include config.h.
+
+	* rndw32.c (registry_poll): Only print the performance data
+	problem warning once.  Suggested by Simon Josefsson.
+
+2008-03-19  Werner Koch  <wk at g10code.com>
+
+	* cipher.c (gcry_cipher_open) [USE_AES]: Init bulk encryption only
+	if requested.  Suggested by Dirk Stoecker.
+
+2008-03-18  Werner Koch  <wk at g10code.com>
+
+	* sha1.c: Include stdint.h.
+	(transform): Add arg NBLOCKS so that we can work on more than one
+	block and avoid updates of the chaining variables.  Changed all
+	callers to use 1.
+	(sha1_write): Replace loop around transform.
+	(transform_aligned) [WORDS_BIGENDIAN]: New.
+	(TRANSFORM): New macro to replace all direct calls of transform.
+
 2008-03-17  Werner Koch  <wk at g10code.com>
 
 	* rijndael.c (_gcry_aes_cfb_dec): New.

Modified: trunk/src/ChangeLog
===================================================================
--- trunk/src/ChangeLog	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/src/ChangeLog	2008-04-18 11:44:07 UTC (rev 1284)
@@ -1,3 +1,8 @@
+2008-04-18  Werner Koch  <wk at g10code.com>
+
+	* missing-string.c (vasprintf): Remove.  It is not used.  Reported
+	by Simon Josefsson.
+
 2008-03-11  Werner Koch  <wk at g10code.com>
 
 	* gcrypt.h.in (gcry_ac_em_t, gcry_ac_scheme_t): Remove trailing

Modified: trunk/NEWS
===================================================================
--- trunk/NEWS	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/NEWS	2008-04-18 11:44:07 UTC (rev 1284)
@@ -4,7 +4,7 @@
  * Fixed a bug introduced by 1.3.1 which led to the comsumption of far
    too much entropy for the intial seeding.
 
- * Improved AES performance for CFB and CBS modes.
+ * Improved AES performance for CFB and CBC modes.
 
 
 Noteworthy changes in version 1.4.0 (2007-12-10)

Modified: trunk/cipher/ac.c
===================================================================
--- trunk/cipher/ac.c	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/cipher/ac.c	2008-04-18 11:44:07 UTC (rev 1284)
@@ -1117,7 +1117,7 @@
 
    (IDENTIFIER [...]
    (ALGORITHM <list of named MPI values>)) */
-gcry_error_t
+static gcry_error_t
 ac_data_extract (const char *identifier, const char *algorithm,
 		 gcry_sexp_t sexp, gcry_ac_data_t *data)
 {

Modified: trunk/cipher/camellia-glue.c
===================================================================
--- trunk/cipher/camellia-glue.c	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/cipher/camellia-glue.c	2008-04-18 11:44:07 UTC (rev 1284)
@@ -27,18 +27,33 @@
    There is one small change which needs to be done: Include the
    following code at the top of camellia.h: */
 #if 0
-/* Need to redefine the external symbols to keep the libgcrypt name
-   space clean.  */ 
-#define Camellia_Ekeygen      _gcry_Camellia_Ekeygen
-#define Camellia_EncryptBlock _gcry_Camellia_EncryptBlock
-#define Camellia_DecryptBlock _gcry_Camellia_DecryptBlock
-#define camellia_decrypt128   _gcry_camellia_decrypt128
-#define camellia_decrypt256   _gcry_camellia_decrypt256
-#define camellia_encrypt128   _gcry_camellia_encrypt128
-#define camellia_encrypt256   _gcry_camellia_encrypt256
-#define camellia_setup128     _gcry_camellia_setup128  
-#define camellia_setup192     _gcry_camellia_setup192  
-#define camellia_setup256     _gcry_camellia_setup256
+
+/* To use Camellia with libraries it is often useful to keep the name
+ * space of the library clean.  The following macro is thus useful:
+ *
+ *     #define CAMELLIA_EXT_SYM_PREFIX foo_
+ *  
+ * This prefixes all external symbols with "foo_".
+ */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
+#ifdef CAMELLIA_EXT_SYM_PREFIX
+#define CAMELLIA_PREFIX1(x,y) x ## y
+#define CAMELLIA_PREFIX2(x,y) CAMELLIA_PREFIX1(x,y)
+#define CAMELLIA_PREFIX(x)    CAMELLIA_PREFIX2(CAMELLIA_EXT_SYM_PREFIX,x)
+#define Camellia_Ekeygen      CAMELLIA_PREFIX(Camellia_Ekeygen)
+#define Camellia_EncryptBlock CAMELLIA_PREFIX(Camellia_EncryptBlock)
+#define Camellia_DecryptBlock CAMELLIA_PREFIX(Camellia_DecryptBlock)
+#define camellia_decrypt128   CAMELLIA_PREFIX(camellia_decrypt128)
+#define camellia_decrypt256   CAMELLIA_PREFIX(camellia_decrypt256)
+#define camellia_encrypt128   CAMELLIA_PREFIX(camellia_encrypt128)
+#define camellia_encrypt256   CAMELLIA_PREFIX(camellia_encrypt256)
+#define camellia_setup128     CAMELLIA_PREFIX(camellia_setup128)
+#define camellia_setup192     CAMELLIA_PREFIX(camellia_setup192) 
+#define camellia_setup256     CAMELLIA_PREFIX(camellia_setup256)
+#endif /*CAMELLIA_EXT_SYM_PREFIX*/
+
 #endif /* Code sample. */
 
 

Modified: trunk/cipher/camellia.h
===================================================================
--- trunk/cipher/camellia.h	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/cipher/camellia.h	2008-04-18 11:44:07 UTC (rev 1284)
@@ -28,6 +28,9 @@
  *  
  * This prefixes all external symbols with "foo_".
  */
+#ifdef HAVE_CONFIG_H
+#include <config.h>
+#endif
 #ifdef CAMELLIA_EXT_SYM_PREFIX
 #define CAMELLIA_PREFIX1(x,y) x ## y
 #define CAMELLIA_PREFIX2(x,y) CAMELLIA_PREFIX1(x,y)
@@ -44,6 +47,7 @@
 #define camellia_setup256     CAMELLIA_PREFIX(camellia_setup256)
 #endif /*CAMELLIA_EXT_SYM_PREFIX*/
 
+
 #ifdef  __cplusplus
 extern "C" {
 #endif

Modified: trunk/cipher/cipher.c
===================================================================
--- trunk/cipher/cipher.c	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/cipher/cipher.c	2008-04-18 11:44:07 UTC (rev 1284)
@@ -750,6 +750,7 @@
           /* Setup bulk encryption routines.  */
           switch (algo)
             {
+#ifdef USE_AES
             case GCRY_CIPHER_AES128:
             case GCRY_CIPHER_AES192:
             case GCRY_CIPHER_AES256:
@@ -758,6 +759,7 @@
               h->bulk.cbc_enc = _gcry_aes_cbc_enc;
               h->bulk.cbc_dec = _gcry_aes_cbc_dec;
               break;
+#endif /*USE_AES*/
               
             default:
               break;

Modified: trunk/cipher/rndw32.c
===================================================================
--- trunk/cipher/rndw32.c	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/cipher/rndw32.c	2008-04-18 11:44:07 UTC (rev 1284)
@@ -440,8 +440,17 @@
         }
       else
         {
-          log_debug ("rndw32: get performance data problem: ec=%ld\n",
-                     status);
+          static int been_here;
+
+          /* Silence the error message.  In particular under Wine (as
+             of 2008) we would get swamped with such diagnotiscs.  One
+             such diagnotiscs should be enough.  */
+          if (been_here != status)
+            {
+              been_here = status;
+              log_debug ("rndw32: get performance data problem: ec=%ld\n",
+                         status);
+            }
           break;
         }
     }

Modified: trunk/cipher/sha1.c
===================================================================
--- trunk/cipher/sha1.c	2008-03-17 18:08:15 UTC (rev 1283)
+++ trunk/cipher/sha1.c	2008-04-18 11:44:07 UTC (rev 1284)
@@ -1,5 +1,5 @@
 /* sha1.c - SHA1 hash function
- *	Copyright (C) 1998, 2001, 2002, 2003 Free Software Foundation, Inc.
+ * Copyright (C) 1998, 2001, 2002, 2003, 2008 Free Software Foundation, Inc.
  *
  * This file is part of Libgcrypt.
  *
@@ -14,8 +14,7 @@
  * GNU Lesser General Public License for more details.
  *
  * You should have received a copy of the GNU Lesser General Public
- * License along with this program; if not, write to the Free Software
- * Foundation, Inc., 59 Temple Place - Suite 330, Boston, MA 02111-1307, USA
+ * License along with this program; if not, see <http://www.gnu.org/licenses/>.
  */
 
 
@@ -33,20 +32,47 @@
 #include <stdio.h>
 #include <stdlib.h>
 #include <string.h>
+#ifdef HAVE_STDINT_H 
+# include <stdint.h>
+#endif
 
 #include "g10lib.h"
 #include "memory.h"
 #include "bithelp.h"
 #include "cipher.h"
 
-typedef struct {
-    u32  h0,h1,h2,h3,h4;
-    u32  nblocks;
-    byte buf[64];
-    int  count;
+
+/* A macro to test whether P is properly aligned for an u32 type.
+   Note that config.h provides a suitable replacement for uintptr_t if
+   it does not exist in stdint.h.  */
+#if __GNUC__ >= 2
+# define U32_ALIGNED_P(p) (!(((uintptr_t)p) % __alignof__ (u32)))
+#else
+# define U32_ALIGNED_P(p) (!(((uintptr_t)p) % sizeof (u32)))
+#endif
+
+#if WORDS_BIGENDIAN
+#define TRANSFORM(x,d,n) do { if (U32_ALIGNED_P ((x)))             \
+                                transform_aligned ((x), (d), (n)); \
+                              else                                 \
+                                transform ((x), (d), (n));         \
+                            } while (0)
+#else
+#define TRANSFORM(x,d,n) transform ((x), (d), (n))
+#endif
+
+
+
+typedef struct 
+{
+  u32           h0,h1,h2,h3,h4;
+  u32           nblocks;
+  unsigned char buf[64];
+  int           count;
 } SHA1_CONTEXT;
 
 
+
 static void
 sha1_init (void *context)
 {
@@ -62,147 +88,275 @@
 }
 
 
-/****************
- * Transform the message X which consists of 16 32-bit-words
+/* Round function macros. */
+#define K1  0x5A827999L
+#define K2  0x6ED9EBA1L
+#define K3  0x8F1BBCDCL
+#define K4  0xCA62C1D6L
+#define F1(x,y,z)   ( z ^ ( x & ( y ^ z ) ) )
+#define F2(x,y,z)   ( x ^ y ^ z )
+#define F3(x,y,z)   ( ( x & y ) | ( z & ( x | y ) ) )
+#define F4(x,y,z)   ( x ^ y ^ z )
+#define M(i) ( tm =    x[ i    &0x0f]  \
+                     ^ x[(i-14)&0x0f]  \
+	 	     ^ x[(i-8) &0x0f]  \
+                     ^ x[(i-3) &0x0f], \
+                     (x[i&0x0f] = rol(tm, 1)))
+#define R(a,b,c,d,e,f,k,m)  do { e += rol( a, 5 )     \
+	                              + f( b, c, d )  \
+		 		      + k	      \
+			 	      + m;	      \
+				 b = rol( b, 30 );    \
+			       } while(0)
+
+
+/*
+ * Transform NBLOCKS of each 64 bytes (16 32-bit words) at DATA.
+ * Unaligned version.
  */
 static void
-transform ( SHA1_CONTEXT *hd, const unsigned char *data )
+transform (SHA1_CONTEXT *hd, const unsigned char *data, size_t nblocks)
 {
-  register u32 a,b,c,d,e,tm;
-  u32 x[16];
-
-  /* Get values from the chaining vars. */
-  a = hd->h0;
-  b = hd->h1;
-  c = hd->h2;
-  d = hd->h3;
-  e = hd->h4;
-
+  register u32 a, b, c, d, e; /* Local copies of the chaining variables.  */
+  register u32 tm;            /* Helper.  */
+  u32 x[16];                  /* The array we work on. */
+  
+  /* Loop over all blocks.  */
+  for ( ;nblocks; nblocks--)
+    {
 #ifdef WORDS_BIGENDIAN
-  memcpy( x, data, 64 );
+      memcpy (x, data, 64);
+      data += 64;
 #else
-  {
-    int i;
-    byte *p2;
-    for(i=0, p2=(byte*)x; i < 16; i++, p2 += 4 )
       {
-        p2[3] = *data++;
-        p2[2] = *data++;
-        p2[1] = *data++;
-        p2[0] = *data++;
+        int i;
+        unsigned char *p;
+
+        for(i=0, p=(unsigned char*)x; i < 16; i++, p += 4 )
+          {
+            p[3] = *data++;
+            p[2] = *data++;
+            p[1] = *data++;
+            p[0] = *data++;
+          }
       }
-  }
 #endif
+      /* Get the values of the chaining variables. */
+      a = hd->h0;
+      b = hd->h1;
+      c = hd->h2;
+      d = hd->h3;
+      e = hd->h4;
 
+      /* Transform. */
+      R( a, b, c, d, e, F1, K1, x[ 0] );
+      R( e, a, b, c, d, F1, K1, x[ 1] );
+      R( d, e, a, b, c, F1, K1, x[ 2] );
+      R( c, d, e, a, b, F1, K1, x[ 3] );
+      R( b, c, d, e, a, F1, K1, x[ 4] );
+      R( a, b, c, d, e, F1, K1, x[ 5] );
+      R( e, a, b, c, d, F1, K1, x[ 6] );
+      R( d, e, a, b, c, F1, K1, x[ 7] );
+      R( c, d, e, a, b, F1, K1, x[ 8] );
+      R( b, c, d, e, a, F1, K1, x[ 9] );
+      R( a, b, c, d, e, F1, K1, x[10] );
+      R( e, a, b, c, d, F1, K1, x[11] );
+      R( d, e, a, b, c, F1, K1, x[12] );
+      R( c, d, e, a, b, F1, K1, x[13] );
+      R( b, c, d, e, a, F1, K1, x[14] );
+      R( a, b, c, d, e, F1, K1, x[15] );
+      R( e, a, b, c, d, F1, K1, M(16) );
+      R( d, e, a, b, c, F1, K1, M(17) );
+      R( c, d, e, a, b, F1, K1, M(18) );
+      R( b, c, d, e, a, F1, K1, M(19) );
+      R( a, b, c, d, e, F2, K2, M(20) );
+      R( e, a, b, c, d, F2, K2, M(21) );
+      R( d, e, a, b, c, F2, K2, M(22) );
+      R( c, d, e, a, b, F2, K2, M(23) );
+      R( b, c, d, e, a, F2, K2, M(24) );
+      R( a, b, c, d, e, F2, K2, M(25) );
+      R( e, a, b, c, d, F2, K2, M(26) );
+      R( d, e, a, b, c, F2, K2, M(27) );
+      R( c, d, e, a, b, F2, K2, M(28) );
+      R( b, c, d, e, a, F2, K2, M(29) );
+      R( a, b, c, d, e, F2, K2, M(30) );
+      R( e, a, b, c, d, F2, K2, M(31) );
+      R( d, e, a, b, c, F2, K2, M(32) );
+      R( c, d, e, a, b, F2, K2, M(33) );
+      R( b, c, d, e, a, F2, K2, M(34) );
+      R( a, b, c, d, e, F2, K2, M(35) );
+      R( e, a, b, c, d, F2, K2, M(36) );
+      R( d, e, a, b, c, F2, K2, M(37) );
+      R( c, d, e, a, b, F2, K2, M(38) );
+      R( b, c, d, e, a, F2, K2, M(39) );
+      R( a, b, c, d, e, F3, K3, M(40) );
+      R( e, a, b, c, d, F3, K3, M(41) );
+      R( d, e, a, b, c, F3, K3, M(42) );
+      R( c, d, e, a, b, F3, K3, M(43) );
+      R( b, c, d, e, a, F3, K3, M(44) );
+      R( a, b, c, d, e, F3, K3, M(45) );
+      R( e, a, b, c, d, F3, K3, M(46) );
+      R( d, e, a, b, c, F3, K3, M(47) );
+      R( c, d, e, a, b, F3, K3, M(48) );
+      R( b, c, d, e, a, F3, K3, M(49) );
+      R( a, b, c, d, e, F3, K3, M(50) );
+      R( e, a, b, c, d, F3, K3, M(51) );
+      R( d, e, a, b, c, F3, K3, M(52) );
+      R( c, d, e, a, b, F3, K3, M(53) );
+      R( b, c, d, e, a, F3, K3, M(54) );
+      R( a, b, c, d, e, F3, K3, M(55) );
+      R( e, a, b, c, d, F3, K3, M(56) );
+      R( d, e, a, b, c, F3, K3, M(57) );
+      R( c, d, e, a, b, F3, K3, M(58) );
+      R( b, c, d, e, a, F3, K3, M(59) );
+      R( a, b, c, d, e, F4, K4, M(60) );
+      R( e, a, b, c, d, F4, K4, M(61) );
+      R( d, e, a, b, c, F4, K4, M(62) );
+      R( c, d, e, a, b, F4, K4, M(63) );
+      R( b, c, d, e, a, F4, K4, M(64) );
+      R( a, b, c, d, e, F4, K4, M(65) );
+      R( e, a, b, c, d, F4, K4, M(66) );
+      R( d, e, a, b, c, F4, K4, M(67) );
+      R( c, d, e, a, b, F4, K4, M(68) );
+      R( b, c, d, e, a, F4, K4, M(69) );
+      R( a, b, c, d, e, F4, K4, M(70) );
+      R( e, a, b, c, d, F4, K4, M(71) );
+      R( d, e, a, b, c, F4, K4, M(72) );
+      R( c, d, e, a, b, F4, K4, M(73) );
+      R( b, c, d, e, a, F4, K4, M(74) );
+      R( a, b, c, d, e, F4, K4, M(75) );
+      R( e, a, b, c, d, F4, K4, M(76) );
+      R( d, e, a, b, c, F4, K4, M(77) );
+      R( c, d, e, a, b, F4, K4, M(78) );
+      R( b, c, d, e, a, F4, K4, M(79) );
 
-#define K1  0x5A827999L
-#define K2  0x6ED9EBA1L
-#define K3  0x8F1BBCDCL
-#define K4  0xCA62C1D6L
-#define F1(x,y,z)   ( z ^ ( x & ( y ^ z ) ) )
-#define F2(x,y,z)   ( x ^ y ^ z )
-#define F3(x,y,z)   ( ( x & y ) | ( z & ( x | y ) ) )
-#define F4(x,y,z)   ( x ^ y ^ z )
+      /* Update the chaining variables. */
+      hd->h0 += a;
+      hd->h1 += b;
+      hd->h2 += c;
+      hd->h3 += d;
+      hd->h4 += e;
+    }
+}
 
 
-#define M(i) ( tm =   x[i&0x0f] ^ x[(i-14)&0x0f] \
-		    ^ x[(i-8)&0x0f] ^ x[(i-3)&0x0f] \
-	       , (x[i&0x0f] = rol(tm, 1)) )
+#ifdef WORDS_BIGENDIAN
+/*
+ * Transform NBLOCKS of each 64 bytes (16 32-bit words) at DATA.  This
+ * version requires that DATA is aligned on a u32 boundary.  Note that
+ * we can do this only on big endian machines because we need to sawp
+ * bytes on little endian anyway.
+ */
+static void
+transform_aligned (SHA1_CONTEXT *hd, const unsigned char *data, size_t nblocks)
+{
+  register u32 a, b, c, d, e; /* Local copies of the chaining variables.  */
+  register u32 tm;            /* Helper.  */
+  const u32 *x;               /* 32 bit pointer we use for processing.  */
+  
+  x = (const u32*)data;
 
-#define R(a,b,c,d,e,f,k,m)  do { e += rol( a, 5 )     \
-				      + f( b, c, d )  \
-				      + k	      \
-				      + m;	      \
-				 b = rol( b, 30 );    \
-			       } while(0)
-  R( a, b, c, d, e, F1, K1, x[ 0] );
-  R( e, a, b, c, d, F1, K1, x[ 1] );
-  R( d, e, a, b, c, F1, K1, x[ 2] );
-  R( c, d, e, a, b, F1, K1, x[ 3] );
-  R( b, c, d, e, a, F1, K1, x[ 4] );
-  R( a, b, c, d, e, F1, K1, x[ 5] );
-  R( e, a, b, c, d, F1, K1, x[ 6] );
-  R( d, e, a, b, c, F1, K1, x[ 7] );
-  R( c, d, e, a, b, F1, K1, x[ 8] );
-  R( b, c, d, e, a, F1, K1, x[ 9] );
-  R( a, b, c, d, e, F1, K1, x[10] );
-  R( e, a, b, c, d, F1, K1, x[11] );
-  R( d, e, a, b, c, F1, K1, x[12] );
-  R( c, d, e, a, b, F1, K1, x[13] );
-  R( b, c, d, e, a, F1, K1, x[14] );
-  R( a, b, c, d, e, F1, K1, x[15] );
-  R( e, a, b, c, d, F1, K1, M(16) );
-  R( d, e, a, b, c, F1, K1, M(17) );
-  R( c, d, e, a, b, F1, K1, M(18) );
-  R( b, c, d, e, a, F1, K1, M(19) );
-  R( a, b, c, d, e, F2, K2, M(20) );
-  R( e, a, b, c, d, F2, K2, M(21) );
-  R( d, e, a, b, c, F2, K2, M(22) );
-  R( c, d, e, a, b, F2, K2, M(23) );
-  R( b, c, d, e, a, F2, K2, M(24) );
-  R( a, b, c, d, e, F2, K2, M(25) );
-  R( e, a, b, c, d, F2, K2, M(26) );
-  R( d, e, a, b, c, F2, K2, M(27) );
-  R( c, d, e, a, b, F2, K2, M(28) );
-  R( b, c, d, e, a, F2, K2, M(29) );
-  R( a, b, c, d, e, F2, K2, M(30) );
-  R( e, a, b, c, d, F2, K2, M(31) );
-  R( d, e, a, b, c, F2, K2, M(32) );
-  R( c, d, e, a, b, F2, K2, M(33) );
-  R( b, c, d, e, a, F2, K2, M(34) );
-  R( a, b, c, d, e, F2, K2, M(35) );
-  R( e, a, b, c, d, F2, K2, M(36) );
-  R( d, e, a, b, c, F2, K2, M(37) );
-  R( c, d, e, a, b, F2, K2, M(38) );
-  R( b, c, d, e, a, F2, K2, M(39) );
-  R( a, b, c, d, e, F3, K3, M(40) );
-  R( e, a, b, c, d, F3, K3, M(41) );
-  R( d, e, a, b, c, F3, K3, M(42) );
-  R( c, d, e, a, b, F3, K3, M(43) );
-  R( b, c, d, e, a, F3, K3, M(44) );
-  R( a, b, c, d, e, F3, K3, M(45) );
-  R( e, a, b, c, d, F3, K3, M(46) );
-  R( d, e, a, b, c, F3, K3, M(47) );
-  R( c, d, e, a, b, F3, K3, M(48) );
-  R( b, c, d, e, a, F3, K3, M(49) );
-  R( a, b, c, d, e, F3, K3, M(50) );
-  R( e, a, b, c, d, F3, K3, M(51) );
-  R( d, e, a, b, c, F3, K3, M(52) );
-  R( c, d, e, a, b, F3, K3, M(53) );
-  R( b, c, d, e, a, F3, K3, M(54) );
-  R( a, b, c, d, e, F3, K3, M(55) );
-  R( e, a, b, c, d, F3, K3, M(56) );
-  R( d, e, a, b, c, F3, K3, M(57) );
-  R( c, d, e, a, b, F3, K3, M(58) );
-  R( b, c, d, e, a, F3, K3, M(59) );
-  R( a, b, c, d, e, F4, K4, M(60) );
-  R( e, a, b, c, d, F4, K4, M(61) );
-  R( d, e, a, b, c, F4, K4, M(62) );
-  R( c, d, e, a, b, F4, K4, M(63) );
-  R( b, c, d, e, a, F4, K4, M(64) );
-  R( a, b, c, d, e, F4, K4, M(65) );




More information about the Gnupg-commits mailing list