Make sure OPENSSL_cleanse checks for NULL
authorMatt Caswell <matt@openssl.org>
Wed, 16 Sep 2015 09:47:15 +0000 (10:47 +0100)
committerMatt Caswell <matt@openssl.org>
Thu, 17 Sep 2015 21:37:21 +0000 (22:37 +0100)
commit5e7d583bab249dbc4ae484768e05aa11ea14f5bc
tree92bd8503ab7b60d5b61bd22330fa954f9239e530
parent27bc0555aa4f5f95a54bef79ecc20b0655bb6451
Make sure OPENSSL_cleanse checks for NULL

In master we have the function OPENSSL_clear_free(x,y), which immediately
returns if x == NULL. In <=1.0.2 this function does not exist so we have to
do:
OPENSSL_cleanse(x, y);
OPENSSL_free(x);

However, previously, OPENSSL_cleanse did not check that if x == NULL, so
the real equivalent check would have to be:
if (x != NULL)
    OPENSSL_cleanse(x, y);
OPENSSL_free(x);

It would be easy to get this wrong during cherry-picking to other branches
and therefore, for safety, it is best to just ensure OPENSSL_cleanse also
checks for NULL.

Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit 020d8fc83fe1a94232db1ee1166309e2458a8a18)
crypto/mem_clr.c