Correct spelling of OPENSSL_cleanse.

ok miod@

10 files changed, 28 insertions, 26 deletions

diff --git a/src/lib/libcrypto/evp/bio_enc.c b/src/lib/libcrypto/evp/bio_enc.c
index e367faa967..1920c6d180 100644
--- a/src/lib/libcrypto/evp/bio_enc.c
+++ b/src/lib/libcrypto/evp/bio_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: bio_enc.c,v 1.18 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: bio_enc.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -135,7 +135,7 @@ enc_free(BIO *a)
                 return (0);
         b = (BIO_ENC_CTX *)a->ptr;
         EVP_CIPHER_CTX_cleanup(&(b->cipher));
-        OPENSSL_cleanse(a->ptr, sizeof(BIO_ENC_CTX));
+        explicit_bzero(a->ptr, sizeof(BIO_ENC_CTX));
         free(a->ptr);
         a->ptr = NULL;
         a->init = 0;
diff --git a/src/lib/libcrypto/evp/e_aes.c b/src/lib/libcrypto/evp/e_aes.c
index 0a9455a5d2..a6d48085c3 100644
--- a/src/lib/libcrypto/evp/e_aes.c
+++ b/src/lib/libcrypto/evp/e_aes.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_aes.c,v 1.28 2015/06/20 12:01:14 jsing Exp $ */
+/* $OpenBSD: e_aes.c,v 1.29 2015/09/10 15:56:25 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2001-2011 The OpenSSL Project.  All rights reserved.
  *
@@ -690,7 +690,7 @@ aes_gcm_cleanup(EVP_CIPHER_CTX *c)
 
         if (gctx->iv != c->iv)
                 free(gctx->iv);
-        OPENSSL_cleanse(gctx, sizeof(*gctx));
+        explicit_bzero(gctx, sizeof(*gctx));
         return 1;
 }
 
@@ -972,7 +972,7 @@ aes_gcm_tls_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
                 /* If tag mismatch wipe buffer */
                 if (memcmp(ctx->buf, in + len, EVP_GCM_TLS_TAG_LEN)) {
-                        OPENSSL_cleanse(out, len);
+                        explicit_bzero(out, len);
                         goto err;
                 }
                 rv = len;
@@ -1339,7 +1339,7 @@ aes_ccm_cipher(EVP_CIPHER_CTX *ctx, unsigned char *out,
                         }
                 }
                 if (rv == -1)
-                        OPENSSL_cleanse(out, len);
+                        explicit_bzero(out, len);
                 cctx->iv_set = 0;
                 cctx->tag_set = 0;
                 cctx->len_set = 0;
@@ -1417,7 +1417,7 @@ aead_aes_gcm_cleanup(EVP_AEAD_CTX *ctx)
 {
         struct aead_aes_gcm_ctx *gcm_ctx = ctx->aead_state;
 
-        OPENSSL_cleanse(gcm_ctx, sizeof(*gcm_ctx));
+        explicit_bzero(gcm_ctx, sizeof(*gcm_ctx));
         free(gcm_ctx);
 }
 
diff --git a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
index 7c23face34..c76c2b1c52 100644
--- a/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
+++ b/src/lib/libcrypto/evp/e_aes_cbc_hmac_sha1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.8 2014/07/12 20:37:07 miod Exp $ */
+/* $OpenBSD: e_aes_cbc_hmac_sha1.c,v 1.9 2015/09/10 15:56:25 jsing Exp $ */
 /* ====================================================================
  * Copyright (c) 2011-2013 The OpenSSL Project.  All rights reserved.
  *
@@ -502,7 +502,7 @@ aesni_cbc_hmac_sha1_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
                         SHA1_Init(&key->tail);
                         SHA1_Update(&key->tail, hmac_key, sizeof(hmac_key));
 
-                        OPENSSL_cleanse(hmac_key, sizeof(hmac_key));
+                        explicit_bzero(hmac_key, sizeof(hmac_key));
 
                         return 1;
                 }
diff --git a/src/lib/libcrypto/evp/e_chacha20poly1305.c b/src/lib/libcrypto/evp/e_chacha20poly1305.c
index c003b0ba7f..9deb40b72a 100644
--- a/src/lib/libcrypto/evp/e_chacha20poly1305.c
+++ b/src/lib/libcrypto/evp/e_chacha20poly1305.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_chacha20poly1305.c,v 1.9 2015/06/20 12:01:14 jsing Exp $ */
+/* $OpenBSD: e_chacha20poly1305.c,v 1.10 2015/09/10 15:56:25 jsing Exp $ */
 /*
  * Copyright (c) 2014, Google Inc.
  *
@@ -71,7 +71,7 @@ aead_chacha20_poly1305_cleanup(EVP_AEAD_CTX *ctx)
 {
         struct aead_chacha20_poly1305_ctx *c20_ctx = ctx->aead_state;
 
-        OPENSSL_cleanse(c20_ctx->key, sizeof(c20_ctx->key));
+        explicit_bzero(c20_ctx->key, sizeof(c20_ctx->key));
         free(c20_ctx);
 }
 
diff --git a/src/lib/libcrypto/evp/e_idea.c b/src/lib/libcrypto/evp/e_idea.c
index 3ba4dbcdb9..454ad4e672 100644
--- a/src/lib/libcrypto/evp/e_idea.c
+++ b/src/lib/libcrypto/evp/e_idea.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: e_idea.c,v 1.9 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: e_idea.c,v 1.10 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/opensslconf.h>
 
@@ -115,7 +116,7 @@ idea_init_key(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
                 idea_set_encrypt_key(key, &tmp);
                 idea_set_decrypt_key(&tmp, ctx->cipher_data);
-                OPENSSL_cleanse((unsigned char *)&tmp,
+                explicit_bzero((unsigned char *)&tmp,
                     sizeof(IDEA_KEY_SCHEDULE));
         }
         return 1;
diff --git a/src/lib/libcrypto/evp/evp_enc.c b/src/lib/libcrypto/evp/evp_enc.c
index 42ccfceec9..99bf59e05f 100644
--- a/src/lib/libcrypto/evp/evp_enc.c
+++ b/src/lib/libcrypto/evp/evp_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_enc.c,v 1.26 2015/02/10 09:52:35 miod Exp $ */
+/* $OpenBSD: evp_enc.c,v 1.27 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -562,7 +562,7 @@ EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *c)
                         return 0;
                 /* Cleanse cipher context data */
                 if (c->cipher_data)
