Make the PACKET/WPACKET code available to both libcrypto and libssl

[openssl.git] / test / ideatest.c

diff --git a/test/ideatest.c b/test/ideatest.c
index 14d69dc3214fb26ca97fa24c58c73b3000b5cf80..e572984c4f63fed80df8d4ceb519ba3b2765c0c9 100644 (file)
--- a/test/ideatest.c
+++ b/test/ideatest.c
@@ -1,7 +1,7 @@
 /*
  * Copyright 1995-2017 The OpenSSL Project Authors. All Rights Reserved.
  *
- * Licensed under the OpenSSL license (the "License").  You may not use
+ * Licensed under the Apache License 2.0 (the "License").  You may not use
  * this file except in compliance with the License.  You can obtain a copy
  * in the file LICENSE in the source distribution or at
  * https://www.openssl.org/source/license.html
@@ -9,7 +9,7 @@
 
 #include <string.h>
 
-#include "../e_os.h"
+#include "internal/nelem.h"
 #include "testutil.h"
 
 #ifndef OPENSSL_NO_IDEA
@@ -25,7 +25,7 @@ static const unsigned char c[8] = { 0x11, 0xFB, 0xED, 0x2B, 0x01, 0x98, 0x6D, 0x
 
 static unsigned char out[80];
 
-static const char text[] = "Hello to all people out there";
+static const unsigned char text[] = "Hello to all people out there";
 
 static const unsigned char cfb_key[16] = {
     0xe1, 0xf0, 0xc3, 0xd2, 0xa5, 0xb4, 0x87, 0x96,
@@ -74,7 +74,7 @@ static int test_idea_cbc(void)
     IDEA_set_encrypt_key(k, &key);
     IDEA_set_decrypt_key(&key, &dkey);
     memcpy(iv, k, sizeof(iv));
-    IDEA_cbc_encrypt((unsigned char *)text, out, text_len, &key, iv, 1);
+    IDEA_cbc_encrypt(text, out, text_len, &key, iv, 1);
     memcpy(iv, k, sizeof(iv));
     IDEA_cbc_encrypt(out, out, IDEA_BLOCK, &dkey, iv, 0);
     IDEA_cbc_encrypt(&out[8], &out[8], text_len - 8, &dkey, iv, 0);
@@ -108,11 +108,12 @@ static int test_idea_cfb64(void)
 }
 #endif
 
-void register_tests(void)
+int setup_tests(void)
 {
 #ifndef OPENSSL_NO_IDEA
     ADD_TEST(test_idea_ecb);
     ADD_TEST(test_idea_cbc);
     ADD_TEST(test_idea_cfb64);
 #endif
+    return 1;
 }