17 files changed, 213 insertions, 221 deletions

diff --git a/src/lib/libcrypto/des/Makefile.ssl b/src/lib/libcrypto/des/Makefile.ssl
index 7f9600cf02..41976655e9 100644
--- a/src/lib/libcrypto/des/Makefile.ssl
+++ b/src/lib/libcrypto/des/Makefile.ssl
@@ -15,6 +15,7 @@ MAKE=		make -f Makefile.ssl
 MAKEDEPEND=     $(TOP)/util/domd $(TOP)
 MAKEFILE=       Makefile.ssl
 AR=             ar r
+RANLIB=         ranlib
 DES_ENC=        des_enc.o fcrypt_b.o
 # or use
 #DES_ENC=       dx86-elf.o yx86-elf.o
@@ -162,14 +163,15 @@ enc_read.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 enc_read.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 enc_read.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
 enc_read.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-enc_read.o: ../cryptlib.h des_locl.h
+enc_read.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+enc_read.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h
 enc_writ.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 enc_writ.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 enc_writ.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
 enc_writ.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
 enc_writ.o: ../../include/openssl/opensslv.h ../../include/openssl/rand.h
-enc_writ.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h
+enc_writ.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h
+enc_writ.o: ../cryptlib.h des_locl.h
 fcrypt.o: ../../include/openssl/des.h ../../include/openssl/des.h
 fcrypt.o: ../../include/openssl/e_os2.h ../../include/openssl/e_os2.h
 fcrypt.o: ../../include/openssl/opensslconf.h
@@ -187,15 +189,15 @@ pcbc_enc.o: ../../include/openssl/opensslconf.h des_locl.h
 qud_cksm.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
 qud_cksm.o: ../../include/openssl/opensslconf.h des_locl.h
 rand_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
-rand_key.o: ../../include/openssl/opensslconf.h des_locl.h
+rand_key.o: ../../include/openssl/opensslconf.h ../../include/openssl/rand.h
 read2pwd.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
 read2pwd.o: ../../include/openssl/opensslconf.h des_locl.h
 read_pwd.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h
 read_pwd.o: ../../include/openssl/crypto.h ../../include/openssl/des.h
 read_pwd.o: ../../include/openssl/e_os.h ../../include/openssl/e_os2.h
 read_pwd.o: ../../include/openssl/err.h ../../include/openssl/opensslconf.h
-read_pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/stack.h
-read_pwd.o: ../cryptlib.h des_locl.h
+read_pwd.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
+read_pwd.o: ../../include/openssl/stack.h ../cryptlib.h des_locl.h
 rpc_enc.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
 rpc_enc.o: ../../include/openssl/opensslconf.h des_locl.h des_ver.h rpc_des.h
 set_key.o: ../../include/openssl/des.h ../../include/openssl/e_os2.h
diff --git a/src/lib/libcrypto/des/cbc3_enc.c b/src/lib/libcrypto/des/cbc3_enc.c
index 3863a676d4..527e74f3de 100644
--- a/src/lib/libcrypto/des/cbc3_enc.c
+++ b/src/lib/libcrypto/des/cbc3_enc.c
@@ -58,7 +58,7 @@
 
 #include "des_locl.h"
 
-/* HAS BUGS? DON'T USE - this is only present for use in des.c */
+/* HAS BUGS! DON'T USE - this is only present for use in des.c */
 void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length,
              des_key_schedule ks1, des_key_schedule ks2, des_cblock *iv1,
              des_cblock *iv2, int enc)
@@ -69,11 +69,14 @@ void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length,
 
         if (enc == DES_ENCRYPT)
                 {
-                des_cbc_encrypt(input,output,length,ks1,iv1,enc);
+                des_cbc_encrypt((unsigned char*)input,
+                                (unsigned char*)output,length,ks1,iv1,enc);
                 if (length >= sizeof(des_cblock))
                         memcpy(niv1,output[off],sizeof(des_cblock));
-                des_cbc_encrypt(output,output,l8,ks2,iv1,!enc);
-                des_cbc_encrypt(output,output,l8,ks1,iv2, enc);
+                des_cbc_encrypt((unsigned char*)output,
+                                (unsigned char*)output,l8,ks2,iv1,!enc);
+                des_cbc_encrypt((unsigned char*)output,
+                                (unsigned char*)output,l8,ks1,iv2,enc);
                 if (length >= sizeof(des_cblock))
                         memcpy(niv2,output[off],sizeof(des_cblock));
                 }
