diff options
author | miod <> | 2014-07-09 16:51:09 +0000 |
---|---|---|
committer | miod <> | 2014-07-09 16:51:09 +0000 |
commit | bfe4819cb54b7d030c3dde3dd28c77ecd04e7f46 (patch) | |
tree | 26b4e639efda886efe5d7a3b9159108527e510c0 /src | |
parent | eb3e7d7ffe444652fe6f90808f95e08bc99cf5ae (diff) | |
download | openbsd-bfe4819cb54b7d030c3dde3dd28c77ecd04e7f46.tar.gz openbsd-bfe4819cb54b7d030c3dde3dd28c77ecd04e7f46.tar.bz2 openbsd-bfe4819cb54b7d030c3dde3dd28c77ecd04e7f46.zip |
Replace memset(a, 0, ...); free(a); by explicit_bzero(a, ...); free(a); in
fear a smartass-optimizing compiler decides memset is useless immediately
before free().
ok jsing@ deraadt@ tedu@
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/buffer/buffer.c | 4 | ||||
-rw-r--r-- | src/lib/libssl/src/crypto/buffer/buffer.c | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/src/lib/libcrypto/buffer/buffer.c b/src/lib/libcrypto/buffer/buffer.c index 8dbddd0889..3373e324ae 100644 --- a/src/lib/libcrypto/buffer/buffer.c +++ b/src/lib/libcrypto/buffer/buffer.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: buffer.c,v 1.18 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: buffer.c,v 1.19 2014/07/09 16:51:09 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -88,7 +88,7 @@ BUF_MEM_free(BUF_MEM *a) | |||
88 | return; | 88 | return; |
89 | 89 | ||
90 | if (a->data != NULL) { | 90 | if (a->data != NULL) { |
91 | memset(a->data, 0, a->max); | 91 | explicit_bzero(a->data, a->max); |
92 | free(a->data); | 92 | free(a->data); |
93 | } | 93 | } |
94 | free(a); | 94 | free(a); |
diff --git a/src/lib/libssl/src/crypto/buffer/buffer.c b/src/lib/libssl/src/crypto/buffer/buffer.c index 8dbddd0889..3373e324ae 100644 --- a/src/lib/libssl/src/crypto/buffer/buffer.c +++ b/src/lib/libssl/src/crypto/buffer/buffer.c | |||
@@ -1,4 +1,4 @@ | |||
1 | /* $OpenBSD: buffer.c,v 1.18 2014/06/12 15:49:28 deraadt Exp $ */ | 1 | /* $OpenBSD: buffer.c,v 1.19 2014/07/09 16:51:09 miod Exp $ */ |
2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) | 2 | /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) |
3 | * All rights reserved. | 3 | * All rights reserved. |
4 | * | 4 | * |
@@ -88,7 +88,7 @@ BUF_MEM_free(BUF_MEM *a) | |||
88 | return; | 88 | return; |
89 | 89 | ||
90 | if (a->data != NULL) { | 90 | if (a->data != NULL) { |
91 | memset(a->data, 0, a->max); | 91 | explicit_bzero(a->data, a->max); |
92 | free(a->data); | 92 | free(a->data); |
93 | } | 93 | } |
94 | free(a); | 94 | free(a); |