mirror of
https://github.com/openssl/openssl.git
synced 2024-12-27 06:21:43 +08:00
c720fc35f4
The function is documented as returning 1 when passed a NULL argument. Instead it core dumps. Added a unit test for this. Additionally, a performance improvement is incorporated. The namemap max_number field is only ever compared against zero and incremented. The zero comparison grabs a lock specifically for this check. This change uses TSAN operations instead if they are available. Reviewed-by: Richard Levitte <levitte@openssl.org> (Merged from https://github.com/openssl/openssl/pull/12181)
184 lines
4.8 KiB
C
184 lines
4.8 KiB
C
/*
|
|
* Copyright 2019-2020 The OpenSSL Project Authors. All Rights Reserved.
|
|
*
|
|
* 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
|
|
*/
|
|
|
|
#include <openssl/evp.h>
|
|
#include "internal/namemap.h"
|
|
#include "testutil.h"
|
|
|
|
#define NAME1 "name1"
|
|
#define NAME2 "name2"
|
|
#define ALIAS1 "alias1"
|
|
#define ALIAS1_UC "ALIAS1"
|
|
|
|
static int test_namemap_empty(void)
|
|
{
|
|
OSSL_NAMEMAP *nm = NULL;
|
|
int ok;
|
|
|
|
ok = TEST_true(ossl_namemap_empty(NULL))
|
|
&& TEST_ptr(nm = ossl_namemap_new())
|
|
&& TEST_true(ossl_namemap_empty(nm))
|
|
&& TEST_int_ne(ossl_namemap_add_name(nm, 0, NAME1), 0)
|
|
&& TEST_false(ossl_namemap_empty(nm));
|
|
ossl_namemap_free(nm);
|
|
return ok;
|
|
}
|
|
|
|
static int test_namemap(OSSL_NAMEMAP *nm)
|
|
{
|
|
int num1 = ossl_namemap_add_name(nm, 0, NAME1);
|
|
int num2 = ossl_namemap_add_name(nm, 0, NAME2);
|
|
int num3 = ossl_namemap_add_name(nm, num1, ALIAS1);
|
|
int num4 = ossl_namemap_add_name(nm, 0, ALIAS1_UC);
|
|
int check1 = ossl_namemap_name2num(nm, NAME1);
|
|
int check2 = ossl_namemap_name2num(nm, NAME2);
|
|
int check3 = ossl_namemap_name2num(nm, ALIAS1);
|
|
int check4 = ossl_namemap_name2num(nm, ALIAS1_UC);
|
|
int false1 = ossl_namemap_name2num(nm, "cookie");
|
|
|
|
return TEST_int_ne(num1, 0)
|
|
&& TEST_int_ne(num2, 0)
|
|
&& TEST_int_eq(num1, num3)
|
|
&& TEST_int_eq(num3, num4)
|
|
&& TEST_int_eq(num1, check1)
|
|
&& TEST_int_eq(num2, check2)
|
|
&& TEST_int_eq(num3, check3)
|
|
&& TEST_int_eq(num4, check4)
|
|
&& TEST_int_eq(false1, 0);
|
|
}
|
|
|
|
static int test_namemap_independent(void)
|
|
{
|
|
OSSL_NAMEMAP *nm = ossl_namemap_new();
|
|
int ok = TEST_ptr(nm) && test_namemap(nm);
|
|
|
|
ossl_namemap_free(nm);
|
|
return ok;
|
|
}
|
|
|
|
static int test_namemap_stored(void)
|
|
{
|
|
OSSL_NAMEMAP *nm = ossl_namemap_stored(NULL);
|
|
|
|
return TEST_ptr(nm)
|
|
&& test_namemap(nm);
|
|
}
|
|
|
|
/*
|
|
* Test that EVP_get_digestbyname() will use the namemap when it can't find
|
|
* entries in the legacy method database.
|
|
*/
|
|
static int test_digestbyname(void)
|
|
{
|
|
int id;
|
|
OSSL_NAMEMAP *nm = ossl_namemap_stored(NULL);
|
|
const EVP_MD *sha256, *foo;
|
|
|
|
if (!TEST_ptr(nm))
|
|
return 0;
|
|
id = ossl_namemap_add_name(nm, 0, "SHA256");
|
|
if (!TEST_int_ne(id, 0))
|
|
return 0;
|
|
if (!TEST_int_eq(ossl_namemap_add_name(nm, id, "foo"), id))
|
|
return 0;
|
|
|
|
sha256 = EVP_get_digestbyname("SHA256");
|
|
if (!TEST_ptr(sha256))
|
|
return 0;
|
|
foo = EVP_get_digestbyname("foo");
|
|
if (!TEST_ptr_eq(sha256, foo))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Test that EVP_get_cipherbyname() will use the namemap when it can't find
|
|
* entries in the legacy method database.
|
|
*/
|
|
static int test_cipherbyname(void)
|
|
{
|
|
int id;
|
|
OSSL_NAMEMAP *nm = ossl_namemap_stored(NULL);
|
|
const EVP_CIPHER *aes128, *bar;
|
|
|
|
if (!TEST_ptr(nm))
|
|
return 0;
|
|
id = ossl_namemap_add_name(nm, 0, "AES-128-CBC");
|
|
if (!TEST_int_ne(id, 0))
|
|
return 0;
|
|
if (!TEST_int_eq(ossl_namemap_add_name(nm, id, "bar"), id))
|
|
return 0;
|
|
|
|
aes128 = EVP_get_cipherbyname("AES-128-CBC");
|
|
if (!TEST_ptr(aes128))
|
|
return 0;
|
|
bar = EVP_get_cipherbyname("bar");
|
|
if (!TEST_ptr_eq(aes128, bar))
|
|
return 0;
|
|
|
|
return 1;
|
|
}
|
|
|
|
/*
|
|
* Test that EVP_CIPHER_is_a() responds appropriately, even for ciphers that
|
|
* are entirely legacy.
|
|
*/
|
|
static int test_cipher_is_a(void)
|
|
{
|
|
EVP_CIPHER *fetched = EVP_CIPHER_fetch(NULL, "AES-256-CCM", NULL);
|
|
int rv = 1;
|
|
|
|
if (!TEST_ptr(fetched))
|
|
return 0;
|
|
if (!TEST_true(EVP_CIPHER_is_a(fetched, "id-aes256-CCM"))
|
|
|| !TEST_false(EVP_CIPHER_is_a(fetched, "AES-128-GCM")))
|
|
rv = 0;
|
|
if (!TEST_true(EVP_CIPHER_is_a(EVP_aes_256_gcm(), "AES-256-GCM"))
|
|
|| !TEST_false(EVP_CIPHER_is_a(EVP_aes_256_gcm(), "AES-128-CCM")))
|
|
rv = 0;
|
|
|
|
EVP_CIPHER_free(fetched);
|
|
return rv;
|
|
}
|
|
|
|
/*
|
|
* Test that EVP_MD_is_a() responds appropriately, even for MDs that are
|
|
* entirely legacy.
|
|
*/
|
|
static int test_digest_is_a(void)
|
|
{
|
|
EVP_MD *fetched = EVP_MD_fetch(NULL, "SHA2-512", NULL);
|
|
int rv = 1;
|
|
|
|
if (!TEST_ptr(fetched))
|
|
return 0;
|
|
if (!TEST_true(EVP_MD_is_a(fetched, "SHA512"))
|
|
|| !TEST_false(EVP_MD_is_a(fetched, "SHA1")))
|
|
rv = 0;
|
|
if (!TEST_true(EVP_MD_is_a(EVP_sha256(), "SHA2-256"))
|
|
|| !TEST_false(EVP_MD_is_a(EVP_sha256(), "SHA3-256")))
|
|
rv = 0;
|
|
|
|
EVP_MD_free(fetched);
|
|
return rv;
|
|
}
|
|
|
|
int setup_tests(void)
|
|
{
|
|
ADD_TEST(test_namemap_empty);
|
|
ADD_TEST(test_namemap_independent);
|
|
ADD_TEST(test_namemap_stored);
|
|
ADD_TEST(test_digestbyname);
|
|
ADD_TEST(test_cipherbyname);
|
|
ADD_TEST(test_digest_is_a);
|
|
ADD_TEST(test_cipher_is_a);
|
|
return 1;
|
|
}
|