@@ -81,11 +84,14 @@ void des_3cbc_encrypt(des_cblock *input, des_cblock *output, long length,
                 {
                 if (length >= sizeof(des_cblock))
                         memcpy(niv2,input[off],sizeof(des_cblock));
-                des_cbc_encrypt(input,output,l8,ks1,iv2,enc);
-                des_cbc_encrypt(output,output,l8,ks2,iv1,!enc);
+                des_cbc_encrypt((unsigned char*)input,
+                                (unsigned char*)output,l8,ks1,iv2,enc);
+                des_cbc_encrypt((unsigned char*)output,
+                                (unsigned char*)output,l8,ks2,iv1,!enc);
                 if (length >= sizeof(des_cblock))
                         memcpy(niv1,output[off],sizeof(des_cblock));
-                des_cbc_encrypt(output,output,length,ks1,iv1, enc);
+                des_cbc_encrypt((unsigned char*)output,
+                                (unsigned char*)output,length,ks1,iv1,enc);
                 }
         memcpy(*iv1,niv1,sizeof(des_cblock));
         memcpy(*iv2,niv2,sizeof(des_cblock));
diff --git a/src/lib/libcrypto/des/des.c b/src/lib/libcrypto/des/des.c
index b2d7f0da78..91d7153b34 100644
--- a/src/lib/libcrypto/des/des.c
+++ b/src/lib/libcrypto/des/des.c
@@ -325,25 +325,25 @@ void usage(void)
 "des <options> [input-file [output-file]]",
 "options:",
 "-v         : des(1) version number",
-"-e         : encrypt using sunOS compatible user key to DES key conversion.",
+"-e         : encrypt using SunOS compatible user key to DES key conversion.",
 "-E         : encrypt ",
-"-d         : decrypt using sunOS compatible user key to DES key conversion.",
+"-d         : decrypt using SunOS compatible user key to DES key conversion.",
 "-D         : decrypt ",
-"-c[ckname] : generate a cbc_cksum using sunOS compatible user key to",
+"-c[ckname] : generate a cbc_cksum using SunOS compatible user key to",
 "             DES key conversion and output to ckname (stdout default,",
 "             stderr if data being output on stdout).  The checksum is",
 "             generated before encryption and after decryption if used",
 "             in conjunction with -[eEdD].",
 "-C[ckname] : generate a cbc_cksum as for -c but compatible with -[ED].",
 "-k key     : use key 'key'",
-"-h         : the key that is entered will be a hexidecimal number",
+"-h         : the key that is entered will be a hexadecimal number",
 "             that is used directly as the des key",
 "-u[uuname] : input file is uudecoded if -[dD] or output uuencoded data if -[eE]",
 "             (uuname is the filename to put in the uuencode header).",
-"-b         : encrypt using DES in ecb encryption mode, the defaut is cbc mode.",
-"-3         : encrypt using tripple DES encryption.  This uses 2 keys",
+"-b         : encrypt using DES in ecb encryption mode, the default is cbc mode.",
+"-3         : encrypt using triple DES encryption.  This uses 2 keys",
 "             generated from the input key.  If the input key is less",
-"             than 8 characters long, this is equivelent to normal",
+"             than 8 characters long, this is equivalent to normal",
 "             encryption.  Default is triple cbc, -b makes it triple ecb.",
 NULL
 };
@@ -425,7 +425,7 @@ void doencryption(void)
                         else
                                 k2[i-8]=k;
                         }
-                des_set_key(&k2,ks2);
+                des_set_key_unchecked(&k2,ks2);
                 memset(k2,0,sizeof(k2));
                 }
         else if (longk || flag3)
@@ -433,7 +433,7 @@ void doencryption(void)
                 if (flag3)
                         {
                         des_string_to_2keys(key,&kk,&k2);
-                        des_set_key(&k2,ks2);
+                        des_set_key_unchecked(&k2,ks2);
                         memset(k2,0,sizeof(k2));
                         }
                 else
@@ -455,7 +455,7 @@ void doencryption(void)
                                 kk[i]=key[i]|0x80;
                         }
 
-        des_set_key(&kk,ks);
+        des_set_key_unchecked(&kk,ks);
         memset(key,0,sizeof(key));
         memset(kk,0,sizeof(kk));
         /* woops - A bug that does not showup under unix :-( */
