Date: Thu, 25 Jan 2018 23:38:05 +0000 (UTC) From: Jung-uk Kim <jkim@FreeBSD.org> To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328419 - head/crypto/openssl/ssl Message-ID: <201801252338.w0PNc5Qc057768@repo.freebsd.org>
next in thread | raw e-mail | index | archive | help
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
Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801252338.w0PNc5Qc057768>