OpenSSL 0.9.4 merge

1 files changed, 12 insertions, 24 deletions

diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c
index c3bcd7ee2b..52553a4c16 100644
--- a/src/lib/libcrypto/des/set_key.c
+++ b/src/lib/libcrypto/des/set_key.c
@@ -67,16 +67,10 @@
 #include "podd.h"
 #include "sk.h"
 
-#ifndef NOPROTO
-static int check_parity(des_cblock (*key));
-#else
-static int check_parity();
-#endif
+static int check_parity(const_des_cblock *key);
+OPENSSL_GLOBAL int des_check_key=0;
 
-int des_check_key=0;
-
-void des_set_odd_parity(key)
-des_cblock (*key);
+void des_set_odd_parity(des_cblock *key)
         {
         int i;
 
@@ -84,8 +78,7 @@ des_cblock (*key);
                 (*key)[i]=odd_parity[(*key)[i]];
         }
 
-static int check_parity(key)
-des_cblock (*key);
+static int check_parity(const_des_cblock *key)
         {
         int i;
 
@@ -111,8 +104,8 @@ 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},
-        {0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F,0x1F},
-        {0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0,0xE0},
+        {0x1F,0x1F,0x1F,0x1F,0x0E,0x0E,0x0E,0x0E},
+        {0xE0,0xE0,0xE0,0xE0,0xF1,0xF1,0xF1,0xF1},
         /* semi-weak keys */
         {0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE},
         {0xFE,0x01,0xFE,0x01,0xFE,0x01,0xFE,0x01},
@@ -127,8 +120,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(key)
-des_cblock (*key);
+int des_is_weak_key(const_des_cblock *key)
         {
         int i;
 
@@ -157,13 +149,11 @@ des_cblock (*key);
  * return -1 if key parity error,
  * return -2 if illegal weak key.
  */
-int des_set_key(key, schedule)
-des_cblock (*key);
-des_key_schedule schedule;
+int des_set_key(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;
-        register unsigned char *in;
+        register const unsigned char *in;
         register DES_LONG *k;
         register int i;
 
@@ -176,8 +166,8 @@ des_key_schedule schedule;
                         return(-2);
                 }
 
-        k=(DES_LONG *)schedule;
-        in=(unsigned char *)key;
+        k = &schedule->ks.deslong[0];
+        in = &(*key)[0];
 
         c2l(in,c);
         c2l(in,d);
@@ -238,9 +228,7 @@ des_key_schedule schedule;
         return(0);
         }
 
-int des_key_sched(key, schedule)
-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));
         }