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_hdr_test.c | |
parent | ebf3006917e0e968af4a5d5c2c6379c5b866f801 (diff) |
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_hdr_test.c')
-rw-r--r-- | test/cmp_hdr_test.c | 116 |
1 files changed, 60 insertions, 56 deletions
diff --git a/test/cmp_hdr_test.c b/test/cmp_hdr_test.c index a9b2aff79c..c12b72f29e 100644 --- a/test/cmp_hdr_test.c +++ b/test/cmp_hdr_test.c @@ -65,8 +65,9 @@ static int test_HDR_set_get_pvno(void) return result; } -#define X509_NAME_ADD(n, rd, s) X509_NAME_add_entry_by_txt((n), (rd), \ - MBSTRING_ASC, (unsigned char *)(s), -1, -1, 0) +#define X509_NAME_ADD(n, rd, s) \ + X509_NAME_add_entry_by_txt((n), (rd), MBSTRING_ASC, (unsigned char *)(s), \ + -1, -1, 0) static int execute_HDR_get0_senderNonce_test(CMP_HDR_TEST_FIXTURE *fixture) { @@ -112,8 +113,8 @@ static int execute_HDR_set1_sender_test(CMP_HDR_TEST_FIXTURE *fixture) if (!TEST_int_eq(fixture->hdr->sender->type, GEN_DIRNAME)) return 0; - if (!TEST_int_eq( - X509_NAME_cmp(fixture->hdr->sender->d.directoryName, x509name), 0)) + if (!TEST_int_eq(X509_NAME_cmp(fixture->hdr->sender->d.directoryName, + x509name), 0)) return 0; X509_NAME_free(x509name); @@ -142,8 +143,8 @@ static int execute_HDR_set1_recipient_test(CMP_HDR_TEST_FIXTURE *fixture) if (!TEST_int_eq(fixture->hdr->recipient->type, GEN_DIRNAME)) return 0; - if (!TEST_int_eq( - X509_NAME_cmp(fixture->hdr->recipient->d.directoryName, x509name),0)) + if (!TEST_int_eq(X509_NAME_cmp(fixture->hdr->recipient->d.directoryName, + x509name), 0)) return 0; X509_NAME_free(x509name); @@ -188,7 +189,7 @@ static int test_HDR_update_messageTime(void) static int execute_HDR_set1_senderKID_test(CMP_HDR_TEST_FIXTURE *fixture) { - ASN1_OCTET_STRING* senderKID = ASN1_OCTET_STRING_new(); + ASN1_OCTET_STRING *senderKID = ASN1_OCTET_STRING_new(); if (!TEST_ptr(senderKID)) return 0; @@ -198,8 +199,8 @@ static int execute_HDR_set1_senderKID_test(CMP_HDR_TEST_FIXTURE *fixture) return 0; if (!TEST_int_eq(ossl_cmp_hdr_set1_senderKID(fixture->hdr, senderKID), 1)) return 0; - if (!TEST_int_eq( - ASN1_OCTET_STRING_cmp(fixture->hdr->senderKID, senderKID), 0)) + if (!TEST_int_eq(ASN1_OCTET_STRING_cmp(fixture->hdr->senderKID, + senderKID), 0)) return 0; ASN1_OCTET_STRING_free(senderKID); @@ -216,7 +217,7 @@ static int test_HDR_set1_senderKID(void) static int execute_HDR_push0_freeText_test(CMP_HDR_TEST_FIXTURE *fixture) { - ASN1_UTF8STRING* text = ASN1_UTF8STRING_new(); + ASN1_UTF8STRING *text = ASN1_UTF8STRING_new(); if (!TEST_ptr(text)) return 0; @@ -224,11 +225,10 @@ static int execute_HDR_push0_freeText_test(CMP_HDR_TEST_FIXTURE *fixture) if (!ASN1_STRING_set(text, "A free text", -1)) return 0; - if (!TEST_int_eq( - ossl_cmp_hdr_push0_freeText(fixture->hdr, text), 1)) + if (!TEST_int_eq(ossl_cmp_hdr_push0_freeText(fixture->hdr, text), 1)) return 0; - if (!TEST_true(text == sk_ASN1_UTF8STRING_value( - fixture->hdr->freeText, 0))) + + if (!TEST_true(text == sk_ASN1_UTF8STRING_value(fixture->hdr->freeText, 0))) return 0; return 1; @@ -244,7 +244,8 @@ static int test_HDR_push0_freeText(void) static int execute_HDR_push1_freeText_test(CMP_HDR_TEST_FIXTURE *fixture) { - ASN1_UTF8STRING* text = ASN1_UTF8STRING_new(); + ASN1_UTF8STRING *text = ASN1_UTF8STRING_new(); + ASN1_UTF8STRING *pushed_text; if (!TEST_ptr(text)) return 0; @@ -252,11 +253,11 @@ static int execute_HDR_push1_freeText_test(CMP_HDR_TEST_FIXTURE *fixture) if (!ASN1_STRING_set(text, "A free text", -1)) return 0; - if (!TEST_int_eq( - ossl_cmp_hdr_push1_freeText(fixture->hdr, text), 1)) + if (!TEST_int_eq(ossl_cmp_hdr_push1_freeText(fixture->hdr, text), 1)) return 0; - if (!TEST_int_eq(ASN1_STRING_cmp( - sk_ASN1_UTF8STRING_value(fixture->hdr->freeText, 0), text), 0)) + + pushed_text = sk_ASN1_UTF8STRING_value(fixture->hdr->freeText, 0); + if (!TEST_int_eq(ASN1_STRING_cmp(text, pushed_text), 0)) return 0; ASN1_UTF8STRING_free(text); @@ -279,11 +280,12 @@ execute_HDR_generalInfo_push0_item_test(CMP_HDR_TEST_FIXTURE *fixture) if (!TEST_ptr(itav)) return 0; - if (!TEST_int_eq( - ossl_cmp_hdr_generalInfo_push0_item(fixture->hdr, itav), 1)) + if (!TEST_int_eq(ossl_cmp_hdr_generalInfo_push0_item(fixture->hdr, itav), + 1)) return 0; - if (!TEST_true(itav == sk_OSSL_CMP_ITAV_value( - fixture->hdr->generalInfo, 0))) + + if (!TEST_true(itav == sk_OSSL_CMP_ITAV_value(fixture->hdr->generalInfo, + 0))) return 0; return 1; @@ -302,10 +304,11 @@ execute_HDR_generalInfo_push1_items_test(CMP_HDR_TEST_FIXTURE *fixture) { const char oid[] = "1.2.3.4"; char buf[20]; - OSSL_CMP_ITAV *itav; - STACK_OF(OSSL_CMP_ITAV) *itavs = NULL; + OSSL_CMP_ITAV *itav, *pushed_itav; + STACK_OF(OSSL_CMP_ITAV) *itavs = NULL, *ginfo; ASN1_INTEGER *asn1int = ASN1_INTEGER_new(); ASN1_TYPE *val = ASN1_TYPE_new(); + ASN1_TYPE *pushed_val; if (!TEST_ptr(asn1int)) return 0; @@ -318,17 +321,17 @@ execute_HDR_generalInfo_push1_items_test(CMP_HDR_TEST_FIXTURE *fixture) itav = OSSL_CMP_ITAV_create(OBJ_txt2obj(oid, 1), val); OSSL_CMP_ITAV_push0_stack_item(&itavs, itav); - if (!TEST_int_eq( - ossl_cmp_hdr_generalInfo_push1_items(fixture->hdr, itavs), 1)) + if (!TEST_int_eq(ossl_cmp_hdr_generalInfo_push1_items(fixture->hdr, itavs), + 1)) return 0; - OBJ_obj2txt(buf, sizeof(buf), OSSL_CMP_ITAV_get0_type( - sk_OSSL_CMP_ITAV_value(fixture->hdr->generalInfo, 0)), 0); + ginfo = fixture->hdr->generalInfo; + pushed_itav = sk_OSSL_CMP_ITAV_value(ginfo, 0); + OBJ_obj2txt(buf, sizeof(buf), OSSL_CMP_ITAV_get0_type(pushed_itav), 0); if (!TEST_int_eq(memcmp(oid, buf, sizeof(oid)), 0)) return 0; - if (!TEST_int_eq(ASN1_TYPE_cmp(itav->infoValue.other, - OSSL_CMP_ITAV_get0_value( - sk_OSSL_CMP_ITAV_value(fixture->hdr->generalInfo, 0))), 0)) + pushed_val = OSSL_CMP_ITAV_get0_value(sk_OSSL_CMP_ITAV_value(ginfo, 0)); + if (!TEST_int_eq(ASN1_TYPE_cmp(itav->infoValue.other, pushed_val), 0)) return 0; sk_OSSL_CMP_ITAV_pop_free(itavs, OSSL_CMP_ITAV_free); @@ -362,35 +365,36 @@ static int test_HDR_set_and_check_implicit_confirm(void) static int execute_HDR_init_test(CMP_HDR_TEST_FIXTURE *fixture) { - ASN1_OCTET_STRING *header_nonce = NULL; - ASN1_OCTET_STRING *ctx_nonce = NULL; - int res = 0; + ASN1_OCTET_STRING *header_nonce, *header_transactionID; + ASN1_OCTET_STRING *ctx_nonce; if (!TEST_int_eq(fixture->expected, ossl_cmp_hdr_init(fixture->cmp_ctx, fixture->hdr))) - goto err; - if (fixture->expected != 0) { - if (!TEST_int_eq(ossl_cmp_hdr_get_pvno(fixture->hdr), OSSL_CMP_PVNO) - || !TEST_true(0 == ASN1_OCTET_STRING_cmp( - ossl_cmp_hdr_get0_senderNonce(fixture->hdr), - fixture->cmp_ctx->senderNonce)) - || !TEST_true(0 == ASN1_OCTET_STRING_cmp( - OSSL_CMP_HDR_get0_transactionID(fixture->hdr), - fixture->cmp_ctx->transactionID))) - goto err; - header_nonce = OSSL_CMP_HDR_get0_recipNonce(fixture->hdr); - ctx_nonce = fixture->cmp_ctx->recipNonce; - if (ctx_nonce != NULL - && (!TEST_ptr(header_nonce) - || !TEST_int_eq(0, ASN1_OCTET_STRING_cmp(header_nonce, - ctx_nonce)))) - goto err; - } + return 0; + if (fixture->expected == 0) + return 1; - res = 1; + if (!TEST_int_eq(ossl_cmp_hdr_get_pvno(fixture->hdr), OSSL_CMP_PVNO)) + return 0; - err: - return res; + header_nonce = ossl_cmp_hdr_get0_senderNonce(fixture->hdr); + if (!TEST_int_eq(0, ASN1_OCTET_STRING_cmp(header_nonce, + fixture->cmp_ctx->senderNonce))) + return 0; + header_transactionID = OSSL_CMP_HDR_get0_transactionID(fixture->hdr); + if (!TEST_true(0 == ASN1_OCTET_STRING_cmp(header_transactionID, + fixture->cmp_ctx->transactionID))) + return 0; + + header_nonce = OSSL_CMP_HDR_get0_recipNonce(fixture->hdr); + ctx_nonce = fixture->cmp_ctx->recipNonce; + if (ctx_nonce != NULL + && (!TEST_ptr(header_nonce) + || !TEST_int_eq(0, ASN1_OCTET_STRING_cmp(header_nonce, + ctx_nonce)))) + return 0; + + return 1; } static int test_HDR_init(void) |