From 7c11123d14401ff8c1b146e6fad403afdccd7593 Mon Sep 17 00:00:00 2001
From: miod <>
Date: Thu, 17 Apr 2014 18:16:45 +0000
Subject: [PATCH] Ok, there was a need for OPENSSL_cleanse() instead of bzero()
 to prevent supposedly smart compilers from optimizing memory cleanups away.
 Understood.

Ok, in case of an hypothetically super smart compiler, OPENSSL_cleanse() had
to be convoluted enough for the compiler not to recognize that this was
actually bzero() in disguise. Understood.

But then why there had been optimized assembler versions of OPENSSL_cleanse()
is beyond me. Did someone not trust the C obfuscation?
---
 src/lib/libcrypto/crypto/Makefile | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

diff --git a/src/lib/libcrypto/crypto/Makefile b/src/lib/libcrypto/crypto/Makefile
index 449959dc..f71fe8e2 100644
--- a/src/lib/libcrypto/crypto/Makefile
+++ b/src/lib/libcrypto/crypto/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.19 2014/04/17 18:11:46 miod Exp $
+# $OpenBSD: Makefile,v 1.20 2014/04/17 18:16:45 miod Exp $
 
 LIB=	crypto
 
@@ -35,6 +35,7 @@ CFLAGS+= -I${LCRYPTO_SRC}/modes -I${LCRYPTO_SRC}/asn1 -I${LCRYPTO_SRC}/evp
 # crypto/
 SRCS+= cryptlib.c malloc-wrapper.c mem_dbg.c cversion.c ex_data.c cpt_err.c
 SRCS+= uid.c o_time.c o_str.c o_init.c
+SRCS+= mem_clr.c
 
 # aes/
 SRCS+= aes_misc.c aes_ecb.c aes_cfb.c aes_ofb.c
@@ -432,7 +433,6 @@ obj_dat.h: obj_mac.h
 
 .if empty (SSLASM)
 CFLAGS+=-DOPENSSL_NO_ASM
-SRCS+= mem_clr.c
 SRCS+= aes_core.c aes_cbc.c 
 SRCS+= bf_enc.c
 SRCS+= bn_asm.c