PR: 1833

Submitted By: Robin Seggelmann <seggelmann@fh-muenster.de>

Fix other cases not covered by original patch.

1 files changed, 6 insertions, 9 deletions

diff --git a/ssl/ssl.h b/ssl/ssl.h
index 6e6f27c09a..e6244b0011 100644
--- a/ssl/ssl.h
+++ b/ssl/ssl.h
@@ -1007,14 +1007,12 @@ struct ssl_st
 
 	int server;	/* are we the server side? - mostly used by SSL_clear*/
 
-	int new_session;/* Generate a new session or reuse an old one.
-					 * NB: For servers, the 'new' session may actually be a previously
-					 * cached session or even the previous session unless
-					 * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
-	int renegotiate;/* 1 if we are renegotiating.
-					 * 2 if we are a server and are inside a handshake
-					 *   (i.e. not just sending a HelloRequest) */
-
+	int new_session;/* 1 if we are to use a new session.
+	                 * 2 if we are a server and are inside a handshake
+	                 *   (i.e. not just sending a HelloRequest)
+	                 * NB: For servers, the 'new' session may actually be a previously
+	                 * cached session or even the previous session unless
+	                 * SSL_OP_NO_SESSION_RESUMPTION_ON_RENEGOTIATION is set */
 	int quiet_shutdown;/* don't send shutdown packets */
 	int shutdown;	/* we have shut things down, 0x01 sent, 0x02
 			 * for received */
@@ -1663,7 +1661,6 @@ STACK_OF(SSL_CIPHER) *SSL_get_ciphers(const SSL *s);
 
 int SSL_do_handshake(SSL *s);
 int SSL_renegotiate(SSL *s);
-int SSL_renegotiate_abbreviated(SSL *s);
 int SSL_renegotiate_pending(SSL *s);
 int SSL_shutdown(SSL *s);