Change #include filenames from <foo.h> to <openssl.h>.

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

diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index a2e4d13f4bca7da1bda6e3ff84ead8ac83d13c51..39fc8123e418f9e57bccb8c89c3ff2f643a509f5 100644 (file)
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -70,7 +70,7 @@
 #include <io.h>
 #endif
 #include <string.h>
-#include "des.h"
+#include <openssl/des.h>
 
 #if defined(PERL5) || defined(__FreeBSD__)
 #define crypt(c,s) (des_crypt((c),(s)))
@@ -229,7 +229,7 @@ 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
  * machines :-) */
 /* static char cbc_data[40]="7654321 Now is the time for \0001"; */
-static char cbc_data[40]={
+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,
@@ -313,9 +313,7 @@ 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,iv2;
@@ -365,7 +363,7 @@ char *argv[];
        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(cbc_data)+1) != 0)
+       if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
                {
                int n;
 
@@ -533,7 +531,7 @@ char *argv[];
 
        memcpy(iv3,cbc_iv,sizeof(cbc_iv));
        des_ede3_cbc_encrypt(cbc_out,cbc_in,i,ks,ks2,ks3,iv3,DES_DECRYPT);
-       if (memcmp(cbc_in,cbc_data,strlen(cbc_data)+1) != 0)
+       if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
                {
                printf("des_ede3_cbc_encrypt decrypt error\n");
                err=1;
@@ -548,16 +546,16 @@ char *argv[];
                }
        memset(cbc_out,0,40);
        memset(cbc_in,0,40);
-       des_pcbc_encrypt(cbc_data,cbc_out,strlen(cbc_data)+1,ks,cbc_iv,
+       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(cbc_out,cbc_in,strlen(cbc_data)+1,ks,cbc_iv,
+       des_pcbc_encrypt(cbc_out,cbc_in,strlen((char *)cbc_data)+1,ks,cbc_iv,
                         DES_DECRYPT);
-       if (memcmp(cbc_in,cbc_data,strlen(cbc_data)+1) != 0)
+       if (memcmp(cbc_in,cbc_data,strlen((char *)cbc_data)+1) != 0)
                {
                printf("pcbc_encrypt decrypt error\n");
                err=1;
@@ -685,7 +683,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
 
        printf("Doing cbc_cksum\n");
        des_key_sched(cbc_key,ks);
-       cs=des_cbc_cksum(cbc_data,cret,strlen(cbc_data),ks,cbc_iv);
+       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",
@@ -703,7 +701,8 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
           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_cblocks)qret,strlen(cbc_data),2,cbc_iv);
+       cs=quad_cksum(cbc_data,(des_cblocks)qret,strlen((char *)cbc_data),2,
+                     cbc_iv);
 
        { /* Big-endian fix */
        static DES_LONG l=1;
@@ -765,14 +764,16 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
        for (i=0; i<4; i++)
                {
                printf(" %d",i);
-               des_ncbc_encrypt(&(cbc_out[i]),cbc_in,strlen(cbc_data)+1,ks,
+               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_ncbc_encrypt(cbc_out,&(cbc_in[i]),strlen(cbc_data)+1,ks,
+               des_ncbc_encrypt(cbc_out,&(cbc_in[i]),
+                                strlen((char *)cbc_data)+1,ks,
                                 cbc_iv,DES_ENCRYPT);
                }
        printf("\n");
@@ -794,8 +795,7 @@ plain[8+4], plain[8+5], plain[8+6], plain[8+7]);
        return(0);
        }
 
-static char *pt(p)
-unsigned char *p;
+static char *pt(unsigned char *p)
        {
        static char bufs[10][20];
        static int bnum=0;
@@ -816,9 +816,7 @@ 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;
@@ -847,8 +845,7 @@ 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;
@@ -881,8 +878,7 @@ 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;