wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

ABI fixes from 1.0.1-stable

Browse source
This commit is contained in:
Dr. Stephen Henson 2012-02-23 22:25:52 +00:00
parent 6941b7b918
commit 8f27a92754
1 changed files with 7 additions and 6 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

13
ssl/ssl.h
View file

@ -1329,12 +1329,6 @@ struct ssl_st
unsigned char *next_proto_negotiated; unsigned char *next_proto_negotiated;
unsigned char next_proto_negotiated_len; unsigned char next_proto_negotiated_len;
#endif #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 #define session_ctx initial_ctx
@ -1352,6 +1346,13 @@ struct ssl_st
#define session_ctx ctx #define session_ctx ctx
#endif /* OPENSSL_NO_TLSEXT */ #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 /* Callback for disabling session caching and ticket support
* on a session basis, depending on the chosen cipher. */ * on a session basis, depending on the chosen cipher. */
int (*not_resumable_session_cb)(SSL *ssl, int is_forward_secure); int (*not_resumable_session_cb)(SSL *ssl, int is_forward_secure);