summaryrefslogtreecommitdiff
path: root/ssl
diff options
context:
space:
mode:
authorsteve <steve>2012-02-23 22:25:52 +0000
committersteve <steve>2012-02-23 22:25:52 +0000
commitea76147a42ff0db91be8c3a12f08a75be1382b27 (patch)
treec9e175ec0a230ab7e565f0c2d38cde5d9a69c93b /ssl
parent3947b253045787c40d0508b943566edaa06d7ab0 (diff)
downloadopenssl-ea76147a42ff0db91be8c3a12f08a75be1382b27.tar.gz
ABI fixes from 1.0.1-stable
Diffstat (limited to 'ssl')
-rw-r--r--ssl/ssl.h13
1 files changed, 7 insertions, 6 deletions
diff --git a/ssl/ssl.h b/ssl/ssl.h
index d1a4661fb..8998e9ad6 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);