Redundant now as it's moved to ./Makefile.org.
[openssl.git] / crypto / des / destest.c
index 6aa582b..7799e6e 100644 (file)
@@ -1,5 +1,5 @@
 /* crypto/des/destest.c */
-/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com)
+/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * [including the GNU Public Licence.]
  */
 
-#if defined(WIN32) || defined(WIN16) || defined(WINDOWS)
-#ifndef MSDOS
-#define MSDOS
+#include <stdio.h>
+#include <stdlib.h>
+
+#include <openssl/e_os2.h>
+#if defined(OPENSSL_SYS_WIN32) || defined(OPENSSL_SYS_WIN16) || defined(OPENSSL_SYS_WINDOWS)
+#ifndef OPENSSL_SYS_MSDOS
+#define OPENSSL_SYS_MSDOS
 #endif
 #endif
 
-#include <stdio.h>
-#include <stdlib.h>
-#ifndef MSDOS
-#include <unistd.h>
+#ifndef OPENSSL_SYS_MSDOS
+#if !defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VMS_DECC)
+#include OPENSSL_UNISTD
+#endif
 #else
 #include <io.h>
 #endif
 #include <string.h>
-#include "des.h"
+
+#ifdef OPENSSL_NO_DES
+int main(int argc, char *argv[])
+{
+    printf("No DES support\n");
+    return(0);
+}
+#else
+#include <openssl/des.h>
+
+#define crypt(c,s) (des_crypt((c),(s)))
 
 /* tisk tisk - the test keys don't all have odd parity :-( */
 /* test data */
@@ -219,10 +233,19 @@ 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};
-static char cbc_data[40]="7654321 Now is the time for ";
+/* Changed the following text constant to binary so it will work on ebcdic
+ * machines :-) */
+/* static char cbc_data[40]="7654321 Now is the time for \0001"; */
+static unsigned char cbc_data[40]={
+       0x37,0x36,0x35,0x34,0x33,0x32,0x31,0x20,
+       0x4E,0x6F,0x77,0x20,0x69,0x73,0x20,0x74,
+       0x68,0x65,0x20,0x74,0x69,0x6D,0x65,0x20,
+       0x66,0x6F,0x72,0x20,0x00,0x31,0x00,0x00,
+       0x00,0x00,0x00,0x00,0x00,0x00,0x00,0x00,
+       };
 
 static unsigned char cbc_ok[32]={
        0xcc,0xd1,0x73,0xff,0xab,0x20,0x39,0xf4,
@@ -230,12 +253,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,
@@ -285,49 +320,95 @@ 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};
 
-#ifndef NOPROTO
 static char *pt(unsigned char *p);
 static int cfb_test(int bits, unsigned char *cfb_cipher);
 static int cfb64_test(unsigned char *cfb_cipher);
 static int ede_cfb64_test(unsigned char *cfb_cipher);
