Use the Blowfish encryption algorithm instead of IDEA. This is partly

[become] / src / icrypt.c

diff --git a/src/icrypt.c b/src/icrypt.c
index 589c5a5915a2843bf94389ae6d497d79440e7c6b..8f5d0f0455c4e2509b7e5a7f063c17310cb0a1d6 100644 (file)
--- a/src/icrypt.c
+++ b/src/icrypt.c
@@ -1,8 +1,8 @@
 /* -*-c-*-
  *
 /* -*-c-*-
  *

- * $Id: icrypt.c,v 1.2 1997/08/04 10:24:22 mdw Exp $
+ * $Id: icrypt.c,v 1.2.2.1 1997/09/26 09:08:07 mdw Exp $

  *
  *

- * Higher level IDEA encryption
+ * Higher level encryption functions

  *
  * (c) 1997 Mark Wooding
  */
  *
  * (c) 1997 Mark Wooding
  */


@@ -29,6 +29,11 @@
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: icrypt.c,v $
 /*----- Revision history --------------------------------------------------*
  *
  * $Log: icrypt.c,v $

+ * Revision 1.2.2.1  1997/09/26 09:08:07  mdw
+ * Use the Blowfish encryption algorithm instead of IDEA.  This is partly
+ * because I prefer Blowfish (without any particularly strong evidence) but
+ * mainly because IDEA is patented and Blowfish isn't.
+ *

  * Revision 1.2  1997/08/04 10:24:22  mdw
  * Sources placed under CVS control.
  *
  * Revision 1.2  1997/08/04 10:24:22  mdw
  * Sources placed under CVS control.
  *


@@ -47,9 +52,9 @@
 
 /* --- Local headers --- */
 
 
 /* --- Local headers --- */
 

+#include "blowfish.h"

 #include "config.h"
 #include "icrypt.h"
 #include "config.h"
 #include "icrypt.h"

-#include "idea.h"

 
 /*----- Main code ---------------------------------------------------------*/
 
 
 /*----- Main code ---------------------------------------------------------*/
 


@@ -57,6 +62,7 @@
  *
  * Arguments:  @icrypt_job *j@ = pointer to job context block
  *             @unsigned char *k@ = pointer to key data
  *
  * Arguments:  @icrypt_job *j@ = pointer to job context block
  *             @unsigned char *k@ = pointer to key data

+ *             @size_t sz@ = size of the key data

  *             @const unsigned char *iv@ = pointer to IV
  *
  * Returns:    ---
  *             @const unsigned char *iv@ = pointer to IV
  *
  * Returns:    ---


@@ -64,13 +70,14 @@
  * Use:                Primes the context block ready for encryption.
  */
 
  * Use:                Primes the context block ready for encryption.
  */
 

-void icrypt_init(icrypt_job *j, unsigned char *k, const unsigned char *iv)
+void icrypt_init(icrypt_job *j, unsigned char *k,
+                size_t sz, const unsigned char *iv)

 {
 {

-  idea_ekeys(&j->k, k);
+  blowfish_setKey(&j->k, k, sz);

   if (iv)
   if (iv)

-    memcpy(j->iv, iv, IDEA_BLKSIZE);
+    memcpy(j->iv, iv, BLOWFISH_BLKSIZE);

   else
   else

-    memset(j->iv, 0, IDEA_BLKSIZE);
+    memset(j->iv, 0, BLOWFISH_BLKSIZE);

   j->i = 8;
 }
 
   j->i = 8;
 }
 


