[openssl] master update

[dev at ddvo.net]

The branch master has been updated
       via  7d80985e178d77226392f9c35c36f3f885b884d7 (commit)
      from  746f3674896845460946ace7e963e52b547fbf35 (commit)


- Log -----------------------------------------------------------------
commit 7d80985e178d77226392f9c35c36f3f885b884d7
Author: Dr. David von Oheimb <David.von.Oheimb at siemens.com>
Date:   Mon Sep 28 10:31:46 2020 +0200

    Fix memory leak in req_cb() of x_req.c - handle distinguishing_id also with NO_SM2
    
    Was detected via test_req_distinguishing_id() with config having no-ec but not no-sm2
    
    Reviewed-by: Tomas Mraz <tmraz at fedoraproject.org>
    (Merged from https://github.com/openssl/openssl/pull/13021)

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

Summary of changes:
 crypto/x509/x_req.c | 2 --
 1 file changed, 2 deletions(-)

diff --git a/crypto/x509/x_req.c b/crypto/x509/x_req.c
index 21215b4778..e821ffdb78 100644
--- a/crypto/x509/x_req.c
+++ b/crypto/x509/x_req.c
@@ -48,7 +48,6 @@ static int rinf_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
 static int req_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
                   void *exarg)
 {
-#ifndef OPENSSL_NO_SM2
     X509_REQ *ret = (X509_REQ *)*pval;
 
     switch (operation) {
@@ -63,7 +62,6 @@ static int req_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it,
         ASN1_OCTET_STRING_free(ret->distinguishing_id);
         break;
     }
-#endif
 
     return 1;
 }