commit 4b45c6e52b208deff7da333d1c7f84bcd3986609
author Rich Salz <rsalz@openssl.org> Thu Apr 30 17:57:32 2015 -0400
committer Rich Salz <rsalz@openssl.org> Thu Apr 30 17:57:32 2015 -0400
tree db26f7a51ad582f203dce2145a43c3e0d4376f69
parent 68dc682499ea3fe27d909c946d7abd39062d6efd

free cleanup almost the finale

Add OPENSSL_clear_free which merges cleanse and free.
(Names was picked to be similar to BN_clear_free, etc.)
Removed OPENSSL_freeFunc macro.
Fixed the small simple ones that are left:
        CRYPTO_free CRYPTO_free_locked OPENSSL_free_locked

Reviewed-by: Richard Levitte <levitte@openssl.org>

apps/s_server.c

diff --git a/apps/s_server.c b/apps/s_server.c
index 21d2d37..ef32d5a 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -2395,10 +2395,7 @@
         SSL_free(con);
     }
     BIO_printf(bio_s_out, "CONNECTION CLOSED\n");
-    if (buf != NULL) {
-        OPENSSL_cleanse(buf, bufsize);
-        OPENSSL_free(buf);
-    }
+    OPENSSL_clear_free(buf, bufsize);
     if (ret >= 0)
         BIO_printf(bio_s_out, "ACCEPT\n");
     (void)BIO_flush(bio_s_out);