svn commit: r328419 - head/crypto/openssl/ssl
Jung-uk Kim
jkim at FreeBSD.org
Thu Jan 25 23:38:06 UTC 2018
Author: jkim
Date: Thu Jan 25 23:38:05 2018
New Revision: 328419
URL: https://svnweb.freebsd.org/changeset/base/328419
Log:
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
Modified:
head/crypto/openssl/ssl/srtp.h
Modified: head/crypto/openssl/ssl/srtp.h
==============================================================================
--- head/crypto/openssl/ssl/srtp.h Thu Jan 25 22:38:39 2018 (r328418)
+++ head/crypto/openssl/ssl/srtp.h Thu Jan 25 23:38:05 2018 (r328419)
@@ -136,6 +136,7 @@ int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const ch
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
More information about the svn-src-all
mailing list