From 647569a51c1530d10e75e272f0982682f696caa7 Mon Sep 17 00:00:00 2001 From: jsing <> Date: Thu, 10 Sep 2015 15:56:26 +0000 Subject: Correct spelling of OPENSSL_cleanse. ok miod@ --- src/lib/libcrypto/ec/ec_key.c | 4 ++-- src/lib/libcrypto/ec/ec_lib.c | 8 ++++---- src/lib/libcrypto/ec/ec_mult.c | 6 +++--- src/lib/libcrypto/ec/ecp_nistp224.c | 4 ++-- src/lib/libcrypto/ec/ecp_nistp256.c | 4 ++-- src/lib/libcrypto/ec/ecp_nistp521.c | 4 ++-- 6 files changed, 15 insertions(+), 15 deletions(-) (limited to 'src/lib/libcrypto/ec') diff --git a/src/lib/libcrypto/ec/ec_key.c b/src/lib/libcrypto/ec/ec_key.c index 45192c3231..fa962e4d0f 100644 --- a/src/lib/libcrypto/ec/ec_key.c +++ b/src/lib/libcrypto/ec/ec_key.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_key.c,v 1.11 2015/02/09 15:49:22 jsing Exp $ */ +/* $OpenBSD: ec_key.c,v 1.12 2015/09/10 15:56:25 jsing Exp $ */ /* * Written by Nils Larsch for the OpenSSL project. */ @@ -122,7 +122,7 @@ EC_KEY_free(EC_KEY * r) EC_EX_DATA_free_all_data(&r->method_data); - OPENSSL_cleanse((void *) r, sizeof(EC_KEY)); + explicit_bzero((void *) r, sizeof(EC_KEY)); free(r); } diff --git a/src/lib/libcrypto/ec/ec_lib.c b/src/lib/libcrypto/ec/ec_lib.c index a12a2ffbb6..c28ab18fc0 100644 --- a/src/lib/libcrypto/ec/ec_lib.c +++ b/src/lib/libcrypto/ec/ec_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_lib.c,v 1.18 2015/05/20 04:33:35 miod Exp $ */ +/* $OpenBSD: ec_lib.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */ /* * Originally written by Bodo Moeller for the OpenSSL project. */ @@ -152,10 +152,10 @@ EC_GROUP_clear_free(EC_GROUP * group) BN_clear_free(&group->cofactor); if (group->seed) { - OPENSSL_cleanse(group->seed, group->seed_len); + explicit_bzero(group->seed, group->seed_len); free(group->seed); } - OPENSSL_cleanse(group, sizeof *group); + explicit_bzero(group, sizeof *group); free(group); } @@ -754,7 +754,7 @@ EC_POINT_clear_free(EC_POINT * point) point->meth->point_clear_finish(point); else if (point->meth->point_finish != 0) point->meth->point_finish(point); - OPENSSL_cleanse(point, sizeof *point); + explicit_bzero(point, sizeof *point); free(point); } diff --git a/src/lib/libcrypto/ec/ec_mult.c b/src/lib/libcrypto/ec/ec_mult.c index 68f55cfcb3..e428ac586b 100644 --- a/src/lib/libcrypto/ec/ec_mult.c +++ b/src/lib/libcrypto/ec/ec_mult.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ec_mult.c,v 1.18 2015/02/15 08:44:35 miod Exp $ */ +/* $OpenBSD: ec_mult.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */ /* * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project. */ @@ -173,11 +173,11 @@ ec_pre_comp_clear_free(void *pre_) for (p = pre->points; *p != NULL; p++) { EC_POINT_clear_free(*p); - OPENSSL_cleanse(p, sizeof *p); + explicit_bzero(p, sizeof *p); } free(pre->points); } - OPENSSL_cleanse(pre, sizeof *pre); + explicit_bzero(pre, sizeof *pre); free(pre); } diff --git a/src/lib/libcrypto/ec/ecp_nistp224.c b/src/lib/libcrypto/ec/ecp_nistp224.c index d29113045a..0976f24a9f 100644 --- a/src/lib/libcrypto/ec/ecp_nistp224.c +++ b/src/lib/libcrypto/ec/ecp_nistp224.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nistp224.c,v 1.16 2015/02/08 22:25:03 miod Exp $ */ +/* $OpenBSD: ecp_nistp224.c,v 1.17 2015/09/10 15:56:25 jsing Exp $ */ /* * Written by Emilia Kasper (Google) for the OpenSSL project. */ @@ -1239,7 +1239,7 @@ nistp224_pre_comp_clear_free(void *pre_) if (i > 0) return; - OPENSSL_cleanse(pre, sizeof *pre); + explicit_bzero(pre, sizeof *pre); free(pre); } diff --git a/src/lib/libcrypto/ec/ecp_nistp256.c b/src/lib/libcrypto/ec/ecp_nistp256.c index 23a2131980..be1d2a5402 100644 --- a/src/lib/libcrypto/ec/ecp_nistp256.c +++ b/src/lib/libcrypto/ec/ecp_nistp256.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nistp256.c,v 1.15 2015/02/08 22:25:03 miod Exp $ */ +/* $OpenBSD: ecp_nistp256.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */ /* * Written by Adam Langley (Google) for the OpenSSL project */ @@ -1788,7 +1788,7 @@ nistp256_pre_comp_clear_free(void *pre_) if (i > 0) return; - OPENSSL_cleanse(pre, sizeof *pre); + explicit_bzero(pre, sizeof *pre); free(pre); } diff --git a/src/lib/libcrypto/ec/ecp_nistp521.c b/src/lib/libcrypto/ec/ecp_nistp521.c index 6382091cf9..cfa13b41f8 100644 --- a/src/lib/libcrypto/ec/ecp_nistp521.c +++ b/src/lib/libcrypto/ec/ecp_nistp521.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ecp_nistp521.c,v 1.16 2015/02/08 22:25:03 miod Exp $ */ +/* $OpenBSD: ecp_nistp521.c,v 1.17 2015/09/10 15:56:25 jsing Exp $ */ /* * Written by Adam Langley (Google) for the OpenSSL project */ @@ -1679,7 +1679,7 @@ nistp521_pre_comp_clear_free(void *pre_) if (i > 0) return; - OPENSSL_cleanse(pre, sizeof(*pre)); + explicit_bzero(pre, sizeof(*pre)); free(pre); } -- cgit v1.2.3-55-g6feb