summaryrefslogtreecommitdiff
path: root/src/lib/libcrypto/ec
diff options
context:
space:
mode:
authorjsing <>2015-09-10 15:56:26 +0000
committerjsing <>2015-09-10 15:56:26 +0000
commit1b9402de2dd1b97eca2be1996ed51c82f0663c92 (patch)
tree27c1922db8e3f519794fe6a13a1dfba3d4759090 /src/lib/libcrypto/ec
parente1b77a3f14ebb06ead650e78b43ddd6546237b0a (diff)
downloadopenbsd-1b9402de2dd1b97eca2be1996ed51c82f0663c92.tar.gz
openbsd-1b9402de2dd1b97eca2be1996ed51c82f0663c92.tar.bz2
openbsd-1b9402de2dd1b97eca2be1996ed51c82f0663c92.zip
Correct spelling of OPENSSL_cleanse.
ok miod@
Diffstat (limited to 'src/lib/libcrypto/ec')
-rw-r--r--src/lib/libcrypto/ec/ec_key.c4
-rw-r--r--src/lib/libcrypto/ec/ec_lib.c8
-rw-r--r--src/lib/libcrypto/ec/ec_mult.c6
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp224.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp256.c4
-rw-r--r--src/lib/libcrypto/ec/ecp_nistp521.c4
6 files changed, 15 insertions, 15 deletions
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 @@
1/* $OpenBSD: ec_key.c,v 1.11 2015/02/09 15:49:22 jsing Exp $ */ 1/* $OpenBSD: ec_key.c,v 1.12 2015/09/10 15:56:25 jsing Exp $ */
2/* 2/*
3 * Written by Nils Larsch for the OpenSSL project. 3 * Written by Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -122,7 +122,7 @@ EC_KEY_free(EC_KEY * r)
122 122
123 EC_EX_DATA_free_all_data(&r->method_data); 123 EC_EX_DATA_free_all_data(&r->method_data);
124 124
125 OPENSSL_cleanse((void *) r, sizeof(EC_KEY)); 125 explicit_bzero((void *) r, sizeof(EC_KEY));
126 126
127 free(r); 127 free(r);
128} 128}
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 @@
1/* $OpenBSD: ec_lib.c,v 1.18 2015/05/20 04:33:35 miod Exp $ */ 1/* $OpenBSD: ec_lib.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller for the OpenSSL project. 3 * Originally written by Bodo Moeller for the OpenSSL project.
4 */ 4 */
@@ -152,10 +152,10 @@ EC_GROUP_clear_free(EC_GROUP * group)
152 BN_clear_free(&group->cofactor); 152 BN_clear_free(&group->cofactor);
153 153
154 if (group->seed) { 154 if (group->seed) {
155 OPENSSL_cleanse(group->seed, group->seed_len); 155 explicit_bzero(group->seed, group->seed_len);
156 free(group->seed); 156 free(group->seed);
157 } 157 }
158 OPENSSL_cleanse(group, sizeof *group); 158 explicit_bzero(group, sizeof *group);
159 free(group); 159 free(group);
160} 160}
161 161
@@ -754,7 +754,7 @@ EC_POINT_clear_free(EC_POINT * point)
754 point->meth->point_clear_finish(point); 754 point->meth->point_clear_finish(point);
755 else if (point->meth->point_finish != 0) 755 else if (point->meth->point_finish != 0)
756 point->meth->point_finish(point); 756 point->meth->point_finish(point);
757 OPENSSL_cleanse(point, sizeof *point); 757 explicit_bzero(point, sizeof *point);
758 free(point); 758 free(point);
759} 759}
760 760
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 @@
1/* $OpenBSD: ec_mult.c,v 1.18 2015/02/15 08:44:35 miod Exp $ */ 1/* $OpenBSD: ec_mult.c,v 1.19 2015/09/10 15:56:25 jsing Exp $ */
2/* 2/*
3 * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project. 3 * Originally written by Bodo Moeller and Nils Larsch for the OpenSSL project.
4 */ 4 */
@@ -173,11 +173,11 @@ ec_pre_comp_clear_free(void *pre_)
173 173
174 for (p = pre->points; *p != NULL; p++) { 174 for (p = pre->points; *p != NULL; p++) {
175 EC_POINT_clear_free(*p); 175 EC_POINT_clear_free(*p);
176 OPENSSL_cleanse(p, sizeof *p); 176 explicit_bzero(p, sizeof *p);
177 } 177 }
178 free(pre->points); 178 free(pre->points);
179 } 179 }
180 OPENSSL_cleanse(pre, sizeof *pre); 180 explicit_bzero(pre, sizeof *pre);
181 free(pre); 181 free(pre);
182} 182}
183 183
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 @@
1/* $OpenBSD: ecp_nistp224.c,v 1.16 2015/02/08 22:25:03 miod Exp $ */ 1/* $OpenBSD: ecp_nistp224.c,v 1.17 2015/09/10 15:56:25 jsing Exp $ */
2/* 2/*
3 * Written by Emilia Kasper (Google) for the OpenSSL project. 3 * Written by Emilia Kasper (Google) for the OpenSSL project.
4 */ 4 */
@@ -1239,7 +1239,7 @@ nistp224_pre_comp_clear_free(void *pre_)
1239 if (i > 0) 1239 if (i > 0)
1240 return; 1240 return;
1241 1241
1242 OPENSSL_cleanse(pre, sizeof *pre); 1242 explicit_bzero(pre, sizeof *pre);
1243 free(pre); 1243 free(pre);
1244} 1244}
1245 1245
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 @@
1/* $OpenBSD: ecp_nistp256.c,v 1.15 2015/02/08 22:25:03 miod Exp $ */ 1/* $OpenBSD: ecp_nistp256.c,v 1.16 2015/09/10 15:56:25 jsing Exp $ */
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
@@ -1788,7 +1788,7 @@ nistp256_pre_comp_clear_free(void *pre_)
1788 if (i > 0) 1788 if (i > 0)
1789 return; 1789 return;
1790 1790
1791 OPENSSL_cleanse(pre, sizeof *pre); 1791 explicit_bzero(pre, sizeof *pre);
1792 free(pre); 1792 free(pre);
1793} 1793}
1794 1794
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 @@
1/* $OpenBSD: ecp_nistp521.c,v 1.16 2015/02/08 22:25:03 miod Exp $ */ 1/* $OpenBSD: ecp_nistp521.c,v 1.17 2015/09/10 15:56:25 jsing Exp $ */
2/* 2/*
3 * Written by Adam Langley (Google) for the OpenSSL project 3 * Written by Adam Langley (Google) for the OpenSSL project
4 */ 4 */
@@ -1679,7 +1679,7 @@ nistp521_pre_comp_clear_free(void *pre_)
1679 if (i > 0) 1679 if (i > 0)
1680 return; 1680 return;
1681 1681
1682 OPENSSL_cleanse(pre, sizeof(*pre)); 1682 explicit_bzero(pre, sizeof(*pre));
1683 free(pre); 1683 free(pre);
1684} 1684}
1685 1685