[openssl] master update

[Dr. Paul Dale]

The branch master has been updated
       via  f4585aeca99d43ed4cfd7053f8d74a4d816c95e4 (commit)
      from  2395ad8079bdc76790a004f9aaeb53ef0b1c8df8 (commit)


- Log -----------------------------------------------------------------
commit f4585aeca99d43ed4cfd7053f8d74a4d816c95e4
Author: Pauli <pauli at openssl.org>
Date:   Wed Apr 28 10:38:08 2021 +1000

    runchecker: fix no-sock build by conditioning clean up on the NO_SOCK symbol.
    
    Fixes #15054
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/15055)

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

Summary of changes:
 apps/cmp.c | 2 ++
 1 file changed, 2 insertions(+)

diff --git a/apps/cmp.c b/apps/cmp.c
index 494b27d294..51dd971162 100644
--- a/apps/cmp.c
+++ b/apps/cmp.c
@@ -2855,7 +2855,9 @@ int cmp_main(int argc, char **argv)
         OSSL_CMP_CTX_print_errors(cmp_ctx);
 
     ossl_cmp_mock_srv_free(OSSL_CMP_CTX_get_transfer_cb_arg(cmp_ctx));
+#ifndef OPENSSL_NO_SOCK
     APP_HTTP_TLS_INFO_free(OSSL_CMP_CTX_get_http_cb_arg(cmp_ctx));
+#endif
     X509_STORE_free(OSSL_CMP_CTX_get_certConf_cb_arg(cmp_ctx));
     OSSL_CMP_CTX_free(cmp_ctx);
     X509_VERIFY_PARAM_free(vpm);