VMS support.

[openssl.git] / crypto / bf / bftest.c

diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c
index 2c678e418bd30f5d30678f27401ab906cdfb9b81..80182c0a2f210cc9142f91db455a80a3ff3543da 100644 (file)
--- a/crypto/bf/bftest.c
+++ b/crypto/bf/bftest.c
@@ -1,5 +1,5 @@
 /* crypto/bf/bftest.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
@@ -62,7 +62,15 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
-#include "blowfish.h"
+
+#ifdef NO_BF
+int main(int argc, char *argv[])
+{
+    printf("No BF support\n");
+    return(0);
+}
+#else
+#include <openssl/blowfish.h>
 
 char *bf_key[2]={
        "abcdefghijklmnopqrstuvwxyz",
@@ -71,13 +79,13 @@ char *bf_key[2]={
 
 /* big endian */
 BF_LONG bf_plain[2][2]={
-       {0x424c4f57,0x46495348},
-       {0xfedcba98,0x76543210}
+       {0x424c4f57L,0x46495348L},
+       {0xfedcba98L,0x76543210L}
        };
 
 BF_LONG bf_cipher[2][2]={
-       {0x324ed0fe,0xf413a203},
-       {0xcc91732b,0x8022f684}
+       {0x324ed0feL,0xf413a203L},
+       {0xcc91732bL,0x8022f684L}
        };
 /************/
 
@@ -252,17 +260,9 @@ unsigned char key_out[KEY_TEST_NUM][8]={
        {0x05,0x04,0x4B,0x62,0xFA,0x52,0xD0,0x80},
        };
 
-#ifndef NOPROTO
 static int test(void );
 static int print_test_data(void );
-#else
-static int test();
-static int print_test_data();
-#endif
-
-int main(argc,argv)
-int argc;
-char *argv[];
+int main(int argc, char *argv[])
        {
        int ret;
 
@@ -275,7 +275,7 @@ char *argv[];
        return(0);
        }
 
-static int print_test_data()
+static int print_test_data(void)
        {
        unsigned int i,j;
 
@@ -317,8 +317,8 @@ static int print_test_data()
        printf("\niv[8]     = ");
        for (j=0; j<8; j++)
                printf("%02X",cbc_iv[j]);
-       printf("\ndata[%d]  = '%s'",strlen(cbc_data)+1,cbc_data);
-       printf("\ndata[%d]  = ",strlen(cbc_data)+1);
+       printf("\ndata[%d]  = '%s'",(int)strlen(cbc_data)+1,cbc_data);
+       printf("\ndata[%d]  = ",(int)strlen(cbc_data)+1);
        for (j=0; j<strlen(cbc_data)+1; j++)
                printf("%02X",cbc_data[j]);
        printf("\n");
@@ -329,20 +329,20 @@ static int print_test_data()
        printf("\n");
 
        printf("cfb64 cipher text\n");
-       printf("cipher[%d]= ",strlen(cbc_data)+1);
+       printf("cipher[%d]= ",(int)strlen(cbc_data)+1);
        for (j=0; j<strlen(cbc_data)+1; j++)
                printf("%02X",cfb64_ok[j]);
        printf("\n");
 
        printf("ofb64 cipher text\n");
-       printf("cipher[%d]= ",strlen(cbc_data)+1);
+       printf("cipher[%d]= ",(int)strlen(cbc_data)+1);
        for (j=0; j<strlen(cbc_data)+1; j++)
                printf("%02X",ofb64_ok[j]);
        printf("\n");
        return(0);
        }
 
-static int test()
+static int test(void)
        {
        unsigned char cbc_in[40],cbc_out[40],iv[8];
        int i,n,err=0;
@@ -358,32 +358,32 @@ static int test()
 
                data[0]=bf_plain[n][0];
                data[1]=bf_plain[n][1];
-               BF_encrypt(data,&key,BF_ENCRYPT);
+               BF_encrypt(data,&key);
                if (memcmp(&(bf_cipher[n][0]),&(data[0]),8) != 0)
                        {
                        printf("BF_encrypt error encrypting\n");
                        printf("got     :");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",data[i]);
+                               printf("%08lX ",(unsigned long)data[i]);
                        printf("\n");
                        printf("expected:");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",bf_cipher[n][i]);
+                               printf("%08lX ",(unsigned long)bf_cipher[n][i]);
                        err=1;
                        printf("\n");
                        }
 
-               BF_encrypt(&(data[0]),&key,BF_DECRYPT);
+               BF_decrypt(&(data[0]),&key);
                if (memcmp(&(bf_plain[n][0]),&(data[0]),8) != 0)
                        {
                        printf("BF_encrypt error decrypting\n");
                        printf("got     :");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",data[i]);
+                               printf("%08lX ",(unsigned long)data[i]);
                        printf("\n");
                        printf("expected:");
                        for (i=0; i<2; i++)
-                               printf("%08lX ",bf_plain[n][i]);
+                               printf("%08lX ",(unsigned long)bf_plain[n][i]);
                        printf("\n");
                        err=1;
                        }
@@ -519,3 +519,4 @@ static int test()
 
        return(err);
        }
+#endif