.

5 files changed, 161 insertions, 6 deletions

diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index da0c03ef7..cbcea5f9e 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,7 @@
+Thu Sep 17 19:00:06 1998  Werner Koch  (wk@(none))
+
+	* des.c : New file from Michael Roth <[email protected]>
+
 Mon Sep 14 11:10:55 1998  Werner Koch  (wk@(none))
 
 	* blowfish.c (bf_setkey): Niklas Hernaeus patch to detect weak keys.
diff --git a/cipher/Makefile.am b/cipher/Makefile.am
index 5f0784c67..09edd4df9 100644
--- a/cipher/Makefile.am
+++ b/cipher/Makefile.am
@@ -17,6 +17,8 @@ libcipher_a_SOURCES = cipher.c	\
 		 md.c		\
 		 dynload.c	\
 		 dynload.h	\
+		 des.c		\
+		 des.h		\
 		 blowfish.c	\
 		 blowfish.h	\
 		 cast5.c	\
diff --git a/cipher/cipher.c b/cipher/cipher.c
index 2326d1dd2..95c4b70df 100644
--- a/cipher/cipher.c
+++ b/cipher/cipher.c
@@ -29,6 +29,7 @@
 #include "util.h"
 #include "errors.h"
 #include "cipher.h"
+#include "des.h"
 #include "blowfish.h"
 #include "cast5.h"
 #include "dynload.h"
@@ -106,6 +107,17 @@ setup_cipher_table()
     if( !cipher_table[i].name )
 	BUG();
     i++;
