From 150e8864673fb3b65a00e9188f50ca6a5bae927d Mon Sep 17 00:00:00 2001
From: tedu <>
Date: Thu, 19 Jun 2014 21:29:51 +0000
Subject: convert CRYPTO_memcmp to timingsafe_memcmp based on current policy
 favoring libc interfaces over libcrypto interfaces. for now we also prefer
 timingsafe_memcmp over timingsafe_bcmp, even when the latter is acceptable.
 ok beck deraadt matthew miod

---
 src/lib/libssl/s3_pkt.c | 4 ++--
 1 file changed, 2 insertions(+), 2 deletions(-)

(limited to 'src/lib/libssl/s3_pkt.c')

diff --git a/src/lib/libssl/s3_pkt.c b/src/lib/libssl/s3_pkt.c
index f5d8bedbea..a508d5ee49 100644
--- a/src/lib/libssl/s3_pkt.c
+++ b/src/lib/libssl/s3_pkt.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_pkt.c,v 1.47 2014/06/13 10:52:24 jsing Exp $ */
+/* $OpenBSD: s3_pkt.c,v 1.48 2014/06/19 21:29:51 tedu Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -447,7 +447,7 @@ again:
 
 		i = s->method->ssl3_enc->mac(s,md,0 /* not send */);
 		if (i < 0 || mac == NULL ||
-		    CRYPTO_memcmp(md, mac, (size_t)mac_size) != 0)
+		    timingsafe_memcmp(md, mac, (size_t)mac_size) != 0)
 			enc_err = -1;
 		if (rr->length >
 		    SSL3_RT_MAX_COMPRESSED_LENGTH + extra + mac_size)
-- 
cgit v1.2.3-55-g6feb