Correct spelling of OPENSSL_cleanse.

ok miod@

4 files changed, 11 insertions, 9 deletions

diff --git a/src/lib/libcrypto/gost/gost2814789.c b/src/lib/libcrypto/gost/gost2814789.c
index b1bef9eae3..e285413ed4 100644
--- a/src/lib/libcrypto/gost/gost2814789.c
+++ b/src/lib/libcrypto/gost/gost2814789.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gost2814789.c,v 1.4 2015/02/10 09:46:30 miod Exp $ */
+/* $OpenBSD: gost2814789.c,v 1.5 2015/09/10 15:56:25 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -464,7 +464,7 @@ GOST2814789IMIT(const unsigned char *d, size_t n, unsigned char *md, int nid,
         Gost2814789_set_key(&c.cipher, key, 256);
         GOST2814789IMIT_Update(&c, d, n);
         GOST2814789IMIT_Final(md, &c);
-        OPENSSL_cleanse(&c, sizeof(c));
+        explicit_bzero(&c, sizeof(c));
         return (md);
 }
 
diff --git a/src/lib/libcrypto/gost/gostr341001_key.c b/src/lib/libcrypto/gost/gostr341001_key.c
index dbe360620a..894a189e3b 100644
--- a/src/lib/libcrypto/gost/gostr341001_key.c
+++ b/src/lib/libcrypto/gost/gostr341001_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341001_key.c,v 1.5 2015/02/14 06:40:04 jsing Exp $ */
+/* $OpenBSD: gostr341001_key.c,v 1.6 2015/09/10 15:56:25 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -49,6 +49,8 @@
  * ====================================================================
  */
 
+#include <string.h>
+
 #include <openssl/opensslconf.h>
 
 #ifndef OPENSSL_NO_GOST
@@ -103,7 +105,7 @@ GOST_KEY_free(GOST_KEY *r)
         EC_POINT_free(r->pub_key);
         BN_clear_free(r->priv_key);
 
-        OPENSSL_cleanse((void *)r, sizeof(GOST_KEY));
+        explicit_bzero((void *)r, sizeof(GOST_KEY));
         free(r);
 }
 
diff --git a/src/lib/libcrypto/gost/gostr341194.c b/src/lib/libcrypto/gost/gostr341194.c
index 32c166aefa..2a462185aa 100644
--- a/src/lib/libcrypto/gost/gostr341194.c
+++ b/src/lib/libcrypto/gost/gostr341194.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: gostr341194.c,v 1.4 2015/07/15 17:13:17 beck Exp $ */
+/* $OpenBSD: gostr341194.c,v 1.5 2015/09/10 15:56:25 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -267,7 +267,7 @@ GOSTR341194(const unsigned char *d, size_t n, unsigned char *md, int nid)
                 return 0;
         GOSTR341194_Update(&c, d, n);
         GOSTR341194_Final(md, &c);
-        OPENSSL_cleanse(&c, sizeof(c));
+        explicit_bzero(&c, sizeof(c));
         return (md);
 }
 #endif
diff --git a/src/lib/libcrypto/gost/streebog.c b/src/lib/libcrypto/gost/streebog.c
index 8060161d11..902472bd9e 100644
--- a/src/lib/libcrypto/gost/streebog.c
+++ b/src/lib/libcrypto/gost/streebog.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: streebog.c,v 1.4 2014/12/07 16:33:51 jsing Exp $ */
+/* $OpenBSD: streebog.c,v 1.5 2015/09/10 15:56:25 jsing Exp $ */
 /*
  * Copyright (c) 2014 Dmitry Eremin-Solenikov <dbaryshkov@gmail.com>
  * Copyright (c) 2005-2006 Cryptocom LTD
@@ -1455,7 +1455,7 @@ STREEBOG256(const unsigned char *d, size_t n, unsigned char *md)
         STREEBOG256_Init(&c);
         STREEBOG256_Update(&c, d, n);
         STREEBOG256_Final(md, &c);
-        OPENSSL_cleanse(&c, sizeof(c));
+        explicit_bzero(&c, sizeof(c));
         return (md);
 }
 
@@ -1470,7 +1470,7 @@ STREEBOG512(const unsigned char *d, size_t n, unsigned char *md)
         STREEBOG512_Init(&c);
         STREEBOG512_Update(&c, d, n);
         STREEBOG512_Final(md, &c);
-        OPENSSL_cleanse(&c, sizeof(c));
+        explicit_bzero(&c, sizeof(c));
         return (md);
 }