Latest update.
This commit is contained in:
@@ -20,7 +20,7 @@ typedef struct test_fixture {
|
||||
OSSL_CMP_CTX *cmp_ctx;
|
||||
/* for protection tests */
|
||||
OSSL_CMP_MSG *msg;
|
||||
OSSL_CMP_PKISI *si; /* for error and response messages */
|
||||
OSSL_CMP_PKISI *si; /* for error and response messages */
|
||||
ASN1_OCTET_STRING *secret;
|
||||
EVP_PKEY *privkey;
|
||||
EVP_PKEY *pubkey;
|
||||
@@ -86,7 +86,8 @@ static int execute_calc_protection_pbmac_test(CMP_PROTECT_TEST_FIXTURE *fixture)
|
||||
ASN1_BIT_STRING *protection =
|
||||
ossl_cmp_calc_protection(fixture->msg, fixture->secret, NULL);
|
||||
int res = TEST_ptr(protection)
|
||||
&& TEST_true(ASN1_STRING_cmp(protection, fixture->msg->protection) == 0);
|
||||
&& TEST_true(ASN1_STRING_cmp(protection,
|
||||
fixture->msg->protection) == 0);
|
||||
|
||||
ASN1_BIT_STRING_free(protection);
|
||||
return res;
|
||||
@@ -386,7 +387,7 @@ static int execute_X509_STORE_test(CMP_PROTECT_TEST_FIXTURE *fixture)
|
||||
fixture->certs,
|
||||
fixture->callback_arg)))
|
||||
goto err;
|
||||
sk = ossl_cmp_X509_STORE_get1_certs(store);
|
||||
sk = X509_STORE_get1_all_certs(store);
|
||||
if (!TEST_int_eq(0, STACK_OF_X509_cmp(sk, fixture->chain)))
|
||||
goto err;
|
||||
res = 1;
|
||||
@@ -400,7 +401,7 @@ static int execute_X509_STORE_test(CMP_PROTECT_TEST_FIXTURE *fixture)
|
||||
static int test_X509_STORE(void)
|
||||
{
|
||||
SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
|
||||
fixture->callback_arg = 0; /* self-signed allowed */
|
||||
fixture->callback_arg = 0; /* self-issued allowed */
|
||||
if (!TEST_ptr(fixture->certs = sk_X509_new_null())
|
||||
|| !sk_X509_push(fixture->certs, endentity1)
|
||||
|| !sk_X509_push(fixture->certs, endentity2)
|
||||
@@ -414,12 +415,12 @@ static int test_X509_STORE(void)
|
||||
return result;
|
||||
}
|
||||
|
||||
static int test_X509_STORE_only_self_signed(void)
|
||||
static int test_X509_STORE_only_self_issued(void)
|
||||
{
|
||||
SETUP_TEST_FIXTURE(CMP_PROTECT_TEST_FIXTURE, set_up);
|
||||
fixture->certs = sk_X509_new_null();
|
||||
fixture->chain = sk_X509_new_null();
|
||||
fixture->callback_arg = 1; /* only self-signed */
|
||||
fixture->callback_arg = 1; /* only self-issued */
|
||||
if (!TEST_true(sk_X509_push(fixture->certs, endentity1))
|
||||
|| !TEST_true(sk_X509_push(fixture->certs, endentity2))
|
||||
|| !TEST_true(sk_X509_push(fixture->certs, root))
|
||||
@@ -521,7 +522,7 @@ int setup_tests(void)
|
||||
#endif
|
||||
|
||||
ADD_TEST(test_X509_STORE);
|
||||
ADD_TEST(test_X509_STORE_only_self_signed);
|
||||
ADD_TEST(test_X509_STORE_only_self_issued);
|
||||
|
||||
return 1;
|
||||
}
|
||||
Reference in New Issue
Block a user