summaryrefslogtreecommitdiff
path: root/src/lib/libssl/s3_srvr.c
diff options
context:
space:
mode:
authortedu <>2014-06-19 21:29:51 +0000
committertedu <>2014-06-19 21:29:51 +0000
commit3f4e4aa9316cf074c27b03455dc6d2b35f06ba13 (patch)
tree7d822bfb3203433ec1d2621e3b77a893bd97b408 /src/lib/libssl/s3_srvr.c
parent416121b0444310ecca72bead1f9225d6cb93aef5 (diff)
downloadopenbsd-3f4e4aa9316cf074c27b03455dc6d2b35f06ba13.tar.gz
openbsd-3f4e4aa9316cf074c27b03455dc6d2b35f06ba13.tar.bz2
openbsd-3f4e4aa9316cf074c27b03455dc6d2b35f06ba13.zip
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
Diffstat (limited to 'src/lib/libssl/s3_srvr.c')
-rw-r--r--src/lib/libssl/s3_srvr.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libssl/s3_srvr.c b/src/lib/libssl/s3_srvr.c
index cab034d18f..161534295f 100644
--- a/src/lib/libssl/s3_srvr.c
+++ b/src/lib/libssl/s3_srvr.c
@@ -1,4 +1,4 @@
1/* $OpenBSD: s3_srvr.c,v 1.65 2014/06/18 04:51:31 miod Exp $ */ 1/* $OpenBSD: s3_srvr.c,v 1.66 2014/06/19 21:29:51 tedu 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 *
@@ -1024,7 +1024,7 @@ ssl3_get_client_hello(SSL *s)
1024 goto f_err; 1024 goto f_err;
1025 } 1025 }
1026 /* else cookie verification succeeded */ 1026 /* else cookie verification succeeded */
1027 } else if (CRYPTO_memcmp(s->d1->rcvd_cookie, s->d1->cookie, 1027 } else if (timingsafe_memcmp(s->d1->rcvd_cookie, s->d1->cookie,
1028 s->d1->cookie_len) != 0) { 1028 s->d1->cookie_len) != 0) {
1029 /* default verification */ 1029 /* default verification */
1030 al = SSL_AD_HANDSHAKE_FAILURE; 1030 al = SSL_AD_HANDSHAKE_FAILURE;