summaryrefslogtreecommitdiffstats
path: root/lib/libssl/src
diff options
context:
space:
mode:
authorjsing <jsing@openbsd.org>2014-10-31 15:34:06 +0000
committerjsing <jsing@openbsd.org>2014-10-31 15:34:06 +0000
commitb722a7fb721dcfed5f9b262abc6b4b99d6e9f0c9 (patch)
tree6793603f1e1fbb099f6e0f59c6b517eb049dc815 /lib/libssl/src
parentAdd support for automatic DH ephemeral keys. (diff)
downloadwireguard-openbsd-b722a7fb721dcfed5f9b262abc6b4b99d6e9f0c9.tar.xz
wireguard-openbsd-b722a7fb721dcfed5f9b262abc6b4b99d6e9f0c9.zip
Remove now unused remnants from public structs.
Diffstat (limited to 'lib/libssl/src')
-rw-r--r--lib/libssl/src/ssl/ssl.h5
-rw-r--r--lib/libssl/src/ssl/ssl3.h4
2 files changed, 2 insertions, 7 deletions
diff --git a/lib/libssl/src/ssl/ssl.h b/lib/libssl/src/ssl/ssl.h
index 350d6fb4d1e..c46d3339589 100644
--- a/lib/libssl/src/ssl/ssl.h
+++ b/lib/libssl/src/ssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.69 2014/10/31 15:25:55 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.70 2014/10/31 15:34:06 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -412,9 +412,6 @@ 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);
int (*num_ciphers)(void);
const SSL_CIPHER *(*get_cipher)(unsigned ncipher);
diff --git a/lib/libssl/src/ssl/ssl3.h b/lib/libssl/src/ssl/ssl3.h
index 18afa304c94..f10b288f310 100644
--- a/lib/libssl/src/ssl/ssl3.h
+++ b/lib/libssl/src/ssl/ssl3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl3.h,v 1.27 2014/10/31 14:51:01 jsing Exp $ */
+/* $OpenBSD: ssl3.h,v 1.28 2014/10/31 15:34:06 jsing Exp $ */
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
* All rights reserved.
*
@@ -473,8 +473,6 @@ typedef struct ssl3_state_st {
char ctype[SSL3_CT_NUMBER];
STACK_OF(X509_NAME) *ca_names;
- int use_rsa_tmp; /* XXX - remove at next bump. */
-
int key_block_length;
unsigned char *key_block;