Commit 5d8f1b13 authored by Bernd Edlinger's avatar Bernd Edlinger
Browse files

Use OPENSSL_secure_clear_free for secure mem BIOs and X25519 private keys 



Reviewed-by: default avatarRich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4044)
parent 4dae7cd3

crypto/buffer/buffer.c

+2 −2
Original line number Diff line number Diff line
@@ -47,7 +47,7 @@ void BUF_MEM_free(BUF_MEM *a) 


    if (a->data != NULL) {

        if (a->flags & BUF_MEM_FLAG_SECURE)

            OPENSSL_secure_free(a->data);

            OPENSSL_secure_clear_free(a->data, a->max);

        else

            OPENSSL_clear_free(a->data, a->max);

    }
@@ -64,7 +64,7 @@ static char *sec_alloc_realloc(BUF_MEM *str, size_t len) 
    if (str->data != NULL) {

        if (ret != NULL) {

            memcpy(ret, str->data, str->length);

            OPENSSL_secure_free(str->data);

            OPENSSL_secure_clear_free(str->data, str->length);

            str->data = NULL;

        }

    }

crypto/ec/ecx_meth.c

+1 −1
Original line number Diff line number Diff line
@@ -220,7 +220,7 @@ static void ecx_free(EVP_PKEY *pkey) 
    X25519_KEY *xkey = pkey->pkey.ptr;



    if (xkey)

        OPENSSL_secure_free(xkey->privkey);

        OPENSSL_secure_clear_free(xkey->privkey, X25519_KEYLEN);

    OPENSSL_free(xkey);

}