diff options
| author | tedu <> | 2014-06-19 21:29:51 +0000 |
|---|---|---|
| committer | tedu <> | 2014-06-19 21:29:51 +0000 |
| commit | 150e8864673fb3b65a00e9188f50ca6a5bae927d (patch) | |
| tree | 7d822bfb3203433ec1d2621e3b77a893bd97b408 /src/lib/libssl/s3_srvr.c | |
| parent | 41e038d2e8f6a205e6aa50aa0e910df4ff76ec9e (diff) | |
| download | openbsd-150e8864673fb3b65a00e9188f50ca6a5bae927d.tar.gz openbsd-150e8864673fb3b65a00e9188f50ca6a5bae927d.tar.bz2 openbsd-150e8864673fb3b65a00e9188f50ca6a5bae927d.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 '')
| -rw-r--r-- | src/lib/libssl/s3_srvr.c | 4 |
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; |
