[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  4c0d49ed414fbf19bd06198376c05a303bdbcaac (commit)
       via  a676c53c7f456c5f3c61798ad99f7c30448e1c17 (commit)
      from  61b0fead5e6079ca826594df5b9ca00e65883cb0 (commit)


- Log -----------------------------------------------------------------
commit 4c0d49ed414fbf19bd06198376c05a303bdbcaac
Author: Ankita Shetty <ankita.s.shetty65 at gmail.com>
Date:   Tue Nov 24 19:55:27 2020 +0100

    cmp_client.c: Fix indentation and remove empty line
    
    Reviewed-by: David von Oheimb <david.von.oheimb at siemens.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13488)

commit a676c53c7f456c5f3c61798ad99f7c30448e1c17
Author: Ankita Shetty <ankita.s.shetty65 at gmail.com>
Date:   Mon Nov 23 17:12:33 2020 +0100

    cmp_client.c: Remove dead code of variable 'txt' in cert_response()
    
    Reviewed-by: David von Oheimb <david.von.oheimb at siemens.com>
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13488)

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

Summary of changes:
 crypto/cmp/cmp_client.c | 14 ++++----------
 1 file changed, 4 insertions(+), 10 deletions(-)

diff --git a/crypto/cmp/cmp_client.c b/crypto/cmp/cmp_client.c
index 75176cd195..9b01b772e3 100644
--- a/crypto/cmp/cmp_client.c
+++ b/crypto/cmp/cmp_client.c
@@ -86,7 +86,6 @@ static int unprotected_exception(const OSSL_CMP_CTX *ctx,
     return 1;
 }
 
-
 /* Save error info from PKIStatusInfo field of a certresponse into ctx */
 static int save_statusInfo(OSSL_CMP_CTX *ctx, OSSL_CMP_PKISI *si)
 {
@@ -199,7 +198,7 @@ static int send_receive_check(OSSL_CMP_CTX *ctx, const OSSL_CMP_MSG *req,
 
     /* received message type is not one of the expected ones (e.g., error) */
     ERR_raise(ERR_LIB_CMP, bt == OSSL_CMP_PKIBODY_ERROR ? CMP_R_RECEIVED_ERROR :
-           CMP_R_UNEXPECTED_PKIBODY); /* in next line for mkerr.pl */
+              CMP_R_UNEXPECTED_PKIBODY); /* in next line for mkerr.pl */
 
     if (bt != OSSL_CMP_PKIBODY_ERROR) {
         ERR_add_error_data(3, "message type is '",
@@ -633,14 +632,9 @@ static int cert_response(OSSL_CMP_CTX *ctx, int sleep, int rid,
 
     /* not throwing failure earlier as transfer_cb may call ERR_clear_error() */
     if (fail_info != 0) {
-        if (txt == NULL)
-            ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED,
-                           "rejecting newly enrolled cert with subject: %s",
-                           subj);
-        else
-            ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED,
-                           "rejecting newly enrolled cert with subject: %s; %s",
-                           subj, txt);
+        ERR_raise_data(ERR_LIB_CMP, CMP_R_CERTIFICATE_NOT_ACCEPTED,
+                       "rejecting newly enrolled cert with subject: %s; %s",
+                       subj, txt);
         ret = 0;
     }
     OPENSSL_free(subj);