diff options
| author |   tedu <tedu@openbsd.org> | 2014-06-17 01:41:01 +0000 |
|---|---|---|
| committer | tedu <tedu@openbsd.org> | 2014-06-17 01:41:01 +0000 |
| commit | 47e3c6e049aea2bb2d3b18b8ea9fae9dff840a60 (patch) | |
| tree | 7f8675dd50ca1e806b098c4ca66e90a6c9e1cc17 /lib/libssl/src | |
| parent | The io clock on Octeon II (CN6xxx) runs at a different rate to the cpu clock. (diff) | |
| download | wireguard-openbsd-47e3c6e049aea2bb2d3b18b8ea9fae9dff840a60.tar.xz wireguard-openbsd-47e3c6e049aea2bb2d3b18b8ea9fae9dff840a60.zip | |
ssl_session_cmp is not a sort function, can use CRYPTO_memcmp here too.
Diffstat (limited to 'lib/libssl/src')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_lib.c | 6 |
1 files changed, 4 insertions, 2 deletions
diff --git a/lib/libssl/src/ssl/ssl_lib.c b/lib/libssl/src/ssl/ssl_lib.c index 297c80124d8..04c33930532 100644 --- a/lib/libssl/src/ssl/ssl_lib.c +++ b/lib/libssl/src/ssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.67 2014/06/13 10:52:24 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.68 2014/06/17 01:41:01 tedu Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1678,7 +1678,9 @@ ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) return (1); if (a->session_id_length != b->session_id_length) return (1); - return (memcmp(a->session_id, b->session_id, a->session_id_length)); + if (CRYPTO_memcmp(a->session_id, b->session_id, a->session_id_length) != 0) + return (1); + return (0); } /* |