diff options
| author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2019-12-13 20:07:08 +0100 |
|---|---|---|
| committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2020-02-17 07:43:58 +0100 |
| commit | 235595c402bd7815f07f1f3f3babe9fcc247a206 (patch) | |
| tree | b4fd2cf01de36a6988d1eceadf8f51e6238b5a1c /test/cmp_protect_test.c | |
| parent | ebf3006917e0e968af4a5d5c2c6379c5b866f801 (diff) | |
| download | openssl-new-235595c402bd7815f07f1f3f3babe9fcc247a206.tar.gz | |
fix various formatting nits in CMP contribution chunks 1-6 found by the new util/check-format.pl
in addition:
correct wording in doc, comments, and parameter names: self-signed -> self-issued where appropriate
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger@hotmail.de>
(Merged from https://github.com/openssl/openssl/pull/10620)
Diffstat (limited to 'test/cmp_protect_test.c')
| -rw-r--r-- | test/cmp_protect_test.c | 13 |
1 files changed, 7 insertions, 6 deletions
diff --git a/test/cmp_protect_test.c b/test/cmp_protect_test.c index 8425849835..022dea6b7c 100644 --- a/test/cmp_protect_test.c +++ b/test/cmp_protect_test.c @@ -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; @@ -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; } |