diff options
| author |   jsing <jsing@openbsd.org> | 2014-08-10 14:42:55 +0000 |
|---|---|---|
| committer | jsing <jsing@openbsd.org> | 2014-08-10 14:42:55 +0000 |
| commit | 3e6620b05005703104bc76bb7ab704a725e99897 (patch) | |
| tree | 43645363ec33870f6339e73eec118c9ae7acba82 /lib/libssl/ssl_sess.c | |
| parent | Ask for the descriptor size corresponding to the number of ports present (diff) | |
| download | wireguard-openbsd-3e6620b05005703104bc76bb7ab704a725e99897.tar.xz wireguard-openbsd-3e6620b05005703104bc76bb7ab704a725e99897.zip | |
Since we no longer need to support SSLv2-style cipher lists, start
unravelling the maze of function pointers and callbacks by directly
calling ssl3_{get,put}_cipher_by_char() and removing the
ssl_{get,put}_cipher_by_char macros.
Prompted by similar changes in boringssl.
ok guenther.
Diffstat (limited to 'lib/libssl/ssl_sess.c')
| -rw-r--r-- | lib/libssl/ssl_sess.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/lib/libssl/ssl_sess.c b/lib/libssl/ssl_sess.c index d1cd4186016..d4fa5a618f9 100644 --- a/lib/libssl/ssl_sess.c +++ b/lib/libssl/ssl_sess.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ssl_sess.c,v 1.38 2014/07/13 16:03:10 beck Exp $ */ +/* $OpenBSD: ssl_sess.c,v 1.39 2014/08/10 14:42:56 jsing Exp $ */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -566,9 +566,9 @@ ssl_get_prev_session(SSL *s, unsigned char *session_id, int len, l2n(l, p); if ((ret->ssl_version >> 8) >= SSL3_VERSION_MAJOR) - ret->cipher = ssl_get_cipher_by_char(s, &(buf[2])); + ret->cipher = ssl3_get_cipher_by_char(&buf[2]); else - ret->cipher = ssl_get_cipher_by_char(s, &(buf[1])); + ret->cipher = ssl3_get_cipher_by_char(&buf[1]); if (ret->cipher == NULL) goto err; |