diff options
author | David Benjamin <davidben@google.com> | 2018-05-02 16:11:34 -0400 |
---|---|---|
committer | CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org> | 2018-05-03 15:20:13 +0000 |
commit | b95d4b4cb33fe9e84e0917772469530a552913f0 (patch) | |
tree | 78be7829781403fc7ed64ca129c2e5ae301321dc /ssl/d1_srtp.cc | |
parent | 98472cb30db1e4644e81530c73c0bc5e89dbaaf3 (diff) | |
download | boringssl-b95d4b4cb33fe9e84e0917772469530a552913f0.zip boringssl-b95d4b4cb33fe9e84e0917772469530a552913f0.tar.gz boringssl-b95d4b4cb33fe9e84e0917772469530a552913f0.tar.bz2 |
Move srtp_profiles to SSL_CONFIG.
These are also not needed after the handshake.
Change-Id: I5de2d5cf18a3783a6c04c0a8fe311069fb51b939
Reviewed-on: https://boringssl-review.googlesource.com/27986
Reviewed-by: Steven Valdez <svaldez@google.com>
Commit-Queue: Steven Valdez <svaldez@google.com>
CQ-Verified: CQ bot account: commit-bot@chromium.org <commit-bot@chromium.org>
Diffstat (limited to 'ssl/d1_srtp.cc')
-rw-r--r-- | ssl/d1_srtp.cc | 19 |
1 files changed, 9 insertions, 10 deletions
diff --git a/ssl/d1_srtp.cc b/ssl/d1_srtp.cc index f27c9ff..69b693c 100644 --- a/ssl/d1_srtp.cc +++ b/ssl/d1_srtp.cc @@ -198,23 +198,22 @@ int SSL_CTX_set_srtp_profiles(SSL_CTX *ctx, const char *profiles) { } int SSL_set_srtp_profiles(SSL *ssl, const char *profiles) { - return ssl_ctx_make_profiles(profiles, &ssl->srtp_profiles); + return ssl->config != nullptr && + ssl_ctx_make_profiles(profiles, &ssl->config->srtp_profiles); } STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl) { - if (ssl == NULL) { - return NULL; + if (ssl == nullptr) { + return nullptr; } - if (ssl->srtp_profiles != NULL) { - return ssl->srtp_profiles; + if (ssl->config == nullptr) { + assert(0); + return nullptr; } - if (ssl->ctx->srtp_profiles != NULL) { - return ssl->ctx->srtp_profiles; - } - - return NULL; + return ssl->config->srtp_profiles != nullptr ? ssl->config->srtp_profiles + : ssl->ctx->srtp_profiles; } const SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *ssl) { |