From 4e41b8e085c03099d680e9806dd3eea21afb86fe Mon Sep 17 00:00:00 2001
From: jsing <>
Date: Sun, 22 Jan 2017 04:07:44 +0000
Subject: Move recently added min_version/max_version from SSL and SSL_CTX to
 their opaque structs.

---
 src/lib/libssl/ssl.h      | 8 +-------
 src/lib/libssl/ssl_locl.h | 8 +++++---
 2 files changed, 6 insertions(+), 10 deletions(-)

(limited to 'src')

diff --git a/src/lib/libssl/ssl.h b/src/lib/libssl/ssl.h
index e8ad9fb470..c8be3db253 100644
--- a/src/lib/libssl/ssl.h
+++ b/src/lib/libssl/ssl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl.h,v 1.103 2017/01/22 03:50:45 jsing Exp $ */
+/* $OpenBSD: ssl.h,v 1.104 2017/01/22 04:07:44 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -697,9 +697,6 @@ struct ssl_ctx_internal_st;
 struct ssl_ctx_st {
 	const SSL_METHOD *method;
 
-	uint16_t min_version;
-	uint16_t max_version;
-
 	STACK_OF(SSL_CIPHER) *cipher_list;
 	/* same as above but sorted for lookup */
 	STACK_OF(SSL_CIPHER) *cipher_list_by_id;
@@ -1014,9 +1011,6 @@ struct ssl_st {
 	 */
 	int version;
 
-	uint16_t min_version;
-	uint16_t max_version;
-
 	int type; /* SSL_ST_CONNECT or SSL_ST_ACCEPT */
 
 	const SSL_METHOD *method; /* SSLv3 */
diff --git a/src/lib/libssl/ssl_locl.h b/src/lib/libssl/ssl_locl.h
index 50f527aad5..ab18ae1c83 100644
--- a/src/lib/libssl/ssl_locl.h
+++ b/src/lib/libssl/ssl_locl.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl_locl.h,v 1.146 2017/01/22 03:50:45 jsing Exp $ */
+/* $OpenBSD: ssl_locl.h,v 1.147 2017/01/22 04:07:44 jsing Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -377,11 +377,13 @@ typedef struct ssl_session_internal_st {
 } SSL_SESSION_INTERNAL;
 
 typedef struct ssl_ctx_internal_st {
-
+	uint16_t min_version;
+	uint16_t max_version;
 } SSL_CTX_INTERNAL;
 
 typedef struct ssl_internal_st {
-
+	uint16_t min_version;
+	uint16_t max_version;
 } SSL_INTERNAL;
 
 typedef struct ssl3_state_internal_st {
-- 
cgit v1.2.3-55-g6feb