From d59d0b7c21ef656b4b352b16e5f8fce97ecc6e23 Mon Sep 17 00:00:00 2001 From: Andy Polyakov Date: Thu, 13 Feb 2014 17:03:14 +0100 Subject: [PATCH] ssl/ssl[3].h: retain binary compatibility. --- ssl/ssl.h | 15 ++++++++------- ssl/ssl3.h | 14 +++++++------- 2 files changed, 15 insertions(+), 14 deletions(-) diff --git a/ssl/ssl.h b/ssl/ssl.h index efa683c457..1043e6c814 100644 --- a/ssl/ssl.h +++ b/ssl/ssl.h @@ -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; diff --git a/ssl/ssl3.h b/ssl/ssl3.h index 2e46410fd3..9826e2f648 100644 --- a/ssl/ssl3.h +++ b/ssl/ssl3.h @@ -560,13 +560,6 @@ typedef struct ssl3_state_st #endif #ifndef OPENSSL_NO_TLSEXT - /* serverinfo_client_tlsext_custom_types contains an array of TLS Extension types which - * were advertised by the client in its ClientHello and leveraged by ServerInfo TLS extension callbacks. - * The array does not contain any duplicates, and is in the same order - * as the types were received in the client hello. */ - unsigned short *serverinfo_client_tlsext_custom_types; - size_t serverinfo_client_tlsext_custom_types_count; /* how many serverinfo_client_tlsext_custom_types */ - #ifndef OPENSSL_NO_EC /* This is set to true if we believe that this is a version of Safari * running on OS X 10.6 or newer. We wish to know this because Safari @@ -574,6 +567,13 @@ typedef struct ssl3_state_st char is_probably_safari; #endif /* !OPENSSL_NO_EC */ + /* serverinfo_client_tlsext_custom_types contains an array of TLS Extension types which + * were advertised by the client in its ClientHello and leveraged by ServerInfo TLS extension callbacks. + * The array does not contain any duplicates, and is in the same order + * as the types were received in the client hello. */ + unsigned short *serverinfo_client_tlsext_custom_types; + size_t serverinfo_client_tlsext_custom_types_count; /* how many serverinfo_client_tlsext_custom_types */ + /* ALPN information * (we are in the process of transitioning from NPN to ALPN.) */ -- 2.25.1