summaryrefslogtreecommitdiffstats
path: root/lib/libssl/ssl.h
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-08-10 14:42:55 +0000
committerjsing <jsing@openbsd.org>2014-08-10 14:42:55 +0000
commit3e6620b05005703104bc76bb7ab704a725e99897 (patch)
tree43645363ec33870f6339e73eec118c9ae7acba82 /lib/libssl/ssl.h
parentAsk for the descriptor size corresponding to the number of ports present (diff)
downloadwireguard-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.h')
-rw-r--r--lib/libssl/ssl.h3
1 files changed, 2 insertions, 1 deletions
diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index 7547d05aa64..857709f7c51 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.62 2014/07/12 19:45:53 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.63 2014/08/10 14:42:56 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -410,6 +410,7 @@ struct ssl_method_st {
int (*ssl_dispatch_alert)(SSL *s);
long (*ssl_ctrl)(SSL *s, int cmd, long larg, void *parg);
long (*ssl_ctx_ctrl)(SSL_CTX *ctx, int cmd, long larg, void *parg);
+ /* XXX - remove get_cipher_by_char and put_cipher_by_char. */
const SSL_CIPHER *(*get_cipher_by_char)(const unsigned char *ptr);
int (*put_cipher_by_char)(const SSL_CIPHER *cipher, unsigned char *ptr);
int (*ssl_pending)(const SSL *s);