diff options
| author | FdaSilvaYY <fdasilvayy@gmail.com> | 2018-03-21 16:01:24 -0400 |
|---|---|---|
| committer | Rich Salz <rsalz@openssl.org> | 2018-03-21 16:15:50 -0400 |
| commit | 1fb6b0bf3e895c6b30f9c95a23284f93e4fa19b0 (patch) | |
| tree | 291b42ebcad064e05d004c37dcb7b98ff50a3505 /ssl | |
| parent | ab0a3914a64d8f1fce22795c02269e1288df52b1 (diff) | |
Unify s_client/s_server srtp profiles option handling
Add missing guards around STRP-related fields
Remove two unneeded global variables: my 2'cents to #4679
Merge definition and instantiation of srpsrvparm global.
Reviewed-by: Matt Caswell <matt@openssl.org>
Reviewed-by: Ben Kaduk <kaduk@mit.edu>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/4908)
Diffstat (limited to 'ssl')
| -rw-r--r-- | ssl/ssl_locl.h | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/ssl_locl.h b/ssl/ssl_locl.h index a28facdcc6..eae578818c 100644 --- a/ssl/ssl_locl.h +++ b/ssl/ssl_locl.h @@ -1019,8 +1019,10 @@ struct ssl_ctx_st { /* Shared DANE context */ struct dane_ctx_st dane; +# ifndef OPENSSL_NO_SRTP /* SRTP profiles we are willing to do from RFC 5764 */ STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles; +# endif /* * Callback for disabling session caching and ticket support on a session * basis, depending on the chosen cipher. @@ -1358,10 +1360,12 @@ struct ssl_st { int scts_parsed; # endif SSL_CTX *session_ctx; /* initial ctx, used to store sessions */ +# ifndef OPENSSL_NO_SRTP /* What we'll do */ STACK_OF(SRTP_PROTECTION_PROFILE) *srtp_profiles; /* What's been chosen */ SRTP_PROTECTION_PROFILE *srtp_profile; +# endif /*- * 1 if we are renegotiating. * 2 if we are a server and are inside a handshake |