diff options
| author | Joel Sing <jsing@cvs.openbsd.org> | 2016-11-02 10:45:03 +0000 |
|---|---|---|
| committer | Joel Sing <jsing@cvs.openbsd.org> | 2016-11-02 10:45:03 +0000 |
| commit | ec41d5d35ebc20227a3a53531d495dade8aab6e0 (patch) | |
| tree | 52f8a2df09a21efb4fdeb244f1c9f789cc5cff0c | |
| parent | 587ec6e69a4fad3dc2f8fa7e92d49761c4228e2b (diff) | |
Expand IMPLEMENT_LHASH_COMP_FN/IMPLEMENT_LHASH_HASH_FN macros - the only
change to generated assembly results from a difference in line numbers.
| -rw-r--r-- | lib/libssl/ssl_lib.c | 22 |
1 files changed, 17 insertions, 5 deletions
diff --git a/lib/libssl/ssl_lib.c b/lib/libssl/ssl_lib.c index 4fa9b149b19..86cac6eace8 100644 --- a/lib/libssl/ssl_lib.c +++ b/lib/libssl/ssl_lib.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_lib.c,v 1.119 2016/10/19 16:38:40 jsing Exp $ */ +/* $OpenBSD: ssl_lib.c,v 1.120 2016/11/02 10:45:02 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -1756,10 +1756,22 @@ ssl_session_cmp(const SSL_SESSION *a, const SSL_SESSION *b) * variable. The reason is that the functions aren't static, they're exposed via * ssl.h. */ -static -IMPLEMENT_LHASH_HASH_FN(ssl_session, SSL_SESSION) -static -IMPLEMENT_LHASH_COMP_FN(ssl_session, SSL_SESSION) +static unsigned long +ssl_session_LHASH_HASH(const void *arg) +{ + const SSL_SESSION *a = arg; + + return ssl_session_hash(a); +} + +static int +ssl_session_LHASH_COMP(const void *arg1, const void *arg2) +{ + const SSL_SESSION *a = arg1; + const SSL_SESSION *b = arg2; + + return ssl_session_cmp(a, b); +} SSL_CTX * SSL_CTX_new(const SSL_METHOD *meth) |