From 1e495d311dcece48dc7c3a6d6536af975291ed3e Mon Sep 17 00:00:00 2001
From: jsing <jsing@openbsd.org>
Date: Mon, 23 Jan 2017 14:35:42 +0000
Subject: Move options and mode from SSL_CTX and SSL to internal, since these
 can be set and cleared via existing functions.

---
 lib/libssl/ssl.h | 9 +++------
 1 file changed, 3 insertions(+), 6 deletions(-)

(limited to 'lib/libssl/ssl.h')

diff --git a/lib/libssl/ssl.h b/lib/libssl/ssl.h
index 037f46c400b..28b7de66675 100644
--- a/lib/libssl/ssl.h
+++ b/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.118 2017/01/23 13:36:13 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.119 2017/01/23 14:35:42 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -672,9 +672,6 @@ struct ssl_ctx_st {
 
 	/* Default values to use in SSL structures follow (these are copied by SSL_new) */
 
-	unsigned long options;
-	unsigned long mode;
-
 	STACK_OF(X509) *extra_certs;
 
 	int verify_mode;
@@ -852,10 +849,10 @@ struct ssl_st {
 	long verify_result;
 
 	int references;
-	unsigned long options; /* protocol behaviour */
-	unsigned long mode; /* API behaviour */
+
 	int client_version;	/* what was passed, used for
 				 * SSLv3/TLS rollback check */
+
 	unsigned int max_send_fragment;
 
 	char *tlsext_hostname;
-- 
cgit v1.2.3-59-g8ed1b