+    cipher_table[i].algo = CIPHER_ALGO_3DES;
+    cipher_table[i].name = des_get_info( cipher_table[i].algo,
+					 &cipher_table[i].keylen,
+					 &cipher_table[i].blocksize,
+					 &cipher_table[i].contextsize,
+					 &cipher_table[i].setkey,
+					 &cipher_table[i].encrypt,
+					 &cipher_table[i].decrypt     );
+    if( !cipher_table[i].name )
+	BUG();
+    i++;
     cipher_table[i].algo = CIPHER_ALGO_BLOWFISH160;
     cipher_table[i].name = blowfish_get_info( cipher_table[i].algo,
 					 &cipher_table[i].keylen,
diff --git a/cipher/des.c b/cipher/des.c
index 460194bf5..f10716a2e 100644
--- a/cipher/des.c
+++ b/cipher/des.c
@@ -112,14 +112,39 @@
  */
 
 
+#include <config.h>
+#include <string.h>	       /* memcpy, memcmp */
+#include <assert.h>
+#include "types.h"             /* for byte and u32 typedefs */
+#include "util.h"              /* for log_fatal() */
+#include "des.h"
 
 
+/* Some defines/checks to support standalone modules */
 
-#include <string.h>		/* memcpy, memcmp */
+#ifndef CIPHER_ALGO_3DES
+  #define CIPHER_ALGO_3DES 2
+#elif CIPHER_ALGO_3DES != 2
+  #error CIPHER_ALGO_3DES is defined to a wrong value.
+#endif
 
-typedef unsigned long u32;
-typedef unsigned char byte;
+#ifndef G10ERR_WEAK_KEY
+  #define G10ERR_WEAK_KEY 43
+#elif G10ERR_WEAK_KEY != 43
+  #error G10ERR_WEAK_KEY is defined to a wrong value.
+#endif
 
+#ifndef G10ERR_WRONG_KEYLEN
+  #define G10ERR_WRONG_KEYLEN 44
+#elif G10ERR_WRONG_KEYLEN != 44
+  #error G10ERR_WRONG_KEYLEN is defined to a wrong value.
+#endif
+
+
+
+/* Macros used by the info function. */
+#define FNCCAST_SETKEY(f)  ((int(*)(void*, byte*, unsigned))(f))
+#define FNCCAST_CRYPT(f)   ((void(*)(void*, byte*, byte*))(f))
 
 
 /*
@@ -127,6 +152,7 @@ typedef unsigned char byte;
  */
 typedef struct _des_ctx
   {
+    int mode;
     u32 encrypt_subkeys[32];
     u32 decrypt_subkeys[32];
   }
@@ -137,6 +163,7 @@ des_ctx[1];
  */
 typedef struct _tripledes_ctx
   {
+    int mode;
     u32 encrypt_subkeys[96];
     u32 decrypt_subkeys[96];
   }
@@ -499,7 +526,8 @@ des_setkey (struct _des_ctx *ctx, const byte * key)
 
 
 /*
- * Electronic Codebook Mode DES encryption/decryption of data according to 'mode'.
+ * Electronic Codebook Mode DES encryption/decryption of data according
+ * to 'mode'.
  */
 static int
 des_ecb_crypt (struct _des_ctx *ctx, const byte * from, byte * to, int mode)
@@ -638,6 +666,16 @@ tripledes_ecb_crypt (struct _tripledes_ctx *ctx, const byte * from, byte * to, i
 }
 
 
+/*
+ * Check whether the 8 byte key is weak.
+ */
+
+static int
+is_weak_key ( byte *key )
+{
+    return 0; /* FIXME */
+}
+
 
 /*
  * Performs a selftest of this DES/Triple-DES implementation.
@@ -652,8 +690,7 @@ selftest (void)
    * need this.
    */
   if (sizeof (u32) != 4)
-    return "Wrong word size for DES configured.";
-
+       return "Wrong word size for DES configured.";
 
   /*
    * DES Maintenance Test
@@ -714,3 +751,69 @@ selftest (void)
 
   return 0;
 }
+
+
+static int
+do_tripledes_setkey ( struct _tripledes_ctx *ctx, byte *key, unsigned keylen )
+{
+    if( keylen != 24 )
+	return G10ERR_WRONG_KEYLEN;
+
+    if( is_weak_key( key ) || is_weak_key( key+8 ) || is_weak_key( key+16 ) )
+	return G10ERR_WEAK_KEY;
+
+    tripledes_set3keys ( ctx, key, key+8, key+16);
+
+    return 0;
+}
+
+
+static void
+do_tripledes_encrypt( struct _tripledes_ctx *ctx, byte *outbuf, byte *inbuf )
+{
+    tripledes_ecb_encrypt ( ctx, inbuf, outbuf );
+}
+
+static void
+do_tripledes_decrypt( struct _tripledes_ctx *ctx, byte *outbuf, byte *inbuf )
+{
+    tripledes_ecb_decrypt ( ctx, inbuf, outbuf );
+}
+
+
+/****************
+ * Return some information about the algorithm.  We need algo here to
+ * distinguish different flavors of the algorithm.
+ * Returns: A pointer to string describing the algorithm or NULL if
+ *	    the ALGO is invalid.
+ */
+const char *
+des_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**r_setkey)( void *c, byte *key, unsigned keylen ),
+		   void (**r_encrypt)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**r_decrypt)( void *c, byte *outbuf, byte *inbuf )
+		 )
+{
+    static int did_selftest = 0;
+
+    if( !did_selftest ) {
+	const char *s = selftest();
+	if( s )
+	    log_fatal("selftest failed: %s", s );
+	did_selftest = 1;
+    }
+
+
+    if( algo == CIPHER_ALGO_3DES ) {
+	*keylen = 192;
+	*blocksize = 8;
+	*contextsize = sizeof(struct _tripledes_ctx);
+	*r_setkey = FNCCAST_SETKEY(do_tripledes_setkey);
+	*r_encrypt= FNCCAST_CRYPT(do_tripledes_encrypt);
+	*r_decrypt= FNCCAST_CRYPT(do_tripledes_decrypt);
+	return "3DES";
+    }
+    return NULL;
+}
+
diff --git a/cipher/des.h b/cipher/des.h
new file mode 100644
index 000000000..f3b95ba65
--- /dev/null
+++ b/cipher/des.h
@@ -0,0 +1,34 @@
+/* des.h
+ *	Copyright (C) 1998 Free Software Foundation, Inc.
+ *
+ * This file is part of GNUPG.
+ *
+ * GNUPG is free software; you can redistribute it and/or modify
+ * it under the terms of the GNU General Public License as published by
+ * the Free Software Foundation; either version 2 of the License, or
+ * (at your option) any later version.
+ *
+ * GNUPG is distributed in the hope that it will be useful,
+ * but WITHOUT ANY WARRANTY; without even the implied warranty of
+ * MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE.  See the
+ * GNU General Public License for more details.
+ *
+ * You should have received a copy of the GNU 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
+ */
+#ifndef G10_DES_H
+#define G10_DES_H
+
+#include "types.h"
+
+
+const char *
+des_get_info( int algo, size_t *keylen,
+		   size_t *blocksize, size_t *contextsize,
+		   int	(**setkey)( void *c, byte *key, unsigned keylen ),
+		   void (**encrypt)( void *c, byte *outbuf, byte *inbuf ),
+		   void (**decrypt)( void *c, byte *outbuf, byte *inbuf )
+		 );
+
+#endif /*G10_DES_H*/