[openssl-commits] [openssl] master update
Matt Caswell
matt at openssl.org
Wed Apr 12 09:33:21 UTC 2017
The branch master has been updated
via 0bf3c66c9d5cfc4dc7b0eee326ac3554956d7aa3 (commit)
via 56bf5c55cd7d751390e92aad2b2bd9cc031b1e43 (commit)
via 70e1acd786511724e3680790f358d1fc4756a49b (commit)
from b19e93ec3d3fc569e58b442a355cc761eda14e96 (commit)
- Log -----------------------------------------------------------------
commit 0bf3c66c9d5cfc4dc7b0eee326ac3554956d7aa3
Author: Jon Spillett <jon.spillett at oracle.com>
Date: Wed Apr 12 11:56:45 2017 +1000
Remove unused variable. Thanks @pauli-oracle
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3177)
commit 56bf5c55cd7d751390e92aad2b2bd9cc031b1e43
Author: Jon Spillett <jon.spillett at oracle.com>
Date: Wed Apr 12 11:03:29 2017 +1000
Code review. Split tests up
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3177)
commit 70e1acd786511724e3680790f358d1fc4756a49b
Author: Jon Spillett <jon.spillett at oracle.com>
Date: Tue Apr 11 14:31:28 2017 +1000
Convert blowfish tests to new framework
Reviewed-by: Richard Levitte <levitte at openssl.org>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3177)
-----------------------------------------------------------------------
Summary of changes:
test/bftest.c | 254 ++++++++++++++++++++++++++------------------------------
test/build.info | 2 +-
2 files changed, 121 insertions(+), 135 deletions(-)
diff --git a/test/bftest.c b/test/bftest.c
index eb8d8a6..978fd58 100644
--- a/test/bftest.c
+++ b/test/bftest.c
@@ -17,6 +17,9 @@
#include <stdlib.h>
#include <openssl/opensslconf.h> /* To see if OPENSSL_NO_BF is defined */
+#include "test_main_custom.h"
+#include "testutil.h"
+
#include "../e_os.h"
#ifdef OPENSSL_NO_BF
@@ -229,20 +232,6 @@ static unsigned char key_out[KEY_TEST_NUM][8] = {
{0x05, 0x04, 0x4B, 0x62, 0xFA, 0x52, 0xD0, 0x80},
};
-static int test(void);
-static int print_test_data(void);
-int main(int argc, char *argv[])
-{
- int ret;
-
- if (argc > 1)
- ret = print_test_data();
- else
- ret = test();
-
- EXIT(ret);
-}
-
static int print_test_data(void)
{
unsigned int i, j;
@@ -308,103 +297,68 @@ static int print_test_data(void)
return (0);
}
-static int test(void)
+static int test_bf_ecb_raw(int n)
{
- unsigned char cbc_in[40], cbc_out[40], iv[8];
- int i, n, err = 0;
+ int ret = 1;
BF_KEY key;
BF_LONG data[2];
+
+ BF_set_key(&key, strlen(bf_key[n]), (unsigned char *)bf_key[n]);
+
+ data[0] = bf_plain[n][0];
+ data[1] = bf_plain[n][1];
+ BF_encrypt(data, &key);
+ if (!TEST_mem_eq(&(bf_cipher[n][0]), BF_BLOCK, &(data[0]), BF_BLOCK))
+ ret = 0;
+
+ BF_decrypt(&(data[0]), &key);
+ if (!TEST_mem_eq(&(bf_plain[n][0]), BF_BLOCK, &(data[0]), BF_BLOCK))
+ ret = 0;
+
+ return ret;
+}
+
+static int test_bf_ecb(int n)
+{
+ int ret = 1;
+ BF_KEY key;
unsigned char out[8];
- BF_LONG len;
-# ifdef CHARSET_EBCDIC
- ebcdic2ascii(cbc_data, cbc_data, strlen(cbc_data));
-# endif
+ BF_set_key(&key, 8, ecb_data[n]);
- 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];
- data[1] = bf_plain[n][1];
- 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 ", (unsigned long)data[i]);
- printf("\n");
- printf("expected:");
- for (i = 0; i < 2; i++)
- printf("%08lX ", (unsigned long)bf_cipher[n][i]);
- err = 1;
- printf("\n");
- }
-
- 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 ", (unsigned long)data[i]);
- printf("\n");
- printf("expected:");
- for (i = 0; i < 2; i++)
- printf("%08lX ", (unsigned long)bf_plain[n][i]);
- printf("\n");
- err = 1;
- }
- }
+ BF_ecb_encrypt(&(plain_data[n][0]), out, &key, BF_ENCRYPT);
+ if (!TEST_mem_eq(&(cipher_data[n][0]), BF_BLOCK, out, BF_BLOCK))
+ ret = 0;
- printf("testing blowfish in ecb mode\n");
-
- for (n = 0; n < NUM_TESTS; n++) {
- BF_set_key(&key, 8, ecb_data[n]);
-
- BF_ecb_encrypt(&(plain_data[n][0]), out, &key, BF_ENCRYPT);
- if (memcmp(&(cipher_data[n][0]), out, 8) != 0) {
- printf("BF_ecb_encrypt blowfish error encrypting\n");
- printf("got :");
- for (i = 0; i < 8; i++)
- printf("%02X ", out[i]);
- printf("\n");
- printf("expected:");
- for (i = 0; i < 8; i++)
- printf("%02X ", cipher_data[n][i]);
- err = 1;
- printf("\n");
- }
-
- BF_ecb_encrypt(out, out, &key, BF_DECRYPT);
- if (memcmp(&(plain_data[n][0]), out, 8) != 0) {
- printf("BF_ecb_encrypt error decrypting\n");
- printf("got :");
- for (i = 0; i < 8; i++)
- printf("%02X ", out[i]);
- printf("\n");
- printf("expected:");
- for (i = 0; i < 8; i++)
- printf("%02X ", plain_data[n][i]);
- printf("\n");
- err = 1;
- }
- }
+ BF_ecb_encrypt(out, out, &key, BF_DECRYPT);
+ if (!TEST_mem_eq(&(plain_data[n][0]), BF_BLOCK, out, BF_BLOCK))
+ ret = 0;
- printf("testing blowfish set_key\n");
- for (n = 1; n < KEY_TEST_NUM; n++) {
- BF_set_key(&key, n, key_test);
- BF_ecb_encrypt(key_data, out, &key, BF_ENCRYPT);
- /* mips-sgi-irix6.5-gcc vv -mabi=64 bug workaround */
- if (memcmp(out, &(key_out[i = n - 1][0]), 8) != 0) {
- printf("blowfish setkey error\n");
- err = 1;
- }
- }
+ return ret;
+}
+
+static int test_bf_set_key(int n)
+{
+ int ret = 1;
+ BF_KEY key;
+ unsigned char out[8];
+
+ BF_set_key(&key, n+1, key_test);
+ BF_ecb_encrypt(key_data, out, &key, BF_ENCRYPT);
+ /* mips-sgi-irix6.5-gcc vv -mabi=64 bug workaround */
+ if (!TEST_mem_eq(out, 8, &(key_out[n][0]), 8))
+ ret = 0;
+
+ return ret;
+}
+
+static int test_bf_cbc(void)
+{
+ unsigned char cbc_in[40], cbc_out[40], iv[8];
+ int ret = 1;
+ BF_KEY key;
+ BF_LONG len;
- printf("testing blowfish in cbc mode\n");
len = strlen(cbc_data) + 1;
BF_set_key(&key, 16, cbc_key);
@@ -413,20 +367,25 @@ static int test(void)
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) {
- err = 1;
- printf("BF_cbc_encrypt encrypt error\n");
- for (i = 0; i < 32; i++)
- printf("0x%02X,", cbc_out[i]);
- }
+ if (!TEST_mem_eq(cbc_out, 32, cbc_ok, 32))
+ ret = 0;
+
memcpy(iv, cbc_iv, 8);
BF_cbc_encrypt(cbc_out, cbc_in, len, &key, iv, BF_DECRYPT);
- if (memcmp(cbc_in, cbc_data, strlen(cbc_data) + 1) != 0) {
- printf("BF_cbc_encrypt decrypt error\n");
- err = 1;
- }
+ if (!TEST_mem_eq(cbc_in, len, cbc_data, strlen(cbc_data) + 1))
+ ret = 0;
- printf("testing blowfish in cfb64 mode\n");
+ return ret;
+}
+
+static int test_bf_cfb64(void)
+{
+ unsigned char cbc_in[40], cbc_out[40], iv[8];
+ int n, ret = 1;
+ BF_KEY key;
+ BF_LONG len;
+
+ len = strlen(cbc_data) + 1;
BF_set_key(&key, 16, cbc_key);
memset(cbc_in, 0, 40);
@@ -437,23 +396,28 @@ static int test(void)
&key, iv, &n, BF_ENCRYPT);
BF_cfb64_encrypt((unsigned char *)&(cbc_data[13]), &(cbc_out[13]),
len - 13, &key, iv, &n, BF_ENCRYPT);
- if (memcmp(cbc_out, cfb64_ok, (int)len) != 0) {
- err = 1;
- printf("BF_cfb64_encrypt encrypt error\n");
- for (i = 0; i < (int)len; i++)
- printf("0x%02X,", cbc_out[i]);
- }
+ if (!TEST_mem_eq(cbc_out, (int)len, cfb64_ok, (int)len))
+ ret = 0;
+
n = 0;
memcpy(iv, cbc_iv, 8);
BF_cfb64_encrypt(cbc_out, cbc_in, 17, &key, iv, &n, BF_DECRYPT);
BF_cfb64_encrypt(&(cbc_out[17]), &(cbc_in[17]), len - 17,
&key, iv, &n, BF_DECRYPT);
- if (memcmp(cbc_in, cbc_data, (int)len) != 0) {
- printf("BF_cfb64_encrypt decrypt error\n");
- err = 1;
- }
+ if (!TEST_mem_eq(cbc_in, (int)len, cbc_data, (int)len))
+ ret = 0;
+
+ return ret;
+}
+
+static int test_bf_ofb64(void)
+{
+ unsigned char cbc_in[40], cbc_out[40], iv[8];
+ int n, ret = 1;
+ BF_KEY key;
+ BF_LONG len;
- printf("testing blowfish in ofb64\n");
+ len = strlen(cbc_data) + 1;
BF_set_key(&key, 16, cbc_key);
memset(cbc_in, 0, 40);
@@ -464,21 +428,43 @@ static int test(void)
&n);
BF_ofb64_encrypt((unsigned char *)&(cbc_data[13]), &(cbc_out[13]),
len - 13, &key, iv, &n);
- if (memcmp(cbc_out, ofb64_ok, (int)len) != 0) {
- err = 1;
- printf("BF_ofb64_encrypt encrypt error\n");
- for (i = 0; i < (int)len; i++)
- printf("0x%02X,", cbc_out[i]);
- }
+ if (!TEST_mem_eq(cbc_out, (int)len, ofb64_ok, (int)len))
+ ret = 0;
+
n = 0;
memcpy(iv, cbc_iv, 8);
BF_ofb64_encrypt(cbc_out, cbc_in, 17, &key, iv, &n);
BF_ofb64_encrypt(&(cbc_out[17]), &(cbc_in[17]), len - 17, &key, iv, &n);
- if (memcmp(cbc_in, cbc_data, (int)len) != 0) {
- printf("BF_ofb64_encrypt decrypt error\n");
- err = 1;
+ if (!TEST_mem_eq(cbc_in, (int)len, cbc_data, (int)len))
+ ret = 0;
+
+ return ret;
+}
+
+int test_main(int argc, char *argv[])
+{
+ int ret;
+# ifdef CHARSET_EBCDIC
+ int n;
+
+ ebcdic2ascii(cbc_data, cbc_data, strlen(cbc_data));
+ for (n = 0; n < 2; n++) {
+ ebcdic2ascii(bf_key[n], bf_key[n], strlen(bf_key[n]));
}
+# endif
+
+ ADD_ALL_TESTS(test_bf_ecb_raw, 2);
+ ADD_ALL_TESTS(test_bf_ecb, NUM_TESTS);
+ ADD_ALL_TESTS(test_bf_set_key, KEY_TEST_NUM-1);
+ ADD_TEST(test_bf_cbc);
+ ADD_TEST(test_bf_cfb64);
+ ADD_TEST(test_bf_ofb64);
+
+ if (argc > 1)
+ ret = print_test_data();
+ else
+ ret = run_tests(argv[0]);
- return (err);
+ return ret;
}
#endif
diff --git a/test/build.info b/test/build.info
index 9b816ef..2094672 100644
--- a/test/build.info
+++ b/test/build.info
@@ -131,7 +131,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[casttest]=../include
DEPEND[casttest]=../libcrypto
- SOURCE[bftest]=bftest.c
+ SOURCE[bftest]=bftest.c testutil.c test_main_custom.c
INCLUDE[bftest]=../include
DEPEND[bftest]=../libcrypto
More information about the openssl-commits
mailing list