evp/e_aes_cbc_hmac_sha256.c: enable is on all AES-NI platforms, not only on AVX.

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

diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 46c517be135c78df80c3a1f71094311d27d17532..64b92a34fe976075f986e4fea85bec12375bd479 100644 (file)
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -56,25 +56,26 @@
  * [including the GNU Public Licence.]
  */
 
  * [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
 
 #endif
 #endif
 

-#include <stdio.h>
-#include <stdlib.h>
-#ifndef MSDOS
-#if !defined(VMS) || defined(__DECC)
-#include <openssl/opensslconf.h>
+#ifndef OPENSSL_SYS_MSDOS
+#if !defined(OPENSSL_SYS_VMS) || defined(OPENSSL_SYS_VMS_DECC)

 #include OPENSSL_UNISTD
 #include OPENSSL_UNISTD

-#endif /* VMS */
+#endif

 #else
 #include <io.h>
 #endif
 #include <string.h>
 
 #else
 #include <io.h>
 #endif
 #include <string.h>
 

-#ifdef NO_DES
+#ifdef OPENSSL_NO_DES

 int main(int argc, char *argv[])
 {
     printf("No DES support\n");
 int main(int argc, char *argv[])
 {
     printf("No DES support\n");


@@ -83,9 +84,7 @@ int main(int argc, char *argv[])
 #else
 #include <openssl/des.h>
 
 #else
 #include <openssl/des.h>
 

-#if defined(PERL5) || defined(__FreeBSD__)
-#define crypt(c,s) (des_crypt((c),(s)))
-#endif
+#define crypt(c,s) (DES_crypt((c),(s)))

 
 /* tisk tisk - the test keys don't all have odd parity :-( */
 /* test data */
 
 /* tisk tisk - the test keys don't all have odd parity :-( */
 /* test data */


@@ -321,7 +320,11 @@ static unsigned char ofb_cipher[24]=
        0x3d,0x6d,0x5b,0xe3,0x25,0x5a,0xf8,0xc3
        };
 
        0x3d,0x6d,0x5b,0xe3,0x25,0x5a,0xf8,0xc3
        };
 

+#if 0

 static DES_LONG cbc_cksum_ret=0xB462FEF7L;
 static DES_LONG cbc_cksum_ret=0xB462FEF7L;

+#else
+static DES_LONG cbc_cksum_ret=0xF7FE62B4L;
+#endif

 static unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
 
 static char *pt(unsigned char *p);
 static unsigned char cbc_cksum_data[8]={0x1D,0x26,0x93,0x97,0xf7,0xfe,0x62,0xb4};
 
 static char *pt(unsigned char *p);


@@ -330,30 +333,38 @@ static int cfb64_test(unsigned char *cfb_cipher);
 static int ede_cfb64_test(unsigned char *cfb_cipher);
 int main(int argc, char *argv[])
        {
 static int ede_cfb64_test(unsigned char *cfb_cipher);
 int main(int argc, char *argv[])
        {

-       int i,j,err=0;
+       int j,err=0;
+       unsigned int i;

        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;
        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;
 
        int num;
        char *str;
 

-#ifndef NO_DESCBCM
+#ifndef OPENSSL_NO_DESCBCM

        printf("Doing cbcm\n");
        printf("Doing cbcm\n");

-       if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                }
                {
                printf("Key error %d\n",j);
                err=1;
                }

-       if ((j=des_set_key_checked(&cbc2_key,ks2)) != 0)
+       if ((j=DES_set_key_checked(&cbc2_key,&ks2)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                }
                {
                printf("Key error %d\n",j);
                err=1;
                }

-       if ((j=des_set_key_checked(&cbc3_key,ks3)) != 0)
+       if ((j=DES_set_key_checked(&cbc3_key,&ks3)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                {
                printf("Key error %d\n",j);
                err=1;


@@ -365,9 +376,9 @@ int main(int argc, char *argv[])
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
        memset(iv2,'\0',sizeof iv2);
 
        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_ede3_cbcm_encrypt(cbc_data,cbc_out,16L,&ks,&ks2,&ks3,&iv3,&iv2,

                              DES_ENCRYPT);
                              DES_ENCRYPT);

-       des_ede3_cbcm_encrypt(&cbc_data[16],&cbc_out[16],i-16,ks,ks2,ks3,
+       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)
                              &iv3,&iv2,DES_ENCRYPT);
        /*      if (memcmp(cbc_out,cbc3_ok,
                (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)


@@ -378,10 +389,10 @@ int main(int argc, char *argv[])
        */
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
        memset(iv2,'\0',sizeof iv2);
        */
        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);
+       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)
                {
        if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
                {

-               int n;
+               unsigned int n;

 
                printf("des_ede3_cbcm_encrypt decrypt error\n");
                for(n=0 ; n < i ; ++n)
 
                printf("des_ede3_cbcm_encrypt decrypt error\n");
                for(n=0 ; n < i ; ++n)


@@ -397,7 +408,7 @@ int main(int argc, char *argv[])
        printf("Doing ecb\n");
        for (i=0; i<NUM_TESTS; i++)
                {
        printf("Doing ecb\n");
        for (i=0; i<NUM_TESTS; i++)
                {

-               des_set_key_unchecked(&key_data[i],ks);
+               DES_set_key_unchecked(&key_data[i],&ks);

                memcpy(in,plain_data[i],8);
                memset(out,0,8);
                memset(outin,0,8);
                memcpy(in,plain_data[i],8);
                memset(out,0,8);
                memset(outin,0,8);


@@ -421,11 +432,11 @@ int main(int argc, char *argv[])
 
 #ifndef LIBDES_LIT
        printf("Doing ede ecb\n");
 
 #ifndef LIBDES_LIT
        printf("Doing ede ecb\n");

-       for (i=0; i<(NUM_TESTS-1); i++)
+       for (i=0; i<(NUM_TESTS-2); i++)

                {
                {

-               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);
+               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);
                memcpy(in,plain_data[i],8);
                memset(out,0,8);
                memset(outin,0,8);


@@ -449,7 +460,7 @@ int main(int argc, char *argv[])
 #endif
 
        printf("Doing cbc\n");
 #endif
 
        printf("Doing cbc\n");

-       if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                {
                printf("Key error %d\n",j);
                err=1;


@@ -476,7 +487,7 @@ int main(int argc, char *argv[])
 
 #ifndef LIBDES_LIT
        printf("Doing desx cbc\n");
 
 #ifndef LIBDES_LIT
        printf("Doing desx cbc\n");

-       if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                {
                printf("Key error %d\n",j);
                err=1;


@@ -502,17 +513,17 @@ int main(int argc, char *argv[])
 #endif
 
        printf("Doing ede cbc\n");
 #endif
 
        printf("Doing ede cbc\n");

-       if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                }
                {
                printf("Key error %d\n",j);
                err=1;
                }

-       if ((j=des_set_key_checked(&cbc2_key,ks2)) != 0)
+       if ((j=DES_set_key_checked(&cbc2_key,&ks2)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                }
                {
                printf("Key error %d\n",j);
                err=1;
                }

-       if ((j=des_set_key_checked(&cbc3_key,ks3)) != 0)
+       if ((j=DES_set_key_checked(&cbc3_key,&ks3)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                {
                printf("Key error %d\n",j);
                err=1;


@@ -523,13 +534,22 @@ int main(int argc, char *argv[])
        /* i=((i+7)/8)*8; */
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
 
        /* i=((i+7)/8)*8; */
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
 

-       des_ede3_cbc_encrypt(cbc_data,cbc_out,16L,ks,ks2,ks3,&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)
                {
        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)
                {

+               unsigned int n;
+

                printf("des_ede3_cbc_encrypt encrypt error\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;
                }
 
                err=1;
                }
 


@@ -537,13 +557,21 @@ int main(int argc, char *argv[])
        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)
                {
        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)
                {

+               unsigned int n;
+

                printf("des_ede3_cbc_encrypt decrypt error\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");
                err=1;
                }
 
 #ifndef LIBDES_LIT
        printf("Doing pcbc\n");

-       if ((j=des_set_key_checked(&cbc_key,ks)) != 0)
+       if ((j=DES_set_key_checked(&cbc_key,&ks)) != 0)

                {
                printf("Key error %d\n",j);
                err=1;
                {
                printf("Key error %d\n",j);
                err=1;


@@ -606,7 +634,7 @@ int main(int argc, char *argv[])
        printf("done\n");
 
        printf("Doing ofb\n");
        printf("done\n");
 
        printf("Doing ofb\n");

-       des_set_key_checked(&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)
        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 +663,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                }
 
        printf("Doing ofb64\n");
                }
 
        printf("Doing ofb64\n");

-       des_set_key_checked(&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));
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
        memset(ofb_buf1,0,sizeof(ofb_buf1));
        memset(ofb_buf2,0,sizeof(ofb_buf1));


@@ -652,7 +680,8 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                }
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
        num=0;
                }
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
        num=0;

-       des_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,&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");
        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
                {
                printf("ofb64_encrypt decrypt error\n");


@@ -660,15 +689,15 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                }
 
        printf("Doing ede_ofb64\n");
                }
 
        printf("Doing ede_ofb64\n");

-       des_set_key_checked(&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++)
                {
        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,
-                                      &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)
                {
                }
        if (memcmp(ofb_cipher,ofb_buf1,sizeof(ofb_buf1)) != 0)
                {


@@ -677,8 +706,8 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                }
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
        num=0;
                }
        memcpy(ofb_tmp,ofb_iv,sizeof(ofb_iv));
        num=0;

-       des_ede3_ofb64_encrypt(ofb_buf1,ofb_buf2,sizeof(ofb_buf1),ks,
-                              ks,ks,&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");
        if (memcmp(plain,ofb_buf2,sizeof(ofb_buf2)) != 0)
                {
                printf("ede_ofb64_encrypt decrypt error\n");


@@ -686,7 +715,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                }
 
        printf("Doing cbc_cksum\n");
                }
 
        printf("Doing cbc_cksum\n");

-       des_set_key_checked(&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)
                {
        cs=des_cbc_cksum(cbc_data,&cret,strlen((char *)cbc_data),ks,&cbc_iv);
        if (cs != cbc_cksum_ret)
                {


@@ -701,43 +730,40 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                }
 
        printf("Doing quad_cksum\n");
                }
 
        printf("Doing quad_cksum\n");

-       /* This is obviously done this way especially to puzzle me. Although
-          quad_cksum returns up to 4 groups of 8 bytes, this test gets it to
-          produce 2 groups then treats them as 4 groups of 4 bytes.
-          Ben 13 Feb 1999 */
-       cs=quad_cksum(cbc_data,(des_cblock *)qret,strlen((char *)cbc_data),2,
-                     &cbc_iv);
-
-       { /* Big-endian fix */
-       static DES_LONG l=1;
-       static unsigned char *c=(unsigned char *)&l;
-       DES_LONG ll;
-
-       j=sizeof(lqret[0])-4;
-       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);
-               if (!c[0] && (j > 0))
-                       lqret[i]=lqret[i]>>(j*8); /* For Cray */
+               printf("quad_cksum error, ret %08lx should be 70d7a63a\n",
+                       (unsigned long)cs);
+               err=1;

                }
                }

-
-       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;
                }
                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",
        if (lqret[0] != 0x327eba8dL)
                {
                printf("quad_cksum error, out[0] %08lx is not %08lx\n",


@@ -762,6 +788,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                        (unsigned long)lqret[3],0x501c2c26UL);
                err=1;
                }
                        (unsigned long)lqret[3],0x501c2c26UL);
                err=1;
                }