@@ -484,7 +484,7 @@ void doencryption(void)
                         if (feof(DES_IN))
                                 {
                                 for (i=7-rem; i>0; i--)
-                                        RAND_bytes(buf + l++, 1);
+                                        RAND_pseudo_bytes(buf + l++, 1);
                                 buf[l++]=rem;
                                 ex=1;
                                 len+=rem;
diff --git a/src/lib/libcrypto/des/des.h b/src/lib/libcrypto/des/des.h
index 67f90aaf17..98a9c4127c 100644
--- a/src/lib/libcrypto/des/des.h
+++ b/src/lib/libcrypto/des/des.h
@@ -186,15 +186,20 @@ void des_pcbc_encrypt(const unsigned char *input,unsigned char *output,
 DES_LONG des_quad_cksum(const unsigned char *input,des_cblock output[],
                         long length,int out_count,des_cblock *seed);
 void des_random_seed(des_cblock *key);
-void des_random_key(des_cblock *ret);
+int des_random_key(des_cblock *ret);
 int des_read_password(des_cblock *key,const char *prompt,int verify);
 int des_read_2passwords(des_cblock *key1,des_cblock *key2,
                         const char *prompt,int verify);
 int des_read_pw_string(char *buf,int length,const char *prompt,int verify);
 void des_set_odd_parity(des_cblock *key);
 int des_is_weak_key(const_des_cblock *key);
+/* des_set_key (= set_key = des_key_sched = key_sched) calls
+ * des_set_key_checked if global variable des_check_key is set,
+ * des_set_key_unchecked otherwise. */
 int des_set_key(const_des_cblock *key,des_key_schedule schedule);
 int des_key_sched(const_des_cblock *key,des_key_schedule schedule);
+int des_set_key_checked(const_des_cblock *key,des_key_schedule schedule);
+void des_set_key_unchecked(const_des_cblock *key,des_key_schedule schedule);
 void des_string_to_key(const char *str,des_cblock *key);
 void des_string_to_2keys(const char *str,des_cblock *key1,des_cblock *key2);
 void des_cfb64_encrypt(const unsigned char *in,unsigned char *out,long length,
diff --git a/src/lib/libcrypto/des/des_locl.h b/src/lib/libcrypto/des/des_locl.h
index d6ea17cb68..4dfed199a7 100644
--- a/src/lib/libcrypto/des/des_locl.h
+++ b/src/lib/libcrypto/des/des_locl.h
@@ -72,7 +72,11 @@
 
 #ifndef MSDOS
 #if !defined(VMS) || defined(__DECC)
-#include OPENSSL_UNISTD
+#ifdef OPENSSL_UNISTD
+# include OPENSSL_UNISTD
+#else
+# include <unistd.h>
+#endif
 #include <math.h>
 #endif
 #endif
@@ -178,14 +182,14 @@
 #endif
 
 /* The changes to this macro may help or hinder, depending on the
- * compiler and the achitecture.  gcc2 always seems to do well :-).
+ * compiler and the architecture.  gcc2 always seems to do well :-).
  * Inspired by Dana How <how@isl.stanford.edu>
  * DO NOT use the alternative version on machines with 8 byte longs.
  * It does not seem to work on the Alpha, even when DES_LONG is 4
  * bytes, probably an issue of accessing non-word aligned objects :-( */
 #ifdef DES_PTR
 
-/* It recently occured to me that 0^0^0^0^0^0^0 == 0, so there
+/* It recently occurred to me that 0^0^0^0^0^0^0 == 0, so there
  * is no reason to not xor all the sub items together.  This potentially
  * saves a register since things can be xored directly into L */
 
diff --git a/src/lib/libcrypto/des/des_opts.c b/src/lib/libcrypto/des/des_opts.c
index 746c456f8f..b2ca7ac31d 100644
--- a/src/lib/libcrypto/des/des_opts.c
+++ b/src/lib/libcrypto/des/des_opts.c
@@ -434,17 +434,17 @@ int main(int argc, char **argv)
                 }
 
 #ifndef TIMES
-        fprintf(stderr,"To get the most acurate results, try to run this\n");
+        fprintf(stderr,"To get the most accurate results, try to run this\n");
         fprintf(stderr,"program when this computer is idle.\n");
 #endif
 
-        des_set_key(&key,sch);
-        des_set_key(&key2,sch2);
-        des_set_key(&key3,sch3);
+        des_set_key_unchecked(&key,sch);
+        des_set_key_unchecked(&key2,sch2);
+        des_set_key_unchecked(&key3,sch3);
 
 #ifndef SIGALRM
         fprintf(stderr,"First we calculate the approximate speed ...\n");
-        des_set_key(&key,sch);
+        des_set_key_unchecked(&key,sch);
         count=10;
         do      {
                 long i;
diff --git a/src/lib/libcrypto/des/destest.c b/src/lib/libcrypto/des/destest.c
index 5a04fc9298..9ad4ecb072 100644
--- a/src/lib/libcrypto/des/destest.c
+++ b/src/lib/libcrypto/des/destest.c
@@ -234,7 +234,7 @@ static unsigned char cipher_ecb2[NUM_TESTS-1][8]={
         {0x08,0xD7,0xB4,0xFB,0x62,0x9D,0x08,0x85}};
 
 static unsigned char cbc_key [8]={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
+static unsigned char cbc2_key[8]={0xf1,0xe0,0xd3,0xc2,0xb5,0xa4,0x97,0x86};
 static unsigned char cbc3_key[8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
 static unsigned char cbc_iv  [8]={0xfe,0xdc,0xba,0x98,0x76,0x54,0x32,0x10};
 /* Changed the following text constant to binary so it will work on ebcdic
@@ -254,12 +254,24 @@ static unsigned char cbc_ok[32]={
         0x46,0x8e,0x91,0x15,0x78,0x88,0xba,0x68,
         0x1d,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
 
+#ifdef SCREW_THE_PARITY
+#error "SCREW_THE_PARITY is not ment to be defined."
+#error "Original vectors are preserved for reference only."
+static unsigned char cbc2_key[8]={0xf0,0xe1,0xd2,0xc3,0xb4,0xa5,0x96,0x87};
 static unsigned char xcbc_ok[32]={
         0x86,0x74,0x81,0x0D,0x61,0xA4,0xA5,0x48,
         0xB9,0x93,0x03,0xE1,0xB8,0xBB,0xBD,0xBD,
         0x64,0x30,0x0B,0xB9,0x06,0x65,0x81,0x76,
         0x04,0x1D,0x77,0x62,0x17,0xCA,0x2B,0xD2,
         };
+#else
+static unsigned char xcbc_ok[32]={
+        0x84,0x6B,0x29,0x14,0x85,0x1E,0x9A,0x29,
+        0x54,0x73,0x2F,0x8A,0xA0,0xA6,0x11,0xC1,
+        0x15,0xCD,0xC2,0xD7,0x95,0x1B,0x10,0x53,
+        0xA6,0x3C,0x5E,0x03,0xB2,0x1A,0xA3,0xC4,
+        };
+#endif
 
 static unsigned char cbc3_ok[32]={
         0x3F,0xE3,0x01,0xC9,0x62,0xAC,0x01,0xD0,
@@ -309,8 +321,8 @@ static unsigned char ofb_cipher[24]=
         0x3d,0x6d,0x5b,0xe3,0x25,0x5a,0xf8,0xc3
         };
 
-DES_LONG cbc_cksum_ret=0xB462FEF7L;
-unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
+static DES_LONG cbc_cksum_ret=0xB462FEF7L;
+static unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
 
 static char *pt(unsigned char *p);
 static int cfb_test(int bits, unsigned char *cfb_cipher);
@@ -331,17 +343,17 @@ int main(int argc, char *argv[])
 
 #ifndef NO_DESCBCM
         printf("Doing cbcm\n");
-        if ((j=des_key_sched(&cbc_key,ks)) != 0)
+        if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
                 }
-        if ((j=des_key_sched(&cbc2_key,ks2)) != 0)
+        if ((j=des_set_key_checked(&cbc2_key,ks2)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
                 }
-        if ((j=des_key_sched(&cbc3_key,ks3)) != 0)
+        if ((j=des_set_key_checked(&cbc3_key,ks3)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
@@ -385,11 +397,7 @@ int main(int argc, char *argv[])
         printf("Doing ecb\n");
         for (i=0; i<NUM_TESTS; i++)
                 {
-                if ((j=des_key_sched(&key_data[i],ks)) != 0)
-                        {
-                        printf("Key error %2d:%d\n",i+1,j);
-                        err=1;
-                        }
+                des_set_key_unchecked(&key_data[i],ks);
                 memcpy(in,plain_data[i],8);
                 memset(out,0,8);
                 memset(outin,0,8);
@@ -415,21 +423,9 @@ int main(int argc, char *argv[])
         printf("Doing ede ecb\n");
         for (i=0; i<(NUM_TESTS-1); i++)
                 {
-                if ((j=des_key_sched(&key_data[i],ks)) != 0)
-                        {
-                        err=1;
-                        printf("Key error %2d:%d\n",i+1,j);
-                        }
-                if ((j=des_key_sched(&key_data[i+1],ks2)) != 0)
-                        {
-                        printf("Key error %2d:%d\n",i+2,j);
-                        err=1;
-                        }
-                if ((j=des_key_sched(&key_data[i+2],ks3)) != 0)
-                        {
-                        printf("Key error %2d:%d\n",i+3,j);
-                        err=1;
-                        }
+                des_set_key_unchecked(&key_data[i],ks);
+                des_set_key_unchecked(&key_data[i+1],ks2);
+                des_set_key_unchecked(&key_data[i+2],ks3);
                 memcpy(in,plain_data[i],8);
                 memset(out,0,8);
                 memset(outin,0,8);
@@ -453,7 +449,7 @@ int main(int argc, char *argv[])
 #endif
 
         printf("Doing cbc\n");
-        if ((j=des_key_sched(&cbc_key,ks)) != 0)
+        if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
@@ -464,7 +460,10 @@ int main(int argc, char *argv[])
         des_ncbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
                          &iv3,DES_ENCRYPT);
         if (memcmp(cbc_out,cbc_ok,32) != 0)
+                {
                 printf("cbc_encrypt encrypt error\n");
+                err=1;
+                }
 
         memcpy(iv3,cbc_iv,sizeof(cbc_iv));
         des_ncbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
@@ -477,7 +476,7 @@ int main(int argc, char *argv[])
 
 #ifndef LIBDES_LIT
         printf("Doing desx cbc\n");
-        if ((j=des_key_sched(&cbc_key,ks)) != 0)
+        if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
@@ -490,6 +489,7 @@ int main(int argc, char *argv[])
         if (memcmp(cbc_out,xcbc_ok,32) != 0)
                 {
                 printf("des_xcbc_encrypt encrypt error\n");
+                err=1;
                 }
         memcpy(iv3,cbc_iv,sizeof(cbc_iv));
         des_xcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
@@ -502,17 +502,17 @@ int main(int argc, char *argv[])
 #endif
 
         printf("Doing ede cbc\n");
-        if ((j=des_key_sched(&cbc_key,ks)) != 0)
+        if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
                 }
-        if ((j=des_key_sched(&cbc2_key,ks2)) != 0)
+        if ((j=des_set_key_checked(&cbc2_key,ks2)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
                 }
-        if ((j=des_key_sched(&cbc3_key,ks3)) != 0)
+        if ((j=des_set_key_checked(&cbc3_key,ks3)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
@@ -543,7 +543,7 @@ int main(int argc, char *argv[])
 
 #ifndef LIBDES_LIT
         printf("Doing pcbc\n");
-        if ((j=des_key_sched(&cbc_key,ks)) != 0)
+        if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
                 {
                 printf("Key error %d\n",j);
                 err=1;
@@ -606,7 +606,7 @@ int main(int argc, char *argv[])
         printf("done\n");
 
         printf("Doing ofb\n");
-        des_key_sched(&ofb_key,ks);
+        des_set_key_checked(&ofb_key,ks);
         memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
         des_ofb_encrypt(plain,ofb_buf1,64,sizeof(plain)/8,ks,&ofb_tmp);
         if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
@@ -635,7 +635,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                 }
 
         printf("Doing ofb64\n");
-        des_key_sched(&ofb_key,ks);
+        des_set_key_checked(&ofb_key,ks);
         memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
         memset(ofb_buf1,0,sizeof(ofb_buf1));
         memset(ofb_buf2,0,sizeof(ofb_buf1));
@@ -660,7 +660,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                 }
 
         printf("Doing ede_ofb64\n");
-        des_key_sched(&ofb_key,ks);
+        des_set_key_checked(&ofb_key,ks);
         memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
         memset(ofb_buf1,0,sizeof(ofb_buf1));
         memset(ofb_buf2,0,sizeof(ofb_buf1));
@@ -686,7 +686,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                 }
 
         printf("Doing cbc_cksum\n");
-        des_key_sched(&cbc_key,ks);
+        des_set_key_checked(&cbc_key,ks);
         cs=des_cbc_cksum(cbc_data,&cret,strlen((char *)cbc_data),ks,&cbc_iv);
         if (cs != cbc_cksum_ret)
                 {
@@ -795,8 +795,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                 err=1;
                 }
         printf("\n");
-        exit(err);
-        return(0);
+        return(err);
         }
 
 static char *pt(unsigned char *p)
@@ -825,7 +824,7 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
         des_key_schedule ks;
         int i,err=0;
 
-        des_key_sched(&cfb_key,ks);
+        des_set_key_checked(&cfb_key,ks);
         memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
         des_cfb_encrypt(plain,cfb_buf1,bits,sizeof(plain),ks,&cfb_tmp,
                         DES_ENCRYPT);
@@ -854,7 +853,7 @@ static int cfb64_test(unsigned char *cfb_cipher)
         des_key_schedule ks;
         int err=0,i,n;
 
-        des_key_sched(&cfb_key,ks);
+        des_set_key_checked(&cfb_key,ks);
         memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
         n=0;
         des_cfb64_encrypt(plain,cfb_buf1,12,ks,&cfb_tmp,&n,DES_ENCRYPT);
@@ -887,7 +886,7 @@ static int ede_cfb64_test(unsigned char *cfb_cipher)
         des_key_schedule ks;
         int err=0,i,n;
 
-        des_key_sched(&cfb_key,ks);
+        des_set_key_checked(&cfb_key,ks);
         memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
         n=0;
         des_ede3_cfb64_encrypt(plain,cfb_buf1,12,ks,ks,ks,&cfb_tmp,&n,
diff --git a/src/lib/libcrypto/des/enc_read.c b/src/lib/libcrypto/des/enc_read.c
index 694970ccd2..7399ff7269 100644
--- a/src/lib/libcrypto/des/enc_read.c
+++ b/src/lib/libcrypto/des/enc_read.c
@@ -147,7 +147,7 @@ int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
         /* first - get the length */
         while (net_num < HDRSIZE) 
                 {
-                i=read(fd,&(net[net_num]),HDRSIZE-net_num);
+                i=read(fd,(void *)&(net[net_num]),HDRSIZE-net_num);
 #ifdef EINTR
                 if ((i == -1) && (errno == EINTR)) continue;
 #endif
@@ -169,7 +169,7 @@ int des_enc_read(int fd, void *buf, int len, des_key_schedule sched,
         net_num=0;
         while (net_num < rnum)
                 {
-                i=read(fd,&(net[net_num]),rnum-net_num);
+                i=read(fd,(void *)&(net[net_num]),rnum-net_num);
 #ifdef EINTR
                 if ((i == -1) && (errno == EINTR)) continue;
 #endif
diff --git a/src/lib/libcrypto/des/enc_writ.c b/src/lib/libcrypto/des/enc_writ.c
index ba3f0822ef..4d3452724e 100644
--- a/src/lib/libcrypto/des/enc_writ.c
+++ b/src/lib/libcrypto/des/enc_writ.c
@@ -130,12 +130,12 @@ int des_enc_write(int fd, const void *_buf, int len,
                 {
                 cp=shortbuf;
                 memcpy(shortbuf,buf,len);
-                RAND_bytes(shortbuf+len, 8-len);
+                RAND_pseudo_bytes(shortbuf+len, 8-len);
                 rnum=8;
                 }
         else
                 {
-                cp=(unsigned char*)buf;
+                cp=buf;
                 rnum=((len+7)/8*8); /* round up to nearest eight */
                 }
 
@@ -152,13 +152,16 @@ int des_enc_write(int fd, const void *_buf, int len,
         for (j=0; j<outnum; j+=i)
                 {
                 /* eay 26/08/92 I was not doing writing from where we
-                 * got upto. */
-                i=write(fd,&(outbuf[j]),outnum-j);
+                 * got up to. */
+                i=write(fd,(void *)&(outbuf[j]),outnum-j);
                 if (i == -1)
                         {
+#ifdef EINTR
                         if (errno == EINTR)
                                 i=0;
-                        else    /* This is really a bad error - very bad
+                        else
+#endif
+                                /* This is really a bad error - very bad
                                  * It will stuff-up both ends. */
                                 return(-1);
                         }
diff --git a/src/lib/libcrypto/des/fcrypt.c b/src/lib/libcrypto/des/fcrypt.c
index f36746b376..fa1b8aa34a 100644
--- a/src/lib/libcrypto/des/fcrypt.c
+++ b/src/lib/libcrypto/des/fcrypt.c
@@ -1,7 +1,7 @@
 /* NOCW */
 #include <stdio.h>
 
-/* This version of crypt has been developed from my MIT compatable
+/* This version of crypt has been developed from my MIT compatible
  * DES library.
  * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
  * Eric Young (eay@cryptsoft.com)
@@ -11,7 +11,7 @@
  * I have included directive PARA for shared memory computers.
  * I have included a directive LONGCRYPT to using this routine to cipher
  * passwords with more then 8 bytes like HP-UX 10.x it used. The MAXPLEN
- * definition is the maximum of lenght of password and can changed. I have
+ * definition is the maximum of length of password and can changed. I have
  * defined 24.
  */
 
@@ -103,8 +103,8 @@ char *ret;
          * returns *\0XXXXXXXXX
          * The \0 makes the string look like * so the pwd "*" would
          * crypt to "*".  This was found when replacing the crypt in
-         * our shared libraries.  People found that the disbled
-         * accounts effectivly had no passwd :-(. */
+         * our shared libraries.  People found that the disabled
+         * accounts effectively had no passwd :-(. */
         x=ret[0]=((salt[0] == '\0')?'A':salt[0]);
         Eswap0=con_salt[x]<<2;
         x=ret[1]=((salt[1] == '\0')?'A':salt[1]);
@@ -123,7 +123,7 @@ r=(r+7)/8;
         for (; i<8; i++)
                 key[i]=0;
 
-        des_set_key((des_cblock *)(key),ks);
+        des_set_key_unchecked(&key,ks);
         fcrypt_body(&(out[0]),ks,Eswap0,Eswap1);
 
         ll=out[0]; l2c(ll,b);
diff --git a/src/lib/libcrypto/des/fcrypt_b.c b/src/lib/libcrypto/des/fcrypt_b.c
index 9cbea97c1f..83c94054e3 100644
--- a/src/lib/libcrypto/des/fcrypt_b.c
+++ b/src/lib/libcrypto/des/fcrypt_b.c
@@ -58,7 +58,7 @@
 
 #include <stdio.h>
 
-/* This version of crypt has been developed from my MIT compatable
+/* This version of crypt has been developed from my MIT compatible
  * DES library.
  * The library is available at pub/Crypto/DES at ftp.psy.uq.oz.au
  * Eric Young (eay@cryptsoft.com)
diff --git a/src/lib/libcrypto/des/rand_key.c b/src/lib/libcrypto/des/rand_key.c
index fc11792cda..7816a8f25c 100644
--- a/src/lib/libcrypto/des/rand_key.c
+++ b/src/lib/libcrypto/des/rand_key.c
@@ -1,114 +1,69 @@
 /* crypto/des/rand_key.c */
-/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
- * All rights reserved.
+/* ====================================================================
+ * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.
  *
- * This package is an SSL implementation written
- * by Eric Young (eay@cryptsoft.com).
- * The implementation was written so as to conform with Netscapes SSL.
- * 
- * This library is free for commercial and non-commercial use as long as
- * the following conditions are aheared to.  The following conditions
- * apply to all code found in this distribution, be it the RC4, RSA,
- * lhash, DES, etc., code; not just the SSL code.  The SSL documentation
- * included with this distribution is covered by the same copyright terms
- * except that the holder is Tim Hudson (tjh@cryptsoft.com).
- * 
- * Copyright remains Eric Young's, and as such any Copyright notices in
- * the code are not to be removed.
- * If this package is used in a product, Eric Young should be given attribution
- * as the author of the parts of the library used.
- * This can be in the form of a textual message at program startup or
- * in documentation (online or textual) provided with the package.
- * 
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
- * 1. Redistributions of source code must retain the copyright
- *    notice, this list of conditions and the following disclaimer.
+ *
+ * 1. Redistributions of source code must retain the above copyright
+ *    notice, this list of conditions and the following disclaimer. 
+ *
  * 2. Redistributions in binary form must reproduce the above copyright
- *    notice, this list of conditions and the following disclaimer in the
- *    documentation and/or other materials provided with the distribution.
- * 3. All advertising materials mentioning features or use of this software
- *    must display the following acknowledgement:
- *    "This product includes cryptographic software written by
- *     Eric Young (eay@cryptsoft.com)"
- *    The word 'cryptographic' can be left out if the rouines from the library
- *    being used are not cryptographic related :-).
- * 4. If you include any Windows specific code (or a derivative thereof) from 
- *    the apps directory (application code) you must include an acknowledgement:
- *    "This product includes software written by Tim Hudson (tjh@cryptsoft.com)"
- * 
- * THIS SOFTWARE IS PROVIDED BY ERIC YOUNG ``AS IS'' AND
- * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
- * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE
- * ARE DISCLAIMED.  IN NO EVENT SHALL THE AUTHOR OR CONTRIBUTORS BE LIABLE
- * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL
- * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS
- * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
- * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
- * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
- * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
- * SUCH DAMAGE.
- * 
- * The licence and distribution terms for any publically available version or
- * derivative of this code cannot be changed.  i.e. this code cannot simply be
- * copied and put under another distribution licence
- * [including the GNU Public Licence.]
+ *    notice, this list of conditions and the following disclaimer in
+ *    the documentation and/or other materials provided with the
+ *    distribution.
+ *
+ * 3. All advertising materials mentioning features or use of this
+ *    software must display the following acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+ *
+ * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+ *    endorse or promote products derived from this software without
+ *    prior written permission. For written permission, please contact
+ *    openssl-core@openssl.org.
+ *
+ * 5. Products derived from this software may not be called "OpenSSL"
+ *    nor may "OpenSSL" appear in their names without prior written
+ *    permission of the OpenSSL Project.
+ *
+ * 6. Redistributions of any form whatsoever must retain the following
+ *    acknowledgment:
+ *    "This product includes software developed by the OpenSSL Project
+ *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+ *
+ * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+ * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+ * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+ * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+ * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+ * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+ * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+ * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+ * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+ * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+ * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+ * OF THE POSSIBILITY OF SUCH DAMAGE.
+ * ====================================================================
+ *
+ * This product includes cryptographic software written by Eric Young
+ * (eay@cryptsoft.com).  This product includes software written by Tim
+ * Hudson (tjh@cryptsoft.com).
+ *
  */
 
-#include "des_locl.h"
-#include <time.h>
-
-static int seed=0;
-static des_cblock init;
+#include <openssl/des.h>
+#include <openssl/rand.h>
 
 void des_random_seed(des_cblock *key)
         {
-        memcpy(&init,key,sizeof(des_cblock));
-        seed=1;
+        RAND_seed(key, sizeof(des_cblock));
         }
 
-void des_random_key(des_cblock *ret)
+int des_random_key(des_cblock *ret)
         {
-        des_key_schedule ks;
-        static DES_LONG c=0;
-        static unsigned short pid=0;
-        static des_cblock data={0x01,0x23,0x45,0x67,0x89,0xab,0xcd,0xef};
-        des_cblock key;
-        unsigned char *p;
-        DES_LONG t;
-        int i;
-
-#ifdef MSDOS
-        pid=1;
-#else
-        if (!pid) pid=getpid();
-#endif
-        p=key;
-        if (seed)
-                {
-                for (i=0; i<8; i++)
-                        {
-                        data[i] ^= init[i];
-                        init[i]=0;
-                        }
-                seed=0;
-                }
-        t=(DES_LONG)time(NULL);
-        l2c(t,p);
-        t=(DES_LONG)((pid)|((c++)<<16));
-        l2c(t,p);
-
-        des_set_odd_parity(&data);
-        des_set_key(&data,ks);
-        des_cbc_cksum(key,&key,sizeof(key),ks,&data);
-
-        des_set_odd_parity(&key);
-        des_set_key(&key,ks);
-        des_cbc_cksum(key,&data,sizeof(key),ks,&key);
-
-        memcpy(ret,data,sizeof(key));
-        memset(key,0,sizeof(key));
-        memset(ks,0,sizeof(ks));
-        t=0;
+        int r = RAND_bytes((unsigned char *)ret, sizeof(des_cblock));
+        des_set_odd_parity(ret);
+        return r;
         }
diff --git a/src/lib/libcrypto/des/read_pwd.c b/src/lib/libcrypto/des/read_pwd.c
index fed49652c0..fa2d67da64 100644
--- a/src/lib/libcrypto/des/read_pwd.c
+++ b/src/lib/libcrypto/des/read_pwd.c
@@ -58,7 +58,11 @@
 
 #if !defined(MSDOS) && !defined(VMS) && !defined(WIN32)
 #include <openssl/opensslconf.h>
-#include OPENSSL_UNISTD
+#ifdef OPENSSL_UNISTD
+# include OPENSSL_UNISTD
+#else
+# include <unistd.h>
+#endif
 /* If unistd.h defines _POSIX_VERSION, we conclude that we
  * are on a POSIX system and have sigaction and termios. */
 #if defined(_POSIX_VERSION)
@@ -123,7 +127,7 @@
 #undef  SGTTY
 #endif
 
-#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS)
+#if !defined(TERMIO) && !defined(TERMIOS) && !defined(VMS) && !defined(MSDOS) && !defined(MAC_OS_pre_X) && !defined(MAC_OS_GUSI_SOURCE)
 #undef  TERMIOS
 #undef  TERMIO
 #define SGTTY
@@ -153,7 +157,7 @@
 #define TTY_set(tty,data)       ioctl(tty,TIOCSETP,data)
 #endif
 
-#if !defined(_LIBC) && !defined(MSDOS) && !defined(VMS)
+#if !defined(_LIBC) && !defined(MSDOS) && !defined(VMS) && !defined(MAC_OS_pre_X)
 #include <sys/ioctl.h>
 #endif
 
@@ -174,6 +178,15 @@ struct IOSB {
         };
 #endif
 
+#if defined(MAC_OS_pre_X) || defined(MAC_OS_GUSI_SOURCE)
+/*
+ * This one needs work. As a matter of fact the code is unoperational
+ * and this is only a trick to get it compiled.
+ *                                      <appro@fy.chalmers.se>
+ */
+#define TTY_STRUCT int
+#endif
+
 #ifndef NX509_SIG
 #define NX509_SIG 32
 #endif
diff --git a/src/lib/libcrypto/des/rpc_enc.c b/src/lib/libcrypto/des/rpc_enc.c
index c96c204147..32d96d5cae 100644
--- a/src/lib/libcrypto/des/rpc_enc.c
+++ b/src/lib/libcrypto/des/rpc_enc.c
@@ -66,7 +66,7 @@ int _des_crypt(char *buf, int len, struct desparams *desp)
         des_key_schedule ks;
         int enc;
 
-        des_set_key(&desp->des_key,ks);
+        des_set_key_unchecked(&desp->des_key,ks);
         enc=(desp->des_dir == ENCRYPT)?DES_ENCRYPT:DES_DECRYPT;
 
         if (desp->des_mode == CBC)
diff --git a/src/lib/libcrypto/des/set_key.c b/src/lib/libcrypto/des/set_key.c
index 52553a4c16..bbdc71ba6b 100644
--- a/src/lib/libcrypto/des/set_key.c
+++ b/src/lib/libcrypto/des/set_key.c
@@ -125,7 +125,7 @@ int des_is_weak_key(const_des_cblock *key)
         int i;
 
         for (i=0; i<NUM_WEAK_KEY; i++)
-                /* Added == 0 to comparision, I obviously don't run
+                /* Added == 0 to comparison, I obviously don't run
                  * this section very often :-(, thanks to
                  * engineering@MorningStar.Com for the fix
                  * eay 93/06/29
@@ -145,11 +145,34 @@ int des_is_weak_key(const_des_cblock *key)
 #define HPERM_OP(a,t,n,m) ((t)=((((a)<<(16-(n)))^(a))&(m)),\
         (a)=(a)^(t)^(t>>(16-(n))))
 
+int des_set_key(const_des_cblock *key, des_key_schedule schedule)
+        {
+        if (des_check_key)
+                {
+                return des_set_key_checked(key, schedule);
+                }
+        else
+                {
+                des_set_key_unchecked(key, schedule);
+                return 0;
+                }
+        }
+
 /* return 0 if key parity is odd (correct),
  * return -1 if key parity error,
  * return -2 if illegal weak key.
  */
-int des_set_key(const_des_cblock *key, des_key_schedule schedule)
+int des_set_key_checked(const_des_cblock *key, des_key_schedule schedule)
+        {
+        if (!check_parity(key))
+                return(-1);
+        if (des_is_weak_key(key))
+                return(-2);
+        des_set_key_unchecked(key, schedule);
+        return 0;
+        }
+
+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;
@@ -157,15 +180,6 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule)
         register DES_LONG *k;
         register int i;
 
-        if (des_check_key)
-                {
-                if (!check_parity(key))
-                        return(-1);
-
-                if (des_is_weak_key(key))
-                        return(-2);
-                }
-
         k = &schedule->ks.deslong[0];
         in = &(*key)[0];
 
@@ -225,7 +239,6 @@ int des_set_key(const_des_cblock *key, des_key_schedule schedule)
                 t2=((s>>16L)|(t&0xffff0000L));
                 *(k++)=ROTATE(t2,26)&0xffffffffL;
                 }
-        return(0);
         }
 
 int des_key_sched(const_des_cblock *key, des_key_schedule schedule)
diff --git a/src/lib/libcrypto/des/speed.c b/src/lib/libcrypto/des/speed.c
index da41abcb03..814b86f4ae 100644
--- a/src/lib/libcrypto/des/speed.c
+++ b/src/lib/libcrypto/des/speed.c
@@ -186,16 +186,16 @@ int main(int argc, char **argv)
 #endif
 
 #ifndef TIMES
-        printf("To get the most acurate results, try to run this\n");
+        printf("To get the most accurate results, try to run this\n");
         printf("program when this computer is idle.\n");
 #endif
 
-        des_set_key(&key2,sch2);
-        des_set_key(&key3,sch3);
+        des_set_key_unchecked(&key2,sch2);
+        des_set_key_unchecked(&key3,sch3);
 
 #ifndef SIGALRM
         printf("First we calculate the approximate speed ...\n");
-        des_set_key(&key,sch);
+        des_set_key_unchecked(&key,sch);
         count=10;
         do      {
                 long i;
@@ -225,7 +225,7 @@ int main(int argc, char **argv)
 
         Time_F(START);
         for (count=0,run=1; COND(ca); count++)
-                des_set_key(&key,sch);
+                des_set_key_unchecked(&key,sch);
         d=Time_F(STOP);
         printf("%ld set_key's in %.2f seconds\n",count,d);
         a=((double)COUNT(ca))/d;
diff --git a/src/lib/libcrypto/des/str2key.c b/src/lib/libcrypto/des/str2key.c
index 24841452f1..c6abb87201 100644
--- a/src/lib/libcrypto/des/str2key.c
+++ b/src/lib/libcrypto/des/str2key.c
@@ -58,8 +58,6 @@
 
 #include "des_locl.h"
 
-OPENSSL_EXTERN int des_check_key;
-
 void des_string_to_key(const char *str, des_cblock *key)
         {
         des_key_schedule ks;
@@ -88,11 +86,8 @@ void des_string_to_key(const char *str, des_cblock *key)
                 }
 #endif
         des_set_odd_parity(key);
-        i=des_check_key;
-        des_check_key=0;
-        des_set_key(key,ks);
-        des_check_key=i;
-        des_cbc_cksum((unsigned char*)str,key,length,ks,key);
+        des_set_key_unchecked(key,ks);
+        des_cbc_cksum((const unsigned char*)str,key,length,ks,key);
         memset(ks,0,sizeof(ks));
         des_set_odd_parity(key);
         }
@@ -150,13 +145,10 @@ void des_string_to_2keys(const char *str, des_cblock *key1, des_cblock *key2)
 #endif
         des_set_odd_parity(key1);
         des_set_odd_parity(key2);
-        i=des_check_key;
-        des_check_key=0;
-        des_set_key(key1,ks);
-        des_cbc_cksum((unsigned char*)str,key1,length,ks,key1);
-        des_set_key(key2,ks);
-        des_cbc_cksum((unsigned char*)str,key2,length,ks,key2);
-        des_check_key=i;
+        des_set_key_unchecked(key1,ks);
+        des_cbc_cksum((const unsigned char*)str,key1,length,ks,key1);
+        des_set_key_unchecked(key2,ks);
+        des_cbc_cksum((const unsigned char*)str,key2,length,ks,key2);
         memset(ks,0,sizeof(ks));
         des_set_odd_parity(key1);
         des_set_odd_parity(key2);