From 7cb9c95820759c5ea201221da59aaf72cb08d3c7 Mon Sep 17 00:00:00 2001
From: doug <>
Date: Sun, 19 Jul 2015 06:23:51 +0000
Subject: Crank major and remove legacy variables.

Libtls is riding this crank.

ok miod@ bcook@
---
 src/lib/libssl/s3_lib.c          |  5 +----
 src/lib/libssl/shlib_version     |  2 +-
 src/lib/libssl/src/ssl/s3_lib.c  |  5 +----
 src/lib/libssl/src/ssl/ssl3.h    | 11 +----------
 src/lib/libssl/ssl/shlib_version |  2 +-
 src/lib/libssl/ssl3.h            | 11 +----------
 6 files changed, 6 insertions(+), 30 deletions(-)

(limited to 'src/lib/libssl')

diff --git a/src/lib/libssl/s3_lib.c b/src/lib/libssl/s3_lib.c
index 9167257546..c8bdac0214 100644
--- a/src/lib/libssl/s3_lib.c
+++ b/src/lib/libssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.98 2015/07/17 15:50:37 doug Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.99 2015/07/19 06:23:51 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2076,7 +2076,6 @@ ssl3_clear(SSL *s)
 {
 	unsigned char	*rp, *wp;
 	size_t		 rlen, wlen;
-	int		 init_extra;
 
 	ssl3_cleanup_key_block(s);
 	if (s->s3->tmp.ca_names != NULL)
@@ -2091,7 +2090,6 @@ ssl3_clear(SSL *s)
 	wp = s->s3->wbuf.buf;
 	rlen = s->s3->rbuf.len;
 	wlen = s->s3->wbuf.len;
-	init_extra = s->s3->init_extra;
 
 	BIO_free(s->s3->handshake_buffer);
 	s->s3->handshake_buffer = NULL;
@@ -2106,7 +2104,6 @@ ssl3_clear(SSL *s)
 	s->s3->wbuf.buf = wp;
 	s->s3->rbuf.len = rlen;
 	s->s3->wbuf.len = wlen;
-	s->s3->init_extra = init_extra;
 
 	ssl_free_wbio_buffer(s);
 
diff --git a/src/lib/libssl/shlib_version b/src/lib/libssl/shlib_version
index 3997ce2e06..63004f487f 100644
--- a/src/lib/libssl/shlib_version
+++ b/src/lib/libssl/shlib_version
@@ -1,3 +1,3 @@
 # Don't forget to give libtls the same type of bump!
-major=33
+major=34
 minor=0
diff --git a/src/lib/libssl/src/ssl/s3_lib.c b/src/lib/libssl/src/ssl/s3_lib.c
index 9167257546..c8bdac0214 100644
--- a/src/lib/libssl/src/ssl/s3_lib.c
+++ b/src/lib/libssl/src/ssl/s3_lib.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: s3_lib.c,v 1.98 2015/07/17 15:50:37 doug Exp $ */
+/* $OpenBSD: s3_lib.c,v 1.99 2015/07/19 06:23:51 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -2076,7 +2076,6 @@ ssl3_clear(SSL *s)
 {
 	unsigned char	*rp, *wp;
 	size_t		 rlen, wlen;
-	int		 init_extra;
 
 	ssl3_cleanup_key_block(s);
 	if (s->s3->tmp.ca_names != NULL)
@@ -2091,7 +2090,6 @@ ssl3_clear(SSL *s)
 	wp = s->s3->wbuf.buf;
 	rlen = s->s3->rbuf.len;
 	wlen = s->s3->wbuf.len;
-	init_extra = s->s3->init_extra;
 
 	BIO_free(s->s3->handshake_buffer);
 	s->s3->handshake_buffer = NULL;
@@ -2106,7 +2104,6 @@ ssl3_clear(SSL *s)
 	s->s3->wbuf.buf = wp;
 	s->s3->rbuf.len = rlen;
 	s->s3->wbuf.len = wlen;
-	s->s3->init_extra = init_extra;
 
 	ssl_free_wbio_buffer(s);
 
diff --git a/src/lib/libssl/src/ssl/ssl3.h b/src/lib/libssl/src/ssl/ssl3.h
index 4cb27e1634..5ec2fe6f88 100644
--- a/src/lib/libssl/src/ssl/ssl3.h
+++ b/src/lib/libssl/src/ssl/ssl3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl3.h,v 1.40 2015/07/18 19:41:54 doug Exp $ */
+/* $OpenBSD: ssl3.h,v 1.41 2015/07/19 06:23:51 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -376,9 +376,6 @@ typedef struct ssl3_state_st {
 	int need_empty_fragments;
 	int empty_fragment_done;
 
-	/* XXX delete on next major bump. */
-	int init_extra;
-
 	SSL3_BUFFER rbuf;	/* read IO goes into here */
 	SSL3_BUFFER wbuf;	/* write IO goes into here */
 
@@ -489,12 +486,6 @@ typedef struct ssl3_state_st {
 	 */
 	unsigned char *alpn_selected;
 	unsigned int alpn_selected_len;
-
-	/*
-	 * XXX delete on next major bump.  This was for old OS X releases
-	 * with broken ECDHE-ECDSA support.
-	 */
-	char is_probably_safari;
 } SSL3_STATE;
 
 #endif
diff --git a/src/lib/libssl/ssl/shlib_version b/src/lib/libssl/ssl/shlib_version
index 3997ce2e06..63004f487f 100644
--- a/src/lib/libssl/ssl/shlib_version
+++ b/src/lib/libssl/ssl/shlib_version
@@ -1,3 +1,3 @@
 # Don't forget to give libtls the same type of bump!
-major=33
+major=34
 minor=0
diff --git a/src/lib/libssl/ssl3.h b/src/lib/libssl/ssl3.h
index 4cb27e1634..5ec2fe6f88 100644
--- a/src/lib/libssl/ssl3.h
+++ b/src/lib/libssl/ssl3.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: ssl3.h,v 1.40 2015/07/18 19:41:54 doug Exp $ */
+/* $OpenBSD: ssl3.h,v 1.41 2015/07/19 06:23:51 doug Exp $ */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
@@ -376,9 +376,6 @@ typedef struct ssl3_state_st {
 	int need_empty_fragments;
 	int empty_fragment_done;
 
-	/* XXX delete on next major bump. */
-	int init_extra;
-
 	SSL3_BUFFER rbuf;	/* read IO goes into here */
 	SSL3_BUFFER wbuf;	/* write IO goes into here */
 
@@ -489,12 +486,6 @@ typedef struct ssl3_state_st {
 	 */
 	unsigned char *alpn_selected;
 	unsigned int alpn_selected_len;
-
-	/*
-	 * XXX delete on next major bump.  This was for old OS X releases
-	 * with broken ECDHE-ECDSA support.
-	 */
-	char is_probably_safari;
 } SSL3_STATE;
 
 #endif
-- 
cgit v1.2.3-55-g6feb