-                        OPENSSL_cleanse(c->cipher_data, c->cipher->ctx_size);
+                        explicit_bzero(c->cipher_data, c->cipher->ctx_size);
         }
         free(c->cipher_data);
 #ifndef OPENSSL_NO_ENGINE
diff --git a/src/lib/libcrypto/evp/evp_key.c b/src/lib/libcrypto/evp/evp_key.c
index 0678536ccb..2c76743e42 100644
--- a/src/lib/libcrypto/evp/evp_key.c
+++ b/src/lib/libcrypto/evp/evp_key.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: evp_key.c,v 1.22 2015/02/10 09:55:39 miod Exp $ */
+/* $OpenBSD: evp_key.c,v 1.23 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -116,7 +116,7 @@ EVP_read_pw_string_min(char *buf, int min, int len, const char *prompt,
         }
         ret = UI_process(ui);
         UI_free(ui);
-        OPENSSL_cleanse(buff, BUFSIZ);
+        explicit_bzero(buff, BUFSIZ);
         return ret;
 }
 
@@ -201,6 +201,6 @@ EVP_BytesToKey(const EVP_CIPHER *type, const EVP_MD *md,
 
 err:
         EVP_MD_CTX_cleanup(&c);
-        OPENSSL_cleanse(md_buf, sizeof md_buf);
+        explicit_bzero(md_buf, sizeof md_buf);
         return rv;
 }
diff --git a/src/lib/libcrypto/evp/p5_crpt.c b/src/lib/libcrypto/evp/p5_crpt.c
index 112a69114c..626910fd7a 100644
--- a/src/lib/libcrypto/evp/p5_crpt.c
+++ b/src/lib/libcrypto/evp/p5_crpt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p5_crpt.c,v 1.15 2015/02/10 09:52:35 miod Exp $ */
+/* $OpenBSD: p5_crpt.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -147,9 +147,9 @@ PKCS5_PBE_keyivgen(EVP_CIPHER_CTX *cctx, const char *pass, int passlen,
             EVP_CIPHER_iv_length(cipher));
         if (!EVP_CipherInit_ex(cctx, cipher, NULL, key, iv, en_de))
                 goto err;
-        OPENSSL_cleanse(md_tmp, EVP_MAX_MD_SIZE);
-        OPENSSL_cleanse(key, EVP_MAX_KEY_LENGTH);
-        OPENSSL_cleanse(iv, EVP_MAX_IV_LENGTH);
+        explicit_bzero(md_tmp, EVP_MAX_MD_SIZE);
+        explicit_bzero(key, EVP_MAX_KEY_LENGTH);
+        explicit_bzero(iv, EVP_MAX_IV_LENGTH);
         rv = 1;
 err:
         EVP_MD_CTX_cleanup(&ctx);
diff --git a/src/lib/libcrypto/evp/p5_crpt2.c b/src/lib/libcrypto/evp/p5_crpt2.c
index afafb9551f..632c2c76ce 100644
--- a/src/lib/libcrypto/evp/p5_crpt2.c
+++ b/src/lib/libcrypto/evp/p5_crpt2.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p5_crpt2.c,v 1.20 2015/02/14 15:49:51 miod Exp $ */
+/* $OpenBSD: p5_crpt2.c,v 1.21 2015/09/10 15:56:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 1999.
  */
@@ -300,7 +300,7 @@ PKCS5_v2_PBKDF2_keyivgen(EVP_CIPHER_CTX *ctx, const char *pass, int passlen,
         rv = EVP_CipherInit_ex(ctx, NULL, NULL, key, NULL, en_de);
 
 err:
-        OPENSSL_cleanse(key, keylen);
+        explicit_bzero(key, keylen);
         PBKDF2PARAM_free(kdf);
         return rv;
 }
diff --git a/src/lib/libcrypto/evp/p_open.c b/src/lib/libcrypto/evp/p_open.c
index aca83e74f6..002a6dea70 100644
--- a/src/lib/libcrypto/evp/p_open.c
+++ b/src/lib/libcrypto/evp/p_open.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: p_open.c,v 1.16 2014/07/11 08:44:48 jsing Exp $ */
+/* $OpenBSD: p_open.c,v 1.17 2015/09/10 15:56:25 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -57,6 +57,7 @@
  */
 
 #include <stdio.h>
+#include <string.h>
 
 #include <openssl/opensslconf.h>
 
@@ -109,7 +110,7 @@ EVP_OpenInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
 
 err:
         if (key != NULL)
-                OPENSSL_cleanse(key, size);
+                explicit_bzero(key, size);
         free(key);
         return (ret);
 }