-#else
-static char *pt();
-static int cfb_test();
-static int cfb64_test();
-static int ede_cfb64_test();
-#endif
-
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
        {
        int i,j,err=0;
-       des_cblock in,out,outin,iv3;
+       des_cblock in,out,outin,iv3,iv2;
        des_key_schedule ks,ks2,ks3;
        unsigned char cbc_in[40];
        unsigned char cbc_out[40];
        DES_LONG cs;
-       unsigned char qret[4][4],cret[8];
-       DES_LONG lqret[4];
+       unsigned char cret[8];
+#ifdef _CRAY
+        struct {
+            int a:32;
+            int b:32;
+        } lqret[2];
+#else
+        DES_LONG lqret[4];
+#endif
        int num;
        char *str;
 
+#ifndef OPENSSL_NO_DESCBCM
+       printf("Doing cbcm\n");
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
+               {
+               printf("Key error %d\n",j);
+               err=1;
+               }
+       if ((j=DES_set_key_checked(&cbc2_key,&ks2)) != 0)
+               {
+               printf("Key error %d\n",j);
+               err=1;
+               }
+       if ((j=DES_set_key_checked(&cbc3_key,&ks3)) != 0)
+               {
+               printf("Key error %d\n",j);
+               err=1;
+               }
+       memset(cbc_out,0,40);
+       memset(cbc_in,0,40);
+       i=strlen((char *)cbc_data)+1;
+       /* i=((i+7)/8)*8; */
+       memcpy(iv3,cbc_iv,sizeof(cbc_iv));
+       memset(iv2,'\0',sizeof iv2);
+
+       DES_ede3_cbcm_encrypt(cbc_data,cbc_out,16L,&ks,&ks2,&ks3,&iv3,&iv2,
+                             DES_ENCRYPT);
+       DES_ede3_cbcm_encrypt(&cbc_data[16],&cbc_out[16],i-16,&ks,&ks2,&ks3,
+                             &iv3,&iv2,DES_ENCRYPT);
+       /*      if (memcmp(cbc_out,cbc3_ok,
+               (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
+               {
+               printf("des_ede3_cbc_encrypt encrypt error\n");
+               err=1;
+               }
+       */
+       memcpy(iv3,cbc_iv,sizeof(cbc_iv));
+       memset(iv2,'\0',sizeof iv2);
+       DES_ede3_cbcm_encrypt(cbc_out,cbc_in,i,&ks,&ks2,&ks3,&iv3,&iv2,DES_DECRYPT);
+       if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
+               {
+               int n;
+
+               printf("des_ede3_cbcm_encrypt decrypt error\n");
+               for(n=0 ; n < i ; ++n)
+                   printf(" %02x",cbc_data[n]);
+               printf("\n");
+               for(n=0 ; n < i ; ++n)
+                   printf(" %02x",cbc_in[n]);
+               printf("\n");
+               err=1;
+               }
+#endif
+
        printf("Doing ecb\n");
        for (i=0; i<NUM_TESTS; i++)
                {
-               if ((j=des_key_sched((C_Block *)(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);
-               des_ecb_encrypt((C_Block *)in,(C_Block *)out,ks,DES_ENCRYPT);
-               des_ecb_encrypt((C_Block *)out,(C_Block *)outin,ks,DES_DECRYPT);
+               des_ecb_encrypt(&in,&out,ks,DES_ENCRYPT);
+               des_ecb_encrypt(&out,&outin,ks,DES_DECRYPT);
 
                if (memcmp(out,cipher_data[i],8) != 0)
                        {
@@ -348,28 +429,14 @@ char *argv[];
        printf("Doing ede ecb\n");
        for (i=0; i<(NUM_TESTS-1); i++)
                {
-               if ((j=des_key_sched((C_Block *)(key_data[i]),ks)) != 0)
-                       {
-                       err=1;
-                       printf("Key error %2d:%d\n",i+1,j);
-                       }
-               if ((j=des_key_sched((C_Block *)(key_data[i+1]),ks2)) != 0)
-                       {
-                       printf("Key error %2d:%d\n",i+2,j);
-                       err=1;
-                       }
-               if ((j=des_key_sched((C_Block *)(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);
-               des_ecb2_encrypt((C_Block *)in,(C_Block *)out,ks,ks2,
-                       DES_ENCRYPT);
-               des_ecb2_encrypt((C_Block *)out,(C_Block *)outin,ks,ks2,
-                       DES_DECRYPT);
+               des_ecb2_encrypt(&in,&out,ks,ks2,DES_ENCRYPT);
+               des_ecb2_encrypt(&out,&outin,ks,ks2,DES_DECRYPT);
 
                if (memcmp(out,cipher_ecb2[i],8) != 0)
                        {
@@ -388,21 +455,25 @@ char *argv[];
 #endif
 
        printf("Doing cbc\n");
-       if ((j=des_key_sched((C_Block *)cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
                {
                printf("Key error %d\n",j);
                err=1;
                }
        memset(cbc_out,0,40);
        memset(cbc_in,0,40);
-       des_cbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-               (long)strlen((char *)cbc_data)+1,ks,
-               (C_Block *)cbc_iv,DES_ENCRYPT);
+       memcpy(iv3,cbc_iv,sizeof(cbc_iv));
+       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");
-       des_cbc_encrypt((C_Block *)cbc_out,(C_Block *)cbc_in,
-               (long)strlen((char *)cbc_data)+1,ks,
-               (C_Block *)cbc_iv,DES_DECRYPT);
+               err=1;
+               }
+
+       memcpy(iv3,cbc_iv,sizeof(cbc_iv));
+       des_ncbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
+                        &iv3,DES_DECRYPT);
        if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)) != 0)
                {
                printf("cbc_encrypt decrypt error\n");
@@ -411,7 +482,7 @@ char *argv[];
 
 #ifndef LIBDES_LIT
        printf("Doing desx cbc\n");
-       if ((j=des_key_sched((C_Block *)cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
                {
                printf("Key error %d\n",j);
                err=1;
@@ -419,20 +490,17 @@ char *argv[];
        memset(cbc_out,0,40);
        memset(cbc_in,0,40);
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-       des_xcbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-               (long)strlen((char *)cbc_data)+1,ks,
-               (C_Block *)iv3,
-               (C_Block *)cbc2_key, (C_Block *)cbc3_key, DES_ENCRYPT);
+       des_xcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
+                        &iv3,&cbc2_key,&cbc3_key, DES_ENCRYPT);
        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((C_Block *)cbc_out,(C_Block *)cbc_in,
-               (long)strlen((char *)cbc_data)+1,ks,
-               (C_Block *)iv3,
-               (C_Block *)cbc2_key, (C_Block *)cbc3_key, DES_DECRYPT);
-       if (memcmp(cbc_in,cbc_data,32) != 0)
+       des_xcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,
+                        &iv3,&cbc2_key,&cbc3_key, DES_DECRYPT);
+       if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
                {
                printf("des_xcbc_encrypt decrypt error\n");
                err=1;
@@ -440,17 +508,17 @@ char *argv[];
 #endif
 
        printf("Doing ede cbc\n");
-       if ((j=des_key_sched((C_Block *)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((C_Block *)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((C_Block *)cbc3_key,ks3)) != 0)
+       if ((j=DES_set_key_checked(&cbc3_key,&ks3)) != 0)
                {
                printf("Key error %d\n",j);
                err=1;
@@ -458,49 +526,63 @@ char *argv[];
        memset(cbc_out,0,40);
        memset(cbc_in,0,40);
        i=strlen((char *)cbc_data)+1;
-       i=((i+7)/8)*8;
+       /* i=((i+7)/8)*8; */
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
 
-       des_ede3_cbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-               16L,ks,ks2,ks3,(C_Block *)iv3,DES_ENCRYPT);
-       des_ede3_cbc_encrypt((C_Block *)&(cbc_data[16]),
-               (C_Block *)&(cbc_out[16]),
-               (long)i-16,ks,ks2,ks3,(C_Block *)iv3,DES_ENCRYPT);
+       des_ede3_cbc_encrypt(cbc_data,cbc_out,16L,ks,ks2,ks3,&iv3,
+                            DES_ENCRYPT);
+       des_ede3_cbc_encrypt(&(cbc_data[16]),&(cbc_out[16]),i-16,ks,ks2,ks3,
+                            &iv3,DES_ENCRYPT);
        if (memcmp(cbc_out,cbc3_ok,
                (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
                {
+               int n;
+
                printf("des_ede3_cbc_encrypt encrypt error\n");
+               for(n=0 ; n < i ; ++n)
+                   printf(" %02x",cbc_out[n]);
+               printf("\n");
+               for(n=0 ; n < i ; ++n)
+                   printf(" %02x",cbc3_ok[n]);
+               printf("\n");
                err=1;
                }
 
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
-       des_ede3_cbc_encrypt((C_Block *)cbc_out,(C_Block *)cbc_in,
-               (long)i,ks,ks2,ks3,(C_Block *)iv3,DES_DECRYPT);
-       if (memcmp(cbc_in,cbc_data,strlen(cbc_data)+1) != 0)
+       des_ede3_cbc_encrypt(cbc_out,cbc_in,i,ks,ks2,ks3,&iv3,DES_DECRYPT);
+       if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
                {
+               int n;
+
                printf("des_ede3_cbc_encrypt decrypt error\n");
+               for(n=0 ; n < i ; ++n)
+                   printf(" %02x",cbc_data[n]);
+               printf("\n");
+               for(n=0 ; n < i ; ++n)
+                   printf(" %02x",cbc_in[n]);
+               printf("\n");
                err=1;
                }
 
 #ifndef LIBDES_LIT
        printf("Doing pcbc\n");
-       if ((j=des_key_sched((C_Block *)cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)
                {
                printf("Key error %d\n",j);
                err=1;
                }
        memset(cbc_out,0,40);
        memset(cbc_in,0,40);
-       des_pcbc_encrypt((C_Block *)cbc_data,(C_Block *)cbc_out,
-               (long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,DES_ENCRYPT);
+       des_pcbc_encrypt(cbc_data,cbc_out,strlen((char *)cbc_data)+1,ks,
+                        &cbc_iv,DES_ENCRYPT);
        if (memcmp(cbc_out,pcbc_ok,32) != 0)
                {
                printf("pcbc_encrypt encrypt error\n");
                err=1;
                }
-       des_pcbc_encrypt((C_Block *)cbc_out,(C_Block *)cbc_in,
-               (long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,DES_DECRYPT);
-       if (memcmp(cbc_in,cbc_data,32) != 0)
+       des_pcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,&cbc_iv,
+                        DES_DECRYPT);
+       if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
                {
                printf("pcbc_encrypt decrypt error\n");
                err=1;
@@ -524,7 +606,7 @@ char *argv[];
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
        for (i=0; i<sizeof(plain); i++)
                des_cfb_encrypt(&(plain[i]),&(cfb_buf1[i]),
-                       8,(long)1,ks,(C_Block *)cfb_tmp,DES_ENCRYPT);
+                       8,1,ks,&cfb_tmp,DES_ENCRYPT);
        if (memcmp(cfb_cipher8,cfb_buf1,sizeof(plain)) != 0)
                {
                printf("cfb_encrypt small encrypt error\n");
@@ -534,7 +616,7 @@ char *argv[];
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
        for (i=0; i<sizeof(plain); i++)
                des_cfb_encrypt(&(cfb_buf1[i]),&(cfb_buf2[i]),
-                       8,(long)1,ks,(C_Block *)cfb_tmp,DES_DECRYPT);
+                       8,1,ks,&cfb_tmp,DES_DECRYPT);
        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
                {
                printf("cfb_encrypt small decrypt error\n");
@@ -547,34 +629,44 @@ char *argv[];
        printf("done\n");
 
        printf("Doing ofb\n");
-       des_key_sched((C_Block *)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,(long)sizeof(plain)/8,ks,
-               (C_Block *)ofb_tmp);
+       des_ofb_encrypt(plain,ofb_buf1,64,sizeof(plain)/8,ks,&ofb_tmp);
        if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
                {
                printf("ofb_encrypt encrypt error\n");
+printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
+ofb_buf1[8+0], ofb_buf1[8+1], ofb_buf1[8+2], ofb_buf1[8+3],
+ofb_buf1[8+4], ofb_buf1[8+5], ofb_buf1[8+6], ofb_buf1[8+7]);
+printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
+ofb_buf1[8+0], ofb_cipher[8+1], ofb_cipher[8+2], ofb_cipher[8+3],
+ofb_buf1[8+4], ofb_cipher[8+5], ofb_cipher[8+6], ofb_cipher[8+7]);
                err=1;
                }
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
-       des_ofb_encrypt(ofb_buf1,ofb_buf2,64,(long)sizeof(ofb_buf1)/8,ks,
-               (C_Block *)ofb_tmp);
+       des_ofb_encrypt(ofb_buf1,ofb_buf2,64,sizeof(ofb_buf1)/8,ks,&ofb_tmp);
        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
                {
                printf("ofb_encrypt decrypt error\n");
+printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
+ofb_buf2[8+0], ofb_buf2[8+1], ofb_buf2[8+2], ofb_buf2[8+3],
+ofb_buf2[8+4], ofb_buf2[8+5], ofb_buf2[8+6], ofb_buf2[8+7]);
+printf("%02X %02X %02X %02X %02X %02X %02X %02X\n",
+plain[8+0], plain[8+1], plain[8+2], plain[8+3],
+plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                err=1;
                }
 
        printf("Doing ofb64\n");
-       des_key_sched((C_Block *)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));
        num=0;
        for (i=0; i<sizeof(plain); i++)
                {
-               des_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,
-                       (C_Block *)ofb_tmp,&num);
+               des_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,&ofb_tmp,
+                                 &num);
                }
        if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
                {
@@ -583,8 +675,8 @@ char *argv[];
                }
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
        num=0;
-       des_ofb64_encrypt(ofb_buf1,ofb_buf2,(long)sizeof(ofb_buf1),ks,
-               (C_Block *)ofb_tmp,&num);
+       des_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,&ofb_tmp,
+                         &num);
        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
                {
                printf("ofb64_encrypt decrypt error\n");
@@ -592,15 +684,15 @@ char *argv[];
                }
 
        printf("Doing ede_ofb64\n");
-       des_key_sched((C_Block *)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));
        num=0;
        for (i=0; i<sizeof(plain); i++)
                {
-               des_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,ks,ks,
-                       (C_Block *)ofb_tmp,&num);
+               des_ede3_ofb64_encrypt(&(plain[i]),&(ofb_buf1[i]),1,ks,ks,
+                                      ks,&ofb_tmp,&num);
                }
        if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
                {
@@ -609,8 +701,8 @@ char *argv[];
                }
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
        num=0;
-       des_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,(long)sizeof(ofb_buf1),ks,
-               ks,ks,(C_Block *)ofb_tmp,&num);
+       des_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,ks,ks,
+                              &ofb_tmp,&num);
        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
                {
                printf("ede_ofb64_encrypt decrypt error\n");
@@ -618,9 +710,8 @@ char *argv[];
                }
 
        printf("Doing cbc_cksum\n");
-       des_key_sched((C_Block *)cbc_key,ks);
-       cs=des_cbc_cksum((C_Block *)cbc_data,(C_Block *)cret,
-               (long)strlen(cbc_data),ks,(C_Block *)cbc_iv);
+       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)
                {
                printf("bad return value (%08lX), should be %08lX\n",
@@ -634,75 +725,82 @@ char *argv[];
                }
 
        printf("Doing quad_cksum\n");
-       cs=quad_cksum((C_Block *)cbc_data,(C_Block *)qret,
-               (long)strlen(cbc_data),2,(C_Block *)cbc_iv);
-       for (i=0; i<4; i++)
+       cs=des_quad_cksum(cbc_data,(des_cblock *)lqret,
+               (long)strlen((char *)cbc_data),2,(des_cblock *)cbc_iv);
+       if (cs != 0x70d7a63aL)
                {
-               lqret[i]=0;
-               memcpy(&(lqret[i]),&(qret[i][0]),4);
+               printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
+                       (unsigned long)cs);
+               err=1;
                }
-       { /* Big-endian fix */
-       static DES_LONG l=1;
-       static unsigned char *c=(unsigned char *)&l;
-       DES_LONG ll;
-
-       if (!c[0])
+#ifdef _CRAY
+       if (lqret[0].a != 0x327eba8dL)
                {
-               ll=lqret[0]^lqret[3];
-               lqret[0]^=ll;
-               lqret[3]^=ll;
-               ll=lqret[1]^lqret[2];
-               lqret[1]^=ll;
-               lqret[2]^=ll;
+               printf("quad_cksum error, out[0] %08lx is not %08lx\n",
+                       (unsigned long)lqret[0].a,0x327eba8dUL);
+               err=1;
                }
-       }
-       if (cs != 0x70d7a63aL)
+       if (lqret[0].b != 0x201a49ccL)
                {
-               printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
-                       (unsigned long)cs);
+               printf("quad_cksum error, out[1] %08lx is not %08lx\n",
+                       (unsigned long)lqret[0].b,0x201a49ccUL);
+               err=1;
+               }
+       if (lqret[1].a != 0x70d7a63aL)
+               {
+               printf("quad_cksum error, out[2] %08lx is not %08lx\n",
+                       (unsigned long)lqret[1].a,0x70d7a63aUL);
                err=1;
                }
+       if (lqret[1].b != 0x501c2c26L)
+               {
+               printf("quad_cksum error, out[3] %08lx is not %08lx\n",
+                       (unsigned long)lqret[1].b,0x501c2c26UL);
+               err=1;
+               }
+#else
        if (lqret[0] != 0x327eba8dL)
                {
                printf("quad_cksum error, out[0] %08lx is not %08lx\n",
-                       (unsigned long)lqret[0],0x327eba8dL);
+                       (unsigned long)lqret[0],0x327eba8dUL);
                err=1;
                }
        if (lqret[1] != 0x201a49ccL)
                {
                printf("quad_cksum error, out[1] %08lx is not %08lx\n",
-                       (unsigned long)lqret[1],0x201a49ccL);
+                       (unsigned long)lqret[1],0x201a49ccUL);
                err=1;
                }
        if (lqret[2] != 0x70d7a63aL)
                {
                printf("quad_cksum error, out[2] %08lx is not %08lx\n",
-                       (unsigned long)lqret[2],0x70d7a63aL);
+                       (unsigned long)lqret[2],0x70d7a63aUL);
                err=1;
                }
        if (lqret[3] != 0x501c2c26L)
                {
                printf("quad_cksum error, out[3] %08lx is not %08lx\n",
-                       (unsigned long)lqret[3],0x501c2c26L);
+                       (unsigned long)lqret[3],0x501c2c26UL);
                err=1;
                }
+#endif
 #endif
 
        printf("input word alignment test");
        for (i=0; i<4; i++)
                {
                printf(" %d",i);
-               des_cbc_encrypt((C_Block *)&(cbc_out[i]),(C_Block *)cbc_in,
-                       (long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,
-                       DES_ENCRYPT);
+               des_ncbc_encrypt(&(cbc_out[i]),cbc_in,
+                                strlen((char *)cbc_data)+1,ks,
+                                &cbc_iv,DES_ENCRYPT);
                }
        printf("\noutput word alignment test");
        for (i=0; i<4; i++)
                {
                printf(" %d",i);
-               des_cbc_encrypt((C_Block *)cbc_out,(C_Block *)&(cbc_in[i]),
-                       (long)strlen(cbc_data)+1,ks,(C_Block *)cbc_iv,
-                       DES_ENCRYPT);
+               des_ncbc_encrypt(cbc_out,&(cbc_in[i]),
+                                strlen((char *)cbc_data)+1,ks,
+                                &cbc_iv,DES_ENCRYPT);
                }
        printf("\n");
        printf("fast crypt test ");
@@ -719,12 +817,10 @@ char *argv[];
                err=1;
                }
        printf("\n");
-       exit(err);
-       return(0);
+       return(err);
        }
 
-static char *pt(p)
-unsigned char *p;
+static char *pt(unsigned char *p)
        {
        static char bufs[10][20];
        static int bnum=0;
@@ -745,17 +841,15 @@ unsigned char *p;
 
 #ifndef LIBDES_LIT
 
-static int cfb_test(bits, cfb_cipher)
-int bits;
-unsigned char *cfb_cipher;
+static int cfb_test(int bits, unsigned char *cfb_cipher)
        {
        des_key_schedule ks;
        int i,err=0;
 
-       des_key_sched((C_Block *)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,(long)sizeof(plain),ks,
-               (C_Block *)cfb_tmp,DES_ENCRYPT);
+       des_cfb_encrypt(plain,cfb_buf1,bits,sizeof(plain),ks,&cfb_tmp,
+                       DES_ENCRYPT);
        if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
                {
                err=1;
@@ -764,8 +858,8 @@ unsigned char *cfb_cipher;
                        printf("%s\n",pt(&(cfb_buf1[i])));
                }
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
-       des_cfb_encrypt(cfb_buf1,cfb_buf2,bits,(long)sizeof(plain),ks,
-               (C_Block *)cfb_tmp,DES_DECRYPT);
+       des_cfb_encrypt(cfb_buf1,cfb_buf2,bits,sizeof(plain),ks,&cfb_tmp,
+                       DES_DECRYPT);
        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
                {
                err=1;
@@ -776,20 +870,17 @@ unsigned char *cfb_cipher;
        return(err);
        }
 
-static int cfb64_test(cfb_cipher)
-unsigned char *cfb_cipher;
+static int cfb64_test(unsigned char *cfb_cipher)
        {
        des_key_schedule ks;
        int err=0,i,n;
 
-       des_key_sched((C_Block *)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,(long)12,ks,
-               (C_Block *)cfb_tmp,&n,DES_ENCRYPT);
-       des_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
-               (long)sizeof(plain)-12,ks,
-               (C_Block *)cfb_tmp,&n,DES_ENCRYPT);
+       des_cfb64_encrypt(plain,cfb_buf1,12,ks,&cfb_tmp,&n,DES_ENCRYPT);
+       des_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),sizeof(plain)-12,ks,
+                         &cfb_tmp,&n,DES_ENCRYPT);
        if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
                {
                err=1;
@@ -799,11 +890,9 @@ unsigned char *cfb_cipher;
                }
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
        n=0;
-       des_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,ks,
-               (C_Block *)cfb_tmp,&n,DES_DECRYPT);
+       des_cfb64_encrypt(cfb_buf1,cfb_buf2,17,ks,&cfb_tmp,&n,DES_DECRYPT);
        des_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-               (long)sizeof(plain)-17,ks,
-               (C_Block *)cfb_tmp,&n,DES_DECRYPT);
+                         sizeof(plain)-17,ks,&cfb_tmp,&n,DES_DECRYPT);
        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
                {
                err=1;
@@ -814,20 +903,19 @@ unsigned char *cfb_cipher;
        return(err);
        }
 
