diff options
| author | Andy Polyakov <appro@openssl.org> | 2014-02-13 17:03:14 +0100 |
|---|---|---|
| committer | Andy Polyakov <appro@openssl.org> | 2014-02-13 17:03:14 +0100 |
| commit | d59d0b7c21ef656b4b352b16e5f8fce97ecc6e23 (patch) | |
| tree | 3940800c29a95b21c8b5bacd4e5a534f7764a27d /ssl/ssl.h | |
| parent | dbd512e1b73b28bb073d8674ca57743e0cc9895d (diff) | |
ssl/ssl[3].h: retain binary compatibility.
Diffstat (limited to 'ssl/ssl.h')
| -rw-r--r-- | ssl/ssl.h | 15 |
1 files changed, 8 insertions, 7 deletions
@@ -1160,6 +1160,8 @@ struct ssl_ctx_st void *arg); void *next_proto_select_cb_arg; # endif + /* SRTP profiles we are willing to do from RFC 5764 */ + STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles; /* ALPN information * (we are in the process of transitioning from NPN to ALPN.) */ @@ -1185,8 +1187,6 @@ struct ssl_ctx_st unsigned char* alpn_client_proto_list; unsigned alpn_client_proto_list_len; - /* SRTP profiles we are willing to do from RFC 5764 */ - STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles; # ifndef OPENSSL_NO_EC /* EC extension values inherited by SSL structure */ size_t tlsext_ecpointformatlist_length; @@ -1635,11 +1635,6 @@ struct ssl_st */ unsigned int tlsext_hb_pending; /* Indicates if a HeartbeatRequest is in flight */ unsigned int tlsext_hb_seq; /* HeartbeatRequest sequence number */ - - /* For a client, this contains the list of supported protocols in wire - * format. */ - unsigned char* alpn_client_proto_list; - unsigned alpn_client_proto_list_len; #else #define session_ctx ctx #endif /* OPENSSL_NO_TLSEXT */ @@ -1651,6 +1646,12 @@ struct ssl_st #ifndef OPENSSL_NO_SRP SRP_CTX srp_ctx; /* ctx for SRP authentication */ #endif +#ifndef OPENSSL_NO_TLSEXT + /* For a client, this contains the list of supported protocols in wire + * format. */ + unsigned char* alpn_client_proto_list; + unsigned alpn_client_proto_list_len; +#endif /* OPENSSL_NO_TLSEXT */ #ifndef OPENSSL_NO_DANE unsigned char *tlsa_record; int tlsa_witness; |