+#endif

 #endif
 
        printf("input word alignment test");
 #endif
 
        printf("input word alignment test");


@@ -794,8 +821,11 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
                printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str);
                err=1;
                }
                printf("fast crypt error, %s should be yA1Rp/1hZXIJk\n",str);
                err=1;
                }

+#ifdef OPENSSL_SYS_NETWARE
+    if (err) printf("ERROR: %d\n", err);
+#endif

        printf("\n");
        printf("\n");

-       exit(err);
+       return(err);

        }
 
 static char *pt(unsigned char *p)
        }
 
 static char *pt(unsigned char *p)


@@ -824,7 +854,7 @@ static int cfb_test(int bits, unsigned char *cfb_cipher)
        des_key_schedule ks;
        int i,err=0;
 
        des_key_schedule ks;
        int i,err=0;
 

-       des_set_key_checked(&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);
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
        des_cfb_encrypt(plain,cfb_buf1,bits,sizeof(plain),ks,&cfb_tmp,
                        DES_ENCRYPT);


@@ -853,7 +883,7 @@ static int cfb64_test(unsigned char *cfb_cipher)
        des_key_schedule ks;
        int err=0,i,n;
 
        des_key_schedule ks;
        int err=0,i,n;
 

-       des_set_key_checked(&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);
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
        n=0;
        des_cfb64_encrypt(plain,cfb_buf1,12,ks,&cfb_tmp,&n,DES_ENCRYPT);


@@ -886,7 +916,7 @@ static int ede_cfb64_test(unsigned char *cfb_cipher)
        des_key_schedule ks;
        int err=0,i,n;
 
        des_key_schedule ks;
        int err=0,i,n;
 

-       des_set_key_checked(&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,
        memcpy(cfb_tmp,cfb_iv,sizeof(cfb_iv));
        n=0;
        des_ede3_cfb64_encrypt(plain,cfb_buf1,12,ks,ks,ks,&cfb_tmp,&n,