Author: jkim
Date: Mon Jan 29 18:21:50 2018
New Revision: 328557
URL: https://svnweb.freebsd.org/changeset/base/328557
Log:
Revert a local change and sync. with head. No functional change.
Note this is a direct commit because head has OpenSSL 1.0.2.
Modified:
stable/10/crypto/openssl/ssl/srtp.h
Modified: stable/10/crypto/openssl/ssl/srtp.h
==============================================================================
--- stable/10/crypto/openssl/ssl/srtp.h Mon Jan 29 18:12:59 2018
(r328556)
+++ stable/10/crypto/openssl/ssl/srtp.h Mon Jan 29 18:21:50 2018
(r328557)
@@ -134,9 +134,9 @@ extern "C" {
int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
-SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
+SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
# endif
_______________________________________________
svn-src-stable-10@freebsd.org mailing list
https://lists.freebsd.org/mailman/listinfo/svn-src-stable-10
To unsubscribe, send any mail to "svn-src-stable-10-unsubscr...@freebsd.org"
