This commit was manufactured by cvs2svn to create branch

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

diff --git a/crypto/bf/bftest.c b/crypto/bf/bftest.c
index 09895f254240e30717b8231a5a4a4563b41233bc..97e6634d37f064a1933acf0d754503e57196b45a 100644 (file)
--- a/crypto/bf/bftest.c
+++ b/crypto/bf/bftest.c
@@ -62,6 +62,9 @@
 #include <stdio.h>
 #include <string.h>
 #include <stdlib.h>
+#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
+
+#include "../e_os.h"
 
 #ifdef OPENSSL_NO_BF
 int main(int argc, char *argv[])
@@ -275,7 +278,10 @@ int main(int argc, char *argv[])
        else
                ret=test();
 
-       exit(ret);
+#ifdef OPENSSL_SYS_NETWARE
+    if (ret) printf("ERROR: %d\n", ret);
+#endif
+       EXIT(ret);
        return(0);
        }
 
@@ -454,9 +460,9 @@ static int test(void)
        len=strlen(cbc_data)+1;
 
        BF_set_key(&key,16,cbc_key);
-       memset(cbc_in,0,40);
-       memset(cbc_out,0,40);
-       memcpy(iv,cbc_iv,8);
+       memset(cbc_in,0,sizeof cbc_in);
+       memset(cbc_out,0,sizeof cbc_out);
+       memcpy(iv,cbc_iv,sizeof iv);
        BF_cbc_encrypt((unsigned char *)cbc_data,cbc_out,len,
                &key,iv,BF_ENCRYPT);
        if (memcmp(cbc_out,cbc_ok,32) != 0)