diff options
| author | Jung-uk Kim <jkim@FreeBSD.org> | 2018-01-25 23:38:05 +0000 |
|---|---|---|
| committer | Jung-uk Kim <jkim@FreeBSD.org> | 2018-01-25 23:38:05 +0000 |
| commit | 0c731de94c1c5d241c065bf2c1ff8ad127348fb9 (patch) | |
| tree | 26b17a707ed720806af29e6d4fd3593cf207fbfa /crypto/openssl | |
| parent | b97b91b5477bd5ddf78c1a35ade9cf71630f5069 (diff) | |
| download | src-0c731de94c1c5d241c065bf2c1ff8ad127348fb9.tar.gz src-0c731de94c1c5d241c065bf2c1ff8ad127348fb9.zip | |
Add declaration of SSL_get_selected_srtp_profile() for OpenSSL.
Because there was an extra declaration in the vendor version, we locally
removed the second one in r238405 with 1.0.1c. Later, upstream fixed it in
1.0.2d but they removed the first one. Therefore, both were removed in our
version unfortunately. Now we revert to the vendor one to re-add it.
MFC after: 3 days
Differential Revision: https://reviews.freebsd.org/D10525
Notes
Notes:
svn path=/head/; revision=328419
Diffstat (limited to 'crypto/openssl')
| -rw-r--r-- | crypto/openssl/ssl/srtp.h | 1 |
1 files changed, 1 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/srtp.h b/crypto/openssl/ssl/srtp.h index 512edabc8d91..2279c32b895a 100644 --- a/crypto/openssl/ssl/srtp.h +++ b/crypto/openssl/ssl/srtp.h @@ -136,6 +136,7 @@ int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles); int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles); STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl); +SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); # endif |