Commit 8f27a927 authored by Dr. Stephen Henson's avatar Dr. Stephen Henson
Browse files

ABI fixes from 1.0.1-stable

parent 6941b7b9

ssl/ssl.h

+7 −6
Original line number Diff line number Diff line
@@ -1329,12 +1329,6 @@ struct ssl_st 
	unsigned char *next_proto_negotiated;

	unsigned char next_proto_negotiated_len;

#endif

	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) */

#ifndef OPENSSL_NO_SRP

	SRP_CTX srp_ctx; /* ctx for SRP authentication */

#endif



#define session_ctx initial_ctx
@@ -1352,6 +1346,13 @@ struct ssl_st 
#define session_ctx ctx

#endif /* OPENSSL_NO_TLSEXT */



	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) */

#ifndef OPENSSL_NO_SRP

	SRP_CTX srp_ctx; /* ctx for SRP authentication */

#endif



	/* Callback for disabling session caching and ticket support

	 * on a session basis, depending on the chosen cipher. */

	int (*not_resumable_session_cb)(SSL *ssl, int is_forward_secure);