[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  4c52ee1dbfa1913a14968f395cc9900ed9beee5e (commit)
       via  b6a06b13a4ea97cdc831926339a23ca48970b19d (commit)
      from  3e6a0d57389d7e5e45b06753692873e40dd125e9 (commit)


- Log -----------------------------------------------------------------
commit 4c52ee1dbfa1913a14968f395cc9900ed9beee5e
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Mon Mar 8 08:04:54 2021 +0100

    cmp_hdr.c: Fix minor Coverity issue CID 1473605
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14460)

commit b6a06b13a4ea97cdc831926339a23ca48970b19d
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Mon Mar 8 07:58:04 2021 +0100

    http_test.c: Fix minor Coverity issue CID 1473608
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/14460)

-----------------------------------------------------------------------

Summary of changes:
 crypto/cmp/cmp_hdr.c | 3 ---
 test/http_test.c     | 3 ++-
 2 files changed, 2 insertions(+), 4 deletions(-)

diff --git a/crypto/cmp/cmp_hdr.c b/crypto/cmp/cmp_hdr.c
index 58b07dd8b2..a1770c1204 100644
--- a/crypto/cmp/cmp_hdr.c
+++ b/crypto/cmp/cmp_hdr.c
@@ -283,9 +283,6 @@ int ossl_cmp_hdr_set_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_PKIHEADER *hdr)
         OPENSSL_free(tid);
     }
 
-    if (ctx->transactionID == NULL
-        && !set_random(&ctx->transactionID, ctx, OSSL_CMP_TRANSACTIONID_LENGTH))
-        return 0;
     return ossl_cmp_asn1_octet_string_set1(&hdr->transactionID,
                                            ctx->transactionID);
 }
diff --git a/test/http_test.c b/test/http_test.c
index ef0a1d4bf0..e59ef63833 100644
--- a/test/http_test.c
+++ b/test/http_test.c
@@ -142,7 +142,8 @@ static int test_http_url_ok(const char *url, int exp_ssl, const char *exp_host,
     int exp_num, num, ssl;
     int res;
 
-    TEST_int_eq(sscanf(exp_port, "%d", &exp_num), 1);
+    if (!TEST_int_eq(sscanf(exp_port, "%d", &exp_num), 1))
+        return 0;
     res = TEST_true(OSSL_HTTP_parse_url(url, &ssl, &user, &host, &port, &num,
                                         &path, &query, &frag))
         && TEST_str_eq(host, exp_host)