Correct spelling of OPENSSL_cleanse.

ok miod@

4 files changed, 14 insertions, 14 deletions

diff --git a/src/lib/libcrypto/cms/cms_asn1.c b/src/lib/libcrypto/cms/cms_asn1.c
index 02a594575d..e450259832 100644
--- a/src/lib/libcrypto/cms/cms_asn1.c
+++ b/src/lib/libcrypto/cms/cms_asn1.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_asn1.c,v 1.6 2015/07/25 15:22:10 jsing Exp $ */
+/* $OpenBSD: cms_asn1.c,v 1.7 2015/09/10 15:56:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -888,13 +888,13 @@ cms_ri_cb(int operation, ASN1_VALUE **pval, const ASN1_ITEM *it, void *exarg)
                 } else if (ri->type == CMS_RECIPINFO_KEK) {
                         CMS_KEKRecipientInfo *kekri = ri->d.kekri;
                         if (kekri->key) {
-                                OPENSSL_cleanse(kekri->key, kekri->keylen);
+                                explicit_bzero(kekri->key, kekri->keylen);
                                 free(kekri->key);
                         }
                 } else if (ri->type == CMS_RECIPINFO_PASS) {
                         CMS_PasswordRecipientInfo *pwri = ri->d.pwri;
                         if (pwri->pass) {
-                                OPENSSL_cleanse(pwri->pass, pwri->passlen);
+                                explicit_bzero(pwri->pass, pwri->passlen);
                                 free(pwri->pass);
                         }
                 }
diff --git a/src/lib/libcrypto/cms/cms_enc.c b/src/lib/libcrypto/cms/cms_enc.c
index f97e4d5f34..c967a18a3c 100644
--- a/src/lib/libcrypto/cms/cms_enc.c
+++ b/src/lib/libcrypto/cms/cms_enc.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_enc.c,v 1.6 2014/10/22 13:02:04 jsing Exp $ */
+/* $OpenBSD: cms_enc.c,v 1.7 2015/09/10 15:56:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -164,7 +164,7 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
                                 goto err;
                         } else {
                                 /* Use random key */
-                                OPENSSL_cleanse(ec->key, ec->keylen);
+                                explicit_bzero(ec->key, ec->keylen);
                                 free(ec->key);
                                 ec->key = tkey;
                                 ec->keylen = tkeylen;
@@ -197,12 +197,12 @@ cms_EncryptedContent_init_bio(CMS_EncryptedContentInfo *ec)
 
 err:
         if (ec->key && !keep_key) {
-                OPENSSL_cleanse(ec->key, ec->keylen);
+                explicit_bzero(ec->key, ec->keylen);
                 free(ec->key);
                 ec->key = NULL;
         }
         if (tkey) {
-                OPENSSL_cleanse(tkey, tkeylen);
+                explicit_bzero(tkey, tkeylen);
                 free(tkey);
         }
         if (ok)
diff --git a/src/lib/libcrypto/cms/cms_env.c b/src/lib/libcrypto/cms/cms_env.c
index 63b24b6374..e483c4539f 100644
--- a/src/lib/libcrypto/cms/cms_env.c
+++ b/src/lib/libcrypto/cms/cms_env.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_env.c,v 1.8 2014/10/18 17:20:40 jsing Exp $ */
+/* $OpenBSD: cms_env.c,v 1.9 2015/09/10 15:56:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -406,7 +406,7 @@ cms_RecipientInfo_ktri_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri)
         ret = 1;
 
         if (ec->key) {
-                OPENSSL_cleanse(ec->key, ec->keylen);
+                explicit_bzero(ec->key, ec->keylen);
                 free(ec->key);
         }
 
@@ -654,7 +654,7 @@ cms_RecipientInfo_kekri_encrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri)
 err:
         if (!r && wkey)
                 free(wkey);
-        OPENSSL_cleanse(&actx, sizeof(actx));
+        explicit_bzero(&actx, sizeof(actx));
 
         return r;
 }
@@ -727,7 +727,7 @@ cms_RecipientInfo_kekri_decrypt(CMS_ContentInfo *cms, CMS_RecipientInfo *ri)
 err:
         if (!r && ukey)
                 free(ukey);
-        OPENSSL_cleanse(&actx, sizeof(actx));
+        explicit_bzero(&actx, sizeof(actx));
 
         return r;
 }
@@ -806,7 +806,7 @@ cms_EnvelopedData_init_bio(CMS_ContentInfo *cms)
 err:
         ec->cipher = NULL;
         if (ec->key) {
-                OPENSSL_cleanse(ec->key, ec->keylen);
+                explicit_bzero(ec->key, ec->keylen);
                 free(ec->key);
                 ec->key = NULL;
                 ec->keylen = 0;
diff --git a/src/lib/libcrypto/cms/cms_pwri.c b/src/lib/libcrypto/cms/cms_pwri.c
index 11509e3c11..7055ba5d3b 100644
--- a/src/lib/libcrypto/cms/cms_pwri.c
+++ b/src/lib/libcrypto/cms/cms_pwri.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: cms_pwri.c,v 1.9 2015/05/15 11:00:14 jsg Exp $ */
+/* $OpenBSD: cms_pwri.c,v 1.10 2015/09/10 15:56:25 jsing Exp $ */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project.
  */
@@ -262,7 +262,7 @@ kek_unwrap_key(unsigned char *out, size_t *outlen, const unsigned char *in,
         rv = 1;
 
 err:
-        OPENSSL_cleanse(tmp, inlen);
+        explicit_bzero(tmp, inlen);
         free(tmp);
         return rv;
 }