[openssl-commits] [openssl] master update
Rich Salz
rsalz at openssl.org
Mon Apr 17 02:04:51 UTC 2017
The branch master has been updated
via 5c8e9d531ba54d26e4bcbe66710c7c75bf0fc4e9 (commit)
via 529243992bcfbb9ac9aade69451eb2c663739c04 (commit)
from 0c44545c0f5781b1d2401b0d3c93c0376399c8e5 (commit)
- Log -----------------------------------------------------------------
commit 5c8e9d531ba54d26e4bcbe66710c7c75bf0fc4e9
Author: Rich Salz <rsalz at openssl.org>
Date: Sun Apr 16 09:17:39 2017 -0400
[squash]Build works with/out NO_ENGINE and NO_AFALG
Reviewed-by: Andy Polyakov <appro at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3229)
commit 529243992bcfbb9ac9aade69451eb2c663739c04
Author: Rich Salz <rsalz at openssl.org>
Date: Fri Apr 14 20:32:20 2017 -0400
Convert afalgtest
Reviewed-by: Andy Polyakov <appro at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/3229)
-----------------------------------------------------------------------
Summary of changes:
test/afalgtest.c | 109 +++++++++++++++++++++++--------------------------------
test/build.info | 2 +-
2 files changed, 47 insertions(+), 64 deletions(-)
diff --git a/test/afalgtest.c b/test/afalgtest.c
index 7fc03ba..40ea025 100644
--- a/test/afalgtest.c
+++ b/test/afalgtest.c
@@ -10,6 +10,20 @@
#include <stdio.h>
#include <openssl/opensslconf.h>
+#include <string.h>
+#include <openssl/engine.h>
+#include <openssl/evp.h>
+#include <openssl/rand.h>
+#include "testutil.h"
+
+/* Use a buffer size which is not aligned to block size */
+#define BUFFER_SIZE (8 * 1024) - 13
+
+#ifndef OPENSSL_NO_ENGINE
+static ENGINE *e;
+#endif
+
+
#ifndef OPENSSL_NO_AFALGENG
# include <linux/version.h>
# define K_MAJ 4
@@ -27,15 +41,7 @@
#endif
#ifndef OPENSSL_NO_AFALGENG
-#include <string.h>
-#include <openssl/engine.h>
-#include <openssl/evp.h>
-#include <openssl/rand.h>
-
-/* Use a buffer size which is not aligned to block size */
-#define BUFFER_SIZE (8 * 1024) - 13
-
-static int test_afalg_aes_128_cbc(ENGINE *e)
+static int test_afalg_aes_128_cbc(void)
{
EVP_CIPHER_CTX *ctx;
const EVP_CIPHER *cipher = EVP_aes_128_cbc();
@@ -48,86 +54,63 @@ static int test_afalg_aes_128_cbc(ENGINE *e)
unsigned char ebuf[BUFFER_SIZE + 32];
unsigned char dbuf[BUFFER_SIZE + 32];
int encl, encf, decl, decf;
- unsigned int status = 0;
+ int ret = 0;
- ctx = EVP_CIPHER_CTX_new();
- if (ctx == NULL) {
- fprintf(stderr, "%s() failed to allocate ctx\n", __func__);
- return 0;
- }
+ if (!TEST_ptr(ctx = EVP_CIPHER_CTX_new()))
+ return 0;
RAND_bytes(in, BUFFER_SIZE);
- if ( !EVP_CipherInit_ex(ctx, cipher, e, key, iv, 1)
- || !EVP_CipherUpdate(ctx, ebuf, &encl, in, BUFFER_SIZE)
- || !EVP_CipherFinal_ex(ctx, ebuf+encl, &encf)) {
- fprintf(stderr, "%s() failed encryption\n", __func__);
+ if (!TEST_true(EVP_CipherInit_ex(ctx, cipher, e, key, iv, 1))
+ || !TEST_true(EVP_CipherUpdate(ctx, ebuf, &encl, in, BUFFER_SIZE))
+ || !TEST_true(EVP_CipherFinal_ex(ctx, ebuf+encl, &encf)))
goto end;
- }
encl += encf;
- if ( !EVP_CIPHER_CTX_reset(ctx)
- || !EVP_CipherInit_ex(ctx, cipher, e, key, iv, 0)
- || !EVP_CipherUpdate(ctx, dbuf, &decl, ebuf, encl)
- || !EVP_CipherFinal_ex(ctx, dbuf+decl, &decf)) {
- fprintf(stderr, "%s() failed decryption\n", __func__);
+ if (!TEST_true(EVP_CIPHER_CTX_reset(ctx))
+ || !TEST_true(EVP_CipherInit_ex(ctx, cipher, e, key, iv, 0))
+ || !TEST_true(EVP_CipherUpdate(ctx, dbuf, &decl, ebuf, encl))
+ || !TEST_true(EVP_CipherFinal_ex(ctx, dbuf+decl, &decf)))
goto end;
- }
decl += decf;
- if ( decl != BUFFER_SIZE
- || memcmp(dbuf, in, BUFFER_SIZE)) {
- fprintf(stderr, "%s() failed Dec(Enc(P)) != P\n", __func__);
+ if (!TEST_int_eq(decl, BUFFER_SIZE)
+ || !TEST_mem_eq(dbuf, BUFFER_SIZE, in, BUFFER_SIZE))
goto end;
- }
- status = 1;
+ ret = 1;
end:
EVP_CIPHER_CTX_free(ctx);
- return status;
+ return ret;
}
+#endif
int main(int argc, char **argv)
{
- ENGINE *e;
-
- CRYPTO_set_mem_debug(1);
- CRYPTO_mem_ctrl(CRYPTO_MEM_CHECK_ON);
+ int ret = 0;
+#ifdef OPENSSL_NO_ENGINE
+ setup_test();
+ ret = run_tests(argv[0]);
+#else
ENGINE_load_builtin_engines();
-
# ifndef OPENSSL_NO_STATIC_ENGINE
OPENSSL_init_crypto(OPENSSL_INIT_ENGINE_AFALG, NULL);
# endif
- e = ENGINE_by_id("afalg");
- if (e == NULL) {
- /*
- * A failure to load is probably a platform environment problem so we
- * don't treat this as an OpenSSL test failure, i.e. we return 0
- */
- fprintf(stderr,
- "AFALG Test: Failed to load AFALG Engine - skipping test\n");
- return 0;
- }
+ setup_test();
- if (test_afalg_aes_128_cbc(e) == 0) {
- ENGINE_free(e);
- return 1;
+ if ((e = ENGINE_by_id("afalg")) == NULL) {
+ /* Probably a platform env issue, not a test failure. */
+ TEST_info("Can't load AFALG engine");
+ } else {
+# ifndef OPENSSL_NO_AFALGENG
+ ADD_TEST(test_afalg_aes_128_cbc);
+# endif
}
-
+ ret = run_tests(argv[0]);
ENGINE_free(e);
- printf("PASS\n");
- return 0;
-}
-
-#else /* OPENSSL_NO_AFALGENG */
+#endif
-int main(int argc, char **argv)
-{
- fprintf(stderr, "AFALG not supported - skipping AFALG tests\n");
- printf("PASS\n");
- return 0;
+ return finish_test(ret);
}
-
-#endif
diff --git a/test/build.info b/test/build.info
index 2d290df..537b361 100644
--- a/test/build.info
+++ b/test/build.info
@@ -231,7 +231,7 @@ IF[{- !$disabled{tests} -}]
INCLUDE[threadstest]=.. ../include
DEPEND[threadstest]=../libcrypto
- SOURCE[afalgtest]=afalgtest.c
+ SOURCE[afalgtest]=afalgtest.c testutil.c
INCLUDE[afalgtest]=.. ../include
DEPEND[afalgtest]=../libcrypto
More information about the openssl-commits
mailing list