From 8f27a927544f659685de59ebc6d63a717f8fa362 Mon Sep 17 00:00:00 2001 From: "Dr. Stephen Henson" Date: Thu, 23 Feb 2012 22:25:52 +0000 Subject: [PATCH] ABI fixes from 1.0.1-stable --- ssl/ssl.h | 13 +++++++------ 1 file changed, 7 insertions(+), 6 deletions(-) diff --git a/ssl/ssl.h b/ssl/ssl.h index d1a4661fb5..8998e9ad65 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -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);