OpenSSL 0.9.4 merge

1 files changed, 29 insertions, 17 deletions

diff --git a/src/lib/libcrypto/bf/bftest.c b/src/lib/libcrypto/bf/bftest.c
index 9266cf813a..6ecd2609a9 100644
--- a/src/lib/libcrypto/bf/bftest.c
+++ b/src/lib/libcrypto/bf/bftest.c
@@ -62,7 +62,19 @@
 #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>
+
+#ifdef CHARSET_EBCDIC
+#include <openssl/ebcdic.h>
+#endif
 
 char *bf_key[2]={
         "abcdefghijklmnopqrstuvwxyz",
@@ -252,17 +264,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 +279,7 @@ char *argv[];
         return(0);
         }
 
-static int print_test_data()
+static int print_test_data(void)
         {
         unsigned int i,j;
 
@@ -304,7 +308,7 @@ static int print_test_data()
                 printf("c=");
                 for (j=0; j<8; j++)
                         printf("%02X",key_out[i][j]);
-                printf(" k[%2d]=",i+1);
+                printf(" k[%2u]=",i+1);
                 for (j=0; j<i+1; j++)
                         printf("%02X",key_test[j]);
                 printf("\n");
@@ -342,7 +346,7 @@ static int print_test_data()
         return(0);
         }
 
-static int test()
+static int test(void)
         {
         unsigned char cbc_in[40],cbc_out[40],iv[8];
         int i,n,err=0;
@@ -351,9 +355,16 @@ static int test()
         unsigned char out[8]; 
         BF_LONG len;
 
+#ifdef CHARSET_EBCDIC
+        ebcdic2ascii(cbc_data, cbc_data, strlen(cbc_data));
+#endif
+
         printf("testing blowfish in raw ecb mode\n");
         for (n=0; n<2; n++)
                 {
+#ifdef CHARSET_EBCDIC
+                ebcdic2ascii(bf_key[n], bf_key[n], strlen(bf_key[n]));
+#endif
                 BF_set_key(&key,strlen(bf_key[n]),(unsigned char *)bf_key[n]);
 
                 data[0]=bf_plain[n][0];
@@ -364,11 +375,11 @@ static int test()
                         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");
                         }
@@ -379,11 +390,11 @@ static int test()
                         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 +530,4 @@ static int test()
 
         return(err);
         }
+#endif