@@ -89,13 +96,13 @@ void icrypt_init(icrypt_job *j, unsigned char *k, const unsigned char *iv)
 
 void icrypt_encrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
 {
 
 void icrypt_encrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
 {

-  const char *s = src;
-  char *d = dest;
+  const unsigned char *s = src;
+  unsigned char *d = dest;

   int i;
 
   /* --- First, use up bytes in the buffer --- */
 
   int i;
 
   /* --- First, use up bytes in the buffer --- */
 

-  while (j->i < IDEA_BLKSIZE && sz > 0) {
+  while (j->i < BLOWFISH_BLKSIZE && sz > 0) {

     *d++ = j->iv[j->i++] ^= *s++;
     sz--;
   }
     *d++ = j->iv[j->i++] ^= *s++;
     sz--;
   }


@@ -103,24 +110,24 @@ void icrypt_encrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
 
   /* --- Now encrypt larger chunks at a time --- */
 
 
   /* --- Now encrypt larger chunks at a time --- */
 

-  while (sz >= IDEA_BLKSIZE) {
+  while (sz >= BLOWFISH_BLKSIZE) {

 
     /* --- Freshen the IV --- */
 
 
     /* --- Freshen the IV --- */
 

-    idea_encrypt(&j->k, j->iv, j->iv);
+    blowfish_encrypt(&j->k, j->iv, j->iv);

 
     /* --- Now encrypt some more bytes --- */
 
 
     /* --- Now encrypt some more bytes --- */
 

-    for (i = 0; i < IDEA_BLKSIZE; i++) {
+    for (i = 0; i < BLOWFISH_BLKSIZE; i++) {

       *d++ = j->iv[i] ^= *s++;
     }
       *d++ = j->iv[i] ^= *s++;
     }

-    sz -= IDEA_BLKSIZE;
+    sz -= BLOWFISH_BLKSIZE;

   }
   if (!sz) return;
 
   /* --- Do the tail-end bits --- */
 
   }
   if (!sz) return;
 
   /* --- Do the tail-end bits --- */
 

-  idea_encrypt(&j->k, j->iv, j->iv);
+  blowfish_encrypt(&j->k, j->iv, j->iv);

   j->i = 0;
   while (sz) {
     *d++ = j->iv[j->i++] ^= *s++;
   j->i = 0;
   while (sz) {
     *d++ = j->iv[j->i++] ^= *s++;


@@ -143,14 +150,14 @@ void icrypt_encrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
 
 void icrypt_decrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
 {
 
 void icrypt_decrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
 {

-  const char *s = src;
-  char *d = dest;
+  unsigned const char *s = src;
+  unsigned char *d = dest;

   int i;
   int i;

-  char c;
+  unsigned char c;

 
   /* --- First, use up bytes in the buffer --- */
 
 
   /* --- First, use up bytes in the buffer --- */
 

-  while (j->i < IDEA_BLKSIZE && sz > 0) {
+  while (j->i < BLOWFISH_BLKSIZE && sz > 0) {

     c = *s++;
     *d++ = j->iv[j->i] ^ c;
     j->iv[j->i++] = c;
     c = *s++;
     *d++ = j->iv[j->i] ^ c;
     j->iv[j->i++] = c;


@@ -160,26 +167,26 @@ void icrypt_decrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
 
   /* --- Now encrypt larger chunks at a time --- */
 
 
   /* --- Now encrypt larger chunks at a time --- */
 

-  while (sz >= IDEA_BLKSIZE) {
+  while (sz >= BLOWFISH_BLKSIZE) {

 
     /* --- Freshen the IV --- */
 
 
     /* --- Freshen the IV --- */
 

-    idea_encrypt(&j->k, j->iv, j->iv);
+    blowfish_encrypt(&j->k, j->iv, j->iv);

 
     /* --- Now encrypt some more bytes --- */
 
 
     /* --- Now encrypt some more bytes --- */
 

-    for (i = 0; i < IDEA_BLKSIZE; i++) {
+    for (i = 0; i < BLOWFISH_BLKSIZE; i++) {

       c = *s++;
       *d++ = j->iv[i] ^ c;
       j->iv[i] = c;
     }
       c = *s++;
       *d++ = j->iv[i] ^ c;
       j->iv[i] = c;
     }

-    sz -= IDEA_BLKSIZE;
+    sz -= BLOWFISH_BLKSIZE;

   }
   if (!sz) return;
 
   /* --- Do the tail-end bits --- */
 
   }
   if (!sz) return;
 
   /* --- Do the tail-end bits --- */
 

-  idea_encrypt(&j->k, j->iv, j->iv);
+  blowfish_encrypt(&j->k, j->iv, j->iv);

   j->i = 0;
   while (sz) {
     c = *s++;
   j->i = 0;
   while (sz) {
     c = *s++;


@@ -194,6 +201,7 @@ void icrypt_decrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
  * Arguments:  @icrypt_job *j@ = pointer to job context block
  *             @unsigned char *k@ = pointer to key data, or zero for
  *                     no change
  * Arguments:  @icrypt_job *j@ = pointer to job context block
  *             @unsigned char *k@ = pointer to key data, or zero for
  *                     no change

+ *             @size_t sz@ = size of the key in bytes

  *             @const unsigned char *iv@ = pointer to IV, or zero
  *
  * Returns:    ---
  *             @const unsigned char *iv@ = pointer to IV, or zero
  *
  * Returns:    ---


@@ -202,15 +210,16 @@ void icrypt_decrypt(icrypt_job *j, const void *src, void *dest, size_t sz)
  *             of a session key, for example.
  */
 
  *             of a session key, for example.
  */
 

-void icrypt_reset(icrypt_job *j, unsigned char *k, const unsigned char *iv)
+void icrypt_reset(icrypt_job *j, unsigned char *k,
+                 size_t sz, const unsigned char *iv)

 {
   if (k)
 {
   if (k)

-    idea_ekeys(&j->k, k);
+    blowfish_setKey(&j->k, k, sz);

   if (iv)
   if (iv)

-    memcpy(j->iv, iv, IDEA_BLKSIZE);
+    memcpy(j->iv, iv, BLOWFISH_BLKSIZE);

   else {
   else {

-    unsigned char b[IDEA_BLKSIZE];
-    int n = j->i, o = IDEA_BLKSIZE - j->i;
+    unsigned char b[BLOWFISH_BLKSIZE];
+    int n = j->i, o = BLOWFISH_BLKSIZE - j->i;

 
     memcpy(b, j->iv, sizeof(b));
     memcpy(j->iv, b + n, o);
 
     memcpy(b, j->iv, sizeof(b));
     memcpy(j->iv, b + n, o);


@@ -231,11 +240,11 @@ void icrypt_reset(icrypt_job *j, unsigned char *k, const unsigned char *iv)
 
 void icrypt_saveIV(icrypt_job *j, unsigned char *iv)
 {
 
 void icrypt_saveIV(icrypt_job *j, unsigned char *iv)
 {

-  int n = j->i, o = IDEA_BLKSIZE - j->i;
+  int n = j->i, o = BLOWFISH_BLKSIZE - j->i;

 
   memcpy(j->iv, iv + n, o);
   memcpy(j->iv + o, iv, n);
 
   memcpy(j->iv, iv + n, o);
   memcpy(j->iv + o, iv, n);

-  idea_encrypt(&j->k, iv, iv);
+  blowfish_encrypt(&j->k, iv, iv);

 }
 
 /*----- Test rig ----------------------------------------------------------*/
 }
 
 /*----- Test rig ----------------------------------------------------------*/


@@ -245,6 +254,7 @@ void icrypt_saveIV(icrypt_job *j, unsigned char *iv)
 #include <errno.h>
 #include <pwd.h>
 #include <unistd.h>
 #include <errno.h>
 #include <pwd.h>
 #include <unistd.h>

+#include "crypt.h"

 #include "mdwopt.h"
 #include "md5.h"
 #include "utils.h"
 #include "mdwopt.h"
 #include "md5.h"
 #include "utils.h"


@@ -288,13 +298,13 @@ int main(int argc, char *argv[])
 
   {
     char *pass = getpass("Password: ");
 
   {
     char *pass = getpass("Password: ");

-    unsigned char k[IDEA_KEYSIZE];
+    unsigned char k[BLOWFISH_KEYSIZE];

     md5_init(&md);
     md5_buffer(&md, pass, strlen(pass));
     memset(pass, 0, strlen(pass));
     md5_final(&md, k);
 
     md5_init(&md);
     md5_buffer(&md, pass, strlen(pass));
     memset(pass, 0, strlen(pass));
     md5_final(&md, k);
 

-    icrypt_init(&j, k, 0);
+    icrypt_init(&j, k, BLOWFISH_KEYSIZE, 0);

   }
 
   if (optind >= argc)
   }
 
   if (optind >= argc)