10 files changed, 178 insertions, 123 deletions

diff --git a/src/lib/libcrypto/bf/asm/bf-586.pl b/src/lib/libcrypto/bf/asm/bf-586.pl
index 5c7ab14ab0..b556642c94 100644
--- a/src/lib/libcrypto/bf/asm/bf-586.pl
+++ b/src/lib/libcrypto/bf/asm/bf-586.pl
@@ -1,10 +1,10 @@
-#!/usr/bin/perl
+#!/usr/local/bin/perl
 
 push(@INC,"perlasm","../../perlasm");
 require "x86asm.pl";
 require "cbc.pl";
 
-&asm_init($ARGV[0],"bf-586.pl");
+&asm_init($ARGV[0],"bf-586.pl",$ARGV[$#ARGV] eq "386");
 
 $BF_ROUNDS=16;
 $BF_OFF=($BF_ROUNDS+2)*4;
diff --git a/src/lib/libcrypto/bf/bf_cbc.c b/src/lib/libcrypto/bf/bf_cbc.c
index e0fa9ad763..f949629dc6 100644
--- a/src/lib/libcrypto/bf/bf_cbc.c
+++ b/src/lib/libcrypto/bf/bf_cbc.c
@@ -56,16 +56,11 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
-void BF_cbc_encrypt(in, out, length, ks, iv, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-BF_KEY *ks;
-unsigned char *iv;
-int encrypt;
+void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+             const BF_KEY *schedule, unsigned char *ivec, int encrypt)
         {
         register BF_LONG tin0,tin1;
         register BF_LONG tout0,tout1,xor0,xor1;
@@ -74,9 +69,9 @@ int encrypt;
 
         if (encrypt)
                 {
-                n2l(iv,tout0);
-                n2l(iv,tout1);
-                iv-=8;
+                n2l(ivec,tout0);
+                n2l(ivec,tout1);
+                ivec-=8;
                 for (l-=8; l>=0; l-=8)
                         {
                         n2l(in,tin0);
@@ -85,7 +80,7 @@ int encrypt;
                         tin1^=tout1;
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_encrypt(tin,ks);
+                        BF_encrypt(tin,schedule);
                         tout0=tin[0];
                         tout1=tin[1];
                         l2n(tout0,out);
@@ -98,27 +93,27 @@ int encrypt;
                         tin1^=tout1;
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_encrypt(tin,ks);
+                        BF_encrypt(tin,schedule);
                         tout0=tin[0];
                         tout1=tin[1];
                         l2n(tout0,out);
                         l2n(tout1,out);
                         }
-                l2n(tout0,iv);
-                l2n(tout1,iv);
+                l2n(tout0,ivec);
+                l2n(tout1,ivec);
                 }
         else
                 {
-                n2l(iv,xor0);
-                n2l(iv,xor1);
-                iv-=8;
+                n2l(ivec,xor0);
+                n2l(ivec,xor1);
+                ivec-=8;
                 for (l-=8; l>=0; l-=8)
                         {
                         n2l(in,tin0);
                         n2l(in,tin1);
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_decrypt(tin,ks);
+                        BF_decrypt(tin,schedule);
                         tout0=tin[0]^xor0;
                         tout1=tin[1]^xor1;
                         l2n(tout0,out);
@@ -132,15 +127,15 @@ int encrypt;
                         n2l(in,tin1);
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_decrypt(tin,ks);
+                        BF_decrypt(tin,schedule);
                         tout0=tin[0]^xor0;
                         tout1=tin[1]^xor1;
                         l2nn(tout0,tout1,out,l+8);
                         xor0=tin0;
                         xor1=tin1;
                         }
-                l2n(xor0,iv);
-                l2n(xor1,iv);
+                l2n(xor0,ivec);
+                l2n(xor1,ivec);
                 }
         tin0=tin1=tout0=tout1=xor0=xor1=0;
         tin[0]=tin[1]=0;
diff --git a/src/lib/libcrypto/bf/bf_cfb64.c b/src/lib/libcrypto/bf/bf_cfb64.c
index f9c66e7ced..6451c8d407 100644
--- a/src/lib/libcrypto/bf/bf_cfb64.c
+++ b/src/lib/libcrypto/bf/bf_cfb64.c
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
 /* The input and output encrypted as though 64bit cfb mode is being
@@ -64,14 +64,8 @@
  * 64bit block we have used is contained in *num;
  */
 
-void BF_cfb64_encrypt(in, out, length, schedule, ivec, num, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-BF_KEY *schedule;
-unsigned char *ivec;
-int *num;
-int encrypt;
+void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
+             const BF_KEY *schedule, unsigned char *ivec, int *num, int encrypt)
         {
         register BF_LONG v0,v1,t;
         register int n= *num;
diff --git a/src/lib/libcrypto/bf/bf_ecb.c b/src/lib/libcrypto/bf/bf_ecb.c
index 6d16360bd9..341991636f 100644
--- a/src/lib/libcrypto/bf/bf_ecb.c
+++ b/src/lib/libcrypto/bf/bf_ecb.c
@@ -56,17 +56,18 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
+#include <openssl/opensslv.h>
 
 /* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'
- * (From LECTURE NOTES IN COIMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
+ * (From LECTURE NOTES IN COMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
  * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
  */
 
-char *BF_version="BlowFish part of SSLeay 0.9.0b 29-Jun-1998";
+const char *BF_version="Blowfish" OPENSSL_VERSION_PTEXT;
 
-char *BF_options()
+const char *BF_options(void)
         {
 #ifdef BF_PTR
         return("blowfish(ptr)");
@@ -77,20 +78,17 @@ char *BF_options()
 #endif
         }
 
-void BF_ecb_encrypt(in, out, ks, encrypt)
-unsigned char *in;
-unsigned char *out;
-BF_KEY *ks;
-int encrypt;
+void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
+             const BF_KEY *key, int encrypt)
         {
         BF_LONG l,d[2];
 
         n2l(in,l); d[0]=l;
         n2l(in,l); d[1]=l;
         if (encrypt)
-                BF_encrypt(d,ks);
+                BF_encrypt(d,key);
         else
-                BF_decrypt(d,ks);
+                BF_decrypt(d,key);
         l=d[0]; l2n(l,out);
         l=d[1]; l2n(l,out);
         l=d[0]=d[1]=0;
diff --git a/src/lib/libcrypto/bf/bf_enc.c b/src/lib/libcrypto/bf/bf_enc.c
index 66a8604c59..b380acf959 100644
--- a/src/lib/libcrypto/bf/bf_enc.c
+++ b/src/lib/libcrypto/bf/bf_enc.c
@@ -56,24 +56,24 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
 /* Blowfish as implemented from 'Blowfish: Springer-Verlag paper'
- * (From LECTURE NOTES IN COIMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
+ * (From LECTURE NOTES IN COMPUTER SCIENCE 809, FAST SOFTWARE ENCRYPTION,
  * CAMBRIDGE SECURITY WORKSHOP, CAMBRIDGE, U.K., DECEMBER 9-11, 1993)
  */
 
 #if (BF_ROUNDS != 16) && (BF_ROUNDS != 20)
-If you set BF_ROUNDS to some value other than 16 or 20, you will have
+#error If you set BF_ROUNDS to some value other than 16 or 20, you will have \
 to modify the code.
 #endif
 
-void BF_encrypt(data,key)
-BF_LONG *data;
-BF_KEY *key;
+void BF_encrypt(BF_LONG *data, const BF_KEY *key)
         {
-        register BF_LONG l,r,*p,*s;
+#ifndef BF_PTR2
+        register BF_LONG l,r;
+    const register BF_LONG *p,*s;
 
         p=key->P;
         s= &(key->S[0]);
@@ -107,15 +107,50 @@ BF_KEY *key;
 
         data[1]=l&0xffffffffL;
         data[0]=r&0xffffffffL;
+#else
+        register BF_LONG l,r,t,*k;
+
+        l=data[0];
+        r=data[1];
+        k=(BF_LONG*)key;
+
+        l^=k[0];
+        BF_ENC(r,l,k, 1);
+        BF_ENC(l,r,k, 2);
+        BF_ENC(r,l,k, 3);
+        BF_ENC(l,r,k, 4);
+        BF_ENC(r,l,k, 5);
+        BF_ENC(l,r,k, 6);
+        BF_ENC(r,l,k, 7);
+        BF_ENC(l,r,k, 8);
+        BF_ENC(r,l,k, 9);
+        BF_ENC(l,r,k,10);
+        BF_ENC(r,l,k,11);
+        BF_ENC(l,r,k,12);
+        BF_ENC(r,l,k,13);
+        BF_ENC(l,r,k,14);
+        BF_ENC(r,l,k,15);
+        BF_ENC(l,r,k,16);
+#if BF_ROUNDS == 20
+        BF_ENC(r,l,k,17);
+        BF_ENC(l,r,k,18);
+        BF_ENC(r,l,k,19);
+        BF_ENC(l,r,k,20);
+#endif
+        r^=k[BF_ROUNDS+1];
+
+        data[1]=l&0xffffffffL;
+        data[0]=r&0xffffffffL;
+#endif
         }
 
 #ifndef BF_DEFAULT_OPTIONS
 
-void BF_decrypt(data,key)
-BF_LONG *data;
-BF_KEY *key;
+void BF_decrypt(BF_LONG *data, const BF_KEY *key)
         {
-        register BF_LONG l,r,*p,*s;
+#ifndef BF_PTR2
+        register BF_LONG l,r;
+    const register BF_LONG *p,*s;
 
         p=key->P;
         s= &(key->S[0]);
@@ -149,15 +184,45 @@ BF_KEY *key;
 
         data[1]=l&0xffffffffL;
         data[0]=r&0xffffffffL;
+#else
+        register BF_LONG l,r,t,*k;
+
+        l=data[0];
+        r=data[1];
+        k=(BF_LONG *)key;
+
+        l^=k[BF_ROUNDS+1];
+#if BF_ROUNDS == 20
+        BF_ENC(r,l,k,20);
+        BF_ENC(l,r,k,19);
+        BF_ENC(r,l,k,18);
+        BF_ENC(l,r,k,17);
+#endif
+        BF_ENC(r,l,k,16);
+        BF_ENC(l,r,k,15);
+        BF_ENC(r,l,k,14);
+        BF_ENC(l,r,k,13);
+        BF_ENC(r,l,k,12);
+        BF_ENC(l,r,k,11);
+        BF_ENC(r,l,k,10);
+        BF_ENC(l,r,k, 9);
+        BF_ENC(r,l,k, 8);
+        BF_ENC(l,r,k, 7);
+        BF_ENC(r,l,k, 6);
+        BF_ENC(l,r,k, 5);
+        BF_ENC(r,l,k, 4);
+        BF_ENC(l,r,k, 3);
+        BF_ENC(r,l,k, 2);
+        BF_ENC(l,r,k, 1);
+        r^=k[0];
+
+        data[1]=l&0xffffffffL;
+        data[0]=r&0xffffffffL;
+#endif
         }
 
-void BF_cbc_encrypt(in, out, length, ks, iv, encrypt)
-unsigned char *in;
-unsigned char *out;
-long length;
-BF_KEY *ks;
-unsigned char *iv;
-int encrypt;
+void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+             const BF_KEY *schedule, unsigned char *ivec, int encrypt)
         {
         register BF_LONG tin0,tin1;
         register BF_LONG tout0,tout1,xor0,xor1;
@@ -166,9 +231,9 @@ int encrypt;
 
         if (encrypt)
                 {
-                n2l(iv,tout0);
-                n2l(iv,tout1);
-                iv-=8;
+                n2l(ivec,tout0);
+                n2l(ivec,tout1);
+                ivec-=8;
                 for (l-=8; l>=0; l-=8)
                         {
                         n2l(in,tin0);
@@ -177,7 +242,7 @@ int encrypt;
                         tin1^=tout1;
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_encrypt(tin,ks);
+                        BF_encrypt(tin,schedule);
                         tout0=tin[0];
                         tout1=tin[1];
                         l2n(tout0,out);
@@ -190,27 +255,27 @@ int encrypt;
                         tin1^=tout1;
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_encrypt(tin,ks);
+                        BF_encrypt(tin,schedule);
                         tout0=tin[0];
                         tout1=tin[1];
                         l2n(tout0,out);
                         l2n(tout1,out);
                         }
-                l2n(tout0,iv);
-                l2n(tout1,iv);
+                l2n(tout0,ivec);
+                l2n(tout1,ivec);
                 }
         else
                 {
-                n2l(iv,xor0);
-                n2l(iv,xor1);
-                iv-=8;
+                n2l(ivec,xor0);
+                n2l(ivec,xor1);
+                ivec-=8;
                 for (l-=8; l>=0; l-=8)
                         {
                         n2l(in,tin0);
                         n2l(in,tin1);
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_decrypt(tin,ks);
+                        BF_decrypt(tin,schedule);
                         tout0=tin[0]^xor0;
                         tout1=tin[1]^xor1;
                         l2n(tout0,out);
@@ -224,15 +289,15 @@ int encrypt;
                         n2l(in,tin1);
                         tin[0]=tin0;
                         tin[1]=tin1;
-                        BF_decrypt(tin,ks);
+                        BF_decrypt(tin,schedule);
                         tout0=tin[0]^xor0;
                         tout1=tin[1]^xor1;
                         l2nn(tout0,tout1,out,l+8);
                         xor0=tin0;
                         xor1=tin1;
                         }
-                l2n(xor0,iv);
-                l2n(xor1,iv);
+                l2n(xor0,ivec);
+                l2n(xor1,ivec);
                 }
         tin0=tin1=tout0=tout1=xor0=xor1=0;
         tin[0]=tin[1]=0;
diff --git a/src/lib/libcrypto/bf/bf_locl.h b/src/lib/libcrypto/bf/bf_locl.h
index 05756b5d3b..cc7c3ec992 100644
--- a/src/lib/libcrypto/bf/bf_locl.h
+++ b/src/lib/libcrypto/bf/bf_locl.h
@@ -148,7 +148,7 @@
                          *((c)++)=(unsigned char)(((l)>> 8L)&0xff), \
                          *((c)++)=(unsigned char)(((l)     )&0xff))
 
-/* This is actually a big endian algorithm, the most significate byte
+/* This is actually a big endian algorithm, the most significant byte
  * is used to lookup array 0 */
 
 #if defined(BF_PTR2)
@@ -183,8 +183,8 @@
 
 /*
  * This is normally very good on RISC platforms where normally you
- * have to explicitely "multiplicate" array index by sizeof(BF_LONG)
- * in order to caclulate the effective address. This implementation
+ * have to explicitly "multiply" array index by sizeof(BF_LONG)
+ * in order to calculate the effective address. This implementation
  * excuses CPU from this extra work. Power[PC] uses should have most
  * fun as (R>>BF_i)&BF_M gets folded into a single instruction, namely
  * rlwinm. So let'em double-check if their compiler does it.
diff --git a/src/lib/libcrypto/bf/bf_ofb64.c b/src/lib/libcrypto/bf/bf_ofb64.c
index 5d844ac760..f2a9ff6e41 100644
--- a/src/lib/libcrypto/bf/bf_ofb64.c
+++ b/src/lib/libcrypto/bf/bf_ofb64.c
@@ -56,20 +56,15 @@
  * [including the GNU Public Licence.]
  */
 
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 
 /* The input and output encrypted as though 64bit ofb mode is being
  * used.  The extra state information to record how much of the
  * 64bit block we have used is contained in *num;
  */
-void BF_ofb64_encrypt(in, out, length, schedule, ivec, num)
-unsigned char *in;
-unsigned char *out;
-long length;
-BF_KEY *schedule;
-unsigned char *ivec;
-int *num;
+void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
+             const BF_KEY *schedule, unsigned char *ivec, int *num)
         {
         register BF_LONG v0,v1,t;
         register int n= *num;
diff --git a/src/lib/libcrypto/bf/bf_pi.h b/src/lib/libcrypto/bf/bf_pi.h
index 417b935538..9949513c68 100644
--- a/src/lib/libcrypto/bf/bf_pi.h
+++ b/src/lib/libcrypto/bf/bf_pi.h
@@ -56,7 +56,7 @@
  * [including the GNU Public Licence.]
  */
 
-static BF_KEY bf_init= {
+static const BF_KEY bf_init= {
         {
         0x243f6a88L, 0x85a308d3L, 0x13198a2eL, 0x03707344L,
         0xa4093822L, 0x299f31d0L, 0x082efa98L, 0xec4e6c89L,
diff --git a/src/lib/libcrypto/bf/bf_skey.c b/src/lib/libcrypto/bf/bf_skey.c
index 86574c0acc..3673cdee6e 100644
--- a/src/lib/libcrypto/bf/bf_skey.c
+++ b/src/lib/libcrypto/bf/bf_skey.c
@@ -58,21 +58,18 @@
 
 #include <stdio.h>
 #include <string.h>
-#include "blowfish.h"
+#include <openssl/blowfish.h>
 #include "bf_locl.h"
 #include "bf_pi.h"
 
-void BF_set_key(key,len,data)
-BF_KEY *key;
-int len;
-unsigned char *data;
+void BF_set_key(BF_KEY *key, int len, const unsigned char *data)
         {
         int i;
         BF_LONG *p,ri,in[2];
-        unsigned char *d,*end;
+        const unsigned char *d,*end;
 
 
-        memcpy((char *)key,(char *)&bf_init,sizeof(BF_KEY));
+        memcpy(key,&bf_init,sizeof(BF_KEY));
         p=key->P;
 
         if (len > ((BF_ROUNDS+2)*4)) len=(BF_ROUNDS+2)*4;
diff --git a/src/lib/libcrypto/bf/blowfish.h b/src/lib/libcrypto/bf/blowfish.h
index c4a8085a29..cd49e85ab2 100644
--- a/src/lib/libcrypto/bf/blowfish.h
+++ b/src/lib/libcrypto/bf/blowfish.h
@@ -59,18 +59,41 @@
 #ifndef HEADER_BLOWFISH_H
 #define HEADER_BLOWFISH_H
 
+#include <openssl/e_os2.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
 
+#ifdef OPENSSL_NO_BF
+#error BF is disabled.
+#endif
+
 #define BF_ENCRYPT      1
 #define BF_DECRYPT      0
 
-/* If you make this 'unsigned int' the pointer variants will work on
- * the Alpha, otherwise they will not.  Strangly using the '8 byte'
- * BF_LONG and the default 'non-pointer' inner loop is the best configuration
- * for the Alpha */
+/*
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ * ! BF_LONG has to be at least 32 bits wide. If it's wider, then !
+ * ! BF_LONG_LOG2 has to be defined along.                        !
+ * !!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!!
+ */
+
+#if defined(OPENSSL_SYS_WIN16) || defined(__LP32__)
+#define BF_LONG unsigned long
+#elif defined(OPENSSL_SYS_CRAY) || defined(__ILP64__)
 #define BF_LONG unsigned long
+#define BF_LONG_LOG2 3
+/*
+ * _CRAY note. I could declare short, but I have no idea what impact
+ * does it have on performance on none-T3E machines. I could declare
+ * int, but at least on C90 sizeof(int) can be chosen at compile time.
+ * So I've chosen long...
+ *                                      <appro@fy.chalmers.se>
+ */
+#else
+#define BF_LONG unsigned int
+#endif
 
 #define BF_ROUNDS       16
 #define BF_BLOCK        8
@@ -81,33 +104,21 @@ typedef struct bf_key_st
         BF_LONG S[4*256];
         } BF_KEY;
 
-#ifndef NOPROTO
  
-void BF_set_key(BF_KEY *key, int len, unsigned char *data);
-void BF_ecb_encrypt(unsigned char *in,unsigned char *out,BF_KEY *key,
-        int enc);
-void BF_encrypt(BF_LONG *data,BF_KEY *key);
-void BF_decrypt(BF_LONG *data,BF_KEY *key);
-void BF_cbc_encrypt(unsigned char *in, unsigned char *out, long length,
-        BF_KEY *ks, unsigned char *iv, int enc);
-void BF_cfb64_encrypt(unsigned char *in, unsigned char *out, long length,
-        BF_KEY *schedule, unsigned char *ivec, int *num, int enc);
-void BF_ofb64_encrypt(unsigned char *in, unsigned char *out, long length,
-        BF_KEY *schedule, unsigned char *ivec, int *num);
-char *BF_options(void);
+void BF_set_key(BF_KEY *key, int len, const unsigned char *data);
 
-#else
-
-void BF_set_key();
-void BF_ecb_encrypt();
-void BF_encrypt();
-void BF_decrypt();
-void BF_cbc_encrypt();
-void BF_cfb64_encrypt();
-void BF_ofb64_encrypt();
-char *BF_options();
+void BF_encrypt(BF_LONG *data,const BF_KEY *key);
+void BF_decrypt(BF_LONG *data,const BF_KEY *key);
 
-#endif
+void BF_ecb_encrypt(const unsigned char *in, unsigned char *out,
+        const BF_KEY *key, int enc);
+void BF_cbc_encrypt(const unsigned char *in, unsigned char *out, long length,
+        const BF_KEY *schedule, unsigned char *ivec, int enc);
+void BF_cfb64_encrypt(const unsigned char *in, unsigned char *out, long length,
+        const BF_KEY *schedule, unsigned char *ivec, int *num, int enc);
+void BF_ofb64_encrypt(const unsigned char *in, unsigned char *out, long length,
+        const BF_KEY *schedule, unsigned char *ivec, int *num);
+const char *BF_options(void);
 
 #ifdef  __cplusplus
 }