-static int ede_cfb64_test(cfb_cipher)
-unsigned char *cfb_cipher;
+static int ede_cfb64_test(unsigned char *cfb_cipher)
        {
        des_key_schedule ks;
        int err=0,i,n;
 
-       des_key_sched((C_Block *)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,(long)12,ks,ks,ks,
-               (C_Block *)cfb_tmp,&n,DES_ENCRYPT);
+       des_ede3_cfb64_encrypt(plain,cfb_buf1,12,ks,ks,ks,&cfb_tmp,&n,
+                              DES_ENCRYPT);
        des_ede3_cfb64_encrypt(&(plain[12]),&(cfb_buf1[12]),
-               (long)sizeof(plain)-12,ks,ks,ks,
-               (C_Block *)cfb_tmp,&n,DES_ENCRYPT);
+                              sizeof(plain)-12,ks,ks,ks,
+                              &cfb_tmp,&n,DES_ENCRYPT);
        if (memcmp(cfb_cipher,cfb_buf1,sizeof(plain)) != 0)
                {
                err=1;
@@ -838,10 +926,10 @@ unsigned char *cfb_cipher;
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
        n=0;
        des_ede3_cfb64_encrypt(cfb_buf1,cfb_buf2,(long)17,ks,ks,ks,
-               (C_Block *)cfb_tmp,&n,DES_DECRYPT);
+                              &cfb_tmp,&n,DES_DECRYPT);
        des_ede3_cfb64_encrypt(&(cfb_buf1[17]),&(cfb_buf2[17]),
-               (long)sizeof(plain)-17,ks,ks,ks,
-               (C_Block *)cfb_tmp,&n,DES_DECRYPT);
+                              sizeof(plain)-17,ks,ks,ks,
+                              &cfb_tmp,&n,DES_DECRYPT);
        if (memcmp(plain,cfb_buf2,sizeof(plain)) != 0)
                {
                err=1;
@@ -853,4 +941,4 @@ unsigned char *cfb_cipher;
        }
 
 #endif
-
+#endif