[openssl] master update

[Matt Caswell]

The branch master has been updated
       via  6ef03ea98fac501e6d6e33bac6ad3c92ea074712 (commit)
      from  1ce6044206a371680ea44219ea63dae2a1bba3d1 (commit)


- Log -----------------------------------------------------------------
commit 6ef03ea98fac501e6d6e33bac6ad3c92ea074712
Author: ManishPatidar1 <mann.patidar at gmail.com>
Date:   Mon Sep 9 19:02:56 2019 +0530

    clearing the ecx private key memory
    
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/9830)

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

Summary of changes:
 crypto/ec/ecx_meth.c | 2 +-
 1 file changed, 1 insertion(+), 1 deletion(-)

diff --git a/crypto/ec/ecx_meth.c b/crypto/ec/ecx_meth.c
index 75ea96754f..b88139218a 100644
--- a/crypto/ec/ecx_meth.c
+++ b/crypto/ec/ecx_meth.c
@@ -195,7 +195,7 @@ static int ecx_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)
     }
 
     rv = ecx_key_op(pkey, pkey->ameth->pkey_id, palg, p, plen, KEY_OP_PRIVATE);
-    ASN1_OCTET_STRING_free(oct);
+    ASN1_STRING_clear_free(oct);
     return rv;
 }