Fix strange formatting by indent

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

diff --git a/crypto/des/destest.c b/crypto/des/destest.c
index 58e8c35dcb5d819a40651ed97a747dbdec9bfa6a..b5bcf8f74b62b5dd807bbad85febf06faa5b0223 100644 (file)
--- a/crypto/des/destest.c
+++ b/crypto/des/destest.c
@@ -84,9 +84,7 @@ int main(int argc, char *argv[])
 #else
 #include <openssl/des.h>
 
-#if defined(PERL5) || defined(__FreeBSD__) || defined(NeXT)
-#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 */
@@ -322,7 +320,11 @@ static unsigned char ofb_cipher[24]=
        0x3d,0x6d,0x5b,0xe3,0x25,0x5a,0xf8,0xc3
        };
 
+#if 0
 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);
@@ -331,7 +333,8 @@ static int cfb64_test(unsigned char *cfb_cipher);
 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];
@@ -377,7 +380,7 @@ int main(int argc, char *argv[])
                              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,
+       /*-     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");
@@ -389,7 +392,7 @@ int main(int argc, char *argv[])
        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;
+               unsigned int n;
 
                printf("des_ede3_cbcm_encrypt decrypt error\n");
                for(n=0 ; n < i ; ++n)
@@ -429,7 +432,7 @@ int main(int argc, char *argv[])
 
 #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);
@@ -538,7 +541,7 @@ int main(int argc, char *argv[])
        if (memcmp(cbc_out,cbc3_ok,
                (unsigned int)(strlen((char *)cbc_data)+1+7)/8*8) != 0)
                {
-               int n;
+               unsigned int n;
 
                printf("des_ede3_cbc_encrypt encrypt error\n");
                for(n=0 ; n < i ; ++n)
@@ -554,7 +557,7 @@ 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)
                {
-               int n;
+               unsigned int n;
 
                printf("des_ede3_cbc_encrypt decrypt error\n");
                for(n=0 ; n < i ; ++n)
@@ -818,6 +821,9 @@ 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;
                }
+#ifdef OPENSSL_SYS_NETWARE
+    if (err) printf("ERROR: %d\n", err);
+#endif
        printf("\n");
        return(err);
        }