1 files changed, 9 insertions, 17 deletions

diff --git a/src/lib/libcrypto/rsa/rsa_eay.c b/src/lib/libcrypto/rsa/rsa_eay.c
index 90a3be8dd3..128269a81a 100644
--- a/src/lib/libcrypto/rsa/rsa_eay.c
+++ b/src/lib/libcrypto/rsa/rsa_eay.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: rsa_eay.c,v 1.46 2017/01/29 17:49:23 beck Exp $ */
+/* $OpenBSD: rsa_eay.c,v 1.47 2017/04/28 22:38:51 beck Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -244,10 +244,8 @@ err:
                 BN_CTX_end(ctx);
                 BN_CTX_free(ctx);
         }
-        if (buf != NULL) {
-                explicit_bzero(buf, num);
-                free(buf);
-        }
+        freezero(buf, num);
+
         return r;
 }
 
@@ -468,10 +466,8 @@ err:
                 BN_CTX_end(ctx);
                 BN_CTX_free(ctx);
         }
-        if (buf != NULL) {
-                explicit_bzero(buf, num);
-                free(buf);
-        }
+        freezero(buf, num);
+
         return r;
 }
 
@@ -597,10 +593,8 @@ err:
                 BN_CTX_end(ctx);
                 BN_CTX_free(ctx);
         }
-        if (buf != NULL) {
-                explicit_bzero(buf, num);
-                free(buf);
-        }
+        freezero(buf, num);
+
         return r;
 }
 
@@ -700,10 +694,8 @@ err:
                 BN_CTX_end(ctx);
                 BN_CTX_free(ctx);
         }
-        if (buf != NULL) {
-                explicit_bzero(buf, num);
-                free(buf);
-        }
+        freezero(buf, num);
+
         return r;
 }