OPENSSL_IMPLEMENT_GLOBAL caused more grief than it's worth (it's used twice

[openssl.git] / crypto / des / set_key.c

diff --git a/crypto/des/set_key.c b/crypto/des/set_key.c
index 245b720a59a3c1417d4a86c28be07c0da4a761f6..d8499998b7d55a23684b42f02509278a00d52aef 100644 (file)
--- a/crypto/des/set_key.c
+++ b/crypto/des/set_key.c
@@ -65,7 +65,7 @@
  */
 #include "des_locl.h"
 
-OPENSSL_IMPLEMENT_GLOBAL(int,des_check_key);   /* defaults to false */
+OPENSSL_IMPLEMENT_GLOBAL(int,DES_check_key,0)  /* defaults to false */
 
 static const unsigned char odd_parity[256]={
   1,  1,  2,  2,  4,  4,  7,  7,  8,  8, 11, 11, 13, 13, 14, 14,
@@ -85,17 +85,17 @@ static const unsigned char odd_parity[256]={
 224,224,227,227,229,229,230,230,233,233,234,234,236,236,239,239,
 241,241,242,242,244,244,247,247,248,248,251,251,253,253,254,254};
 
-void des_set_odd_parity(des_cblock *key)
+void DES_set_odd_parity(DES_cblock *key)
        {
-       int i;
+       unsigned int i;
 
        for (i=0; i<DES_KEY_SZ; i++)
                (*key)[i]=odd_parity[(*key)[i]];
        }
 
-int des_check_key_parity(const_des_cblock *key)
+int DES_check_key_parity(const_DES_cblock *key)
        {
-       int i;
+       unsigned int i;
 
        for (i=0; i<DES_KEY_SZ; i++)
                {
@@ -115,7 +115,7 @@ int des_check_key_parity(const_des_cblock *key)
  * (and actual cblock values).
  */
 #define NUM_WEAK_KEY   16
-static des_cblock weak_keys[NUM_WEAK_KEY]={
+static DES_cblock weak_keys[NUM_WEAK_KEY]={
        /* weak keys */
        {0x01,0x01,0x01,0x01,0x01,0x01,0x01,0x01},
        {0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE,0xFE},
@@ -135,7 +135,7 @@ static des_cblock weak_keys[NUM_WEAK_KEY]={
        {0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1,0xFE},
        {0xFE,0xE0,0xFE,0xE0,0xFE,0xF1,0xFE,0xF1}};
 
-int des_is_weak_key(const_des_cblock *key)
+int DES_is_weak_key(const_DES_cblock *key)
        {
        int i;
 
@@ -146,7 +146,7 @@ int des_is_weak_key(const_des_cblock *key)
                 * eay 93/06/29
                 * Another problem, I was comparing only the first 4
                 * bytes, 97/03/18 */
-               if (memcmp(weak_keys[i],key,sizeof(des_cblock)) == 0) return(1);
+               if (memcmp(weak_keys[i],key,sizeof(DES_cblock)) == 0) return(1);
        return(0);
        }
 
@@ -307,15 +307,15 @@ static const DES_LONG des_skb[8][64]={
        0x00002822L,0x04002822L,0x00042822L,0x04042822L,
        }};
 
-int des_set_key(const_des_cblock *key, des_key_schedule *schedule)
+int DES_set_key(const_DES_cblock *key, DES_key_schedule *schedule)
        {
-       if (des_check_key)
+       if (DES_check_key)
                {
-               return des_set_key_checked(key, schedule);
+               return DES_set_key_checked(key, schedule);
                }
        else
                {
-               des_set_key_unchecked(key, schedule);
+               DES_set_key_unchecked(key, schedule);
                return 0;
                }
        }
@@ -324,17 +324,17 @@ int des_set_key(const_des_cblock *key, des_key_schedule *schedule)
  * return -1 if key parity error,
  * return -2 if illegal weak key.
  */
-int des_set_key_checked(const_des_cblock *key, des_key_schedule *schedule)
+int DES_set_key_checked(const_DES_cblock *key, DES_key_schedule *schedule)
        {
-       if (!des_check_key_parity(key))
+       if (!DES_check_key_parity(key))
                return(-1);
-       if (des_is_weak_key(key))
+       if (DES_is_weak_key(key))
                return(-2);
-       des_set_key_unchecked(key, schedule);
+       DES_set_key_unchecked(key, schedule);
        return 0;
        }
 
-void des_set_key_unchecked(const_des_cblock *key, des_key_schedule *schedule)
+void DES_set_key_unchecked(const_DES_cblock *key, DES_key_schedule *schedule)
        {
        static int shifts2[16]={0,0,1,1,1,1,1,1,0,1,1,1,1,1,1,0};
        register DES_LONG c,d,t,s,t2;
@@ -342,7 +342,7 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule *schedule)
        register DES_LONG *k;
        register int i;
 
-#if OPENBSD_DEV_CRYPTO
+#ifdef OPENBSD_DEV_CRYPTO
        memcpy(schedule->key,key,sizeof schedule->key);
        schedule->session=NULL;
 #endif
@@ -394,9 +394,9 @@ void des_set_key_unchecked(const_des_cblock *key, des_key_schedule *schedule)
                }
        }
 
-int des_key_sched(const_des_cblock *key, des_key_schedule *schedule)
+int DES_key_sched(const_DES_cblock *key, DES_key_schedule *schedule)
        {
-       return(des_set_key(key,schedule));
+       return(DES_set_key(key,schedule));
        }
 /*
 #undef des_fixup_key_parity