diff options
| author | Ted Unangst <tedu@cvs.openbsd.org> | 2014-06-19 21:29:52 +0000 |
|---|---|---|
| committer | Ted Unangst <tedu@cvs.openbsd.org> | 2014-06-19 21:29:52 +0000 |
| commit | f3cdfb4ce2276706248abf4f65d96a6ecc75e220 (patch) | |
| tree | 20bab87a954baf4300c1e37da596f889c12271bf /lib/libssl/ssl_lib.c | |
| parent | c8875cb7bb9304fbf8bd2c94eb5317b846932b68 (diff) | |
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 'lib/libssl/ssl_lib.c')
| -rw-r--r-- | lib/libssl/ssl_lib.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 04c33930532..f867daab0ec 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.68 2014/06/17 01:41:01 tedu Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.69 2014/06/19 21:29:51 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1678,7 +1678,7 @@ ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) return (1); if (a->session_id_length != b->session_id_length) return (1); - if (CRYPTO_memcmp(a->session_id, b->session_id, a->session_id_length) != 0) + if (timingsafe_memcmp(a->session_id, b->session_id, a->session_id_length) != 0) return (1); return (0); } |