Skip site navigation (1)Skip section navigation (2)
Date:      Mon, 29 Jan 2018 18:21:50 +0000 (UTC)
From:      Jung-uk Kim <jkim@FreeBSD.org>
To:        src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-stable@freebsd.org, svn-src-stable-10@freebsd.org
Subject:   svn commit: r328557 - stable/10/crypto/openssl/ssl
Message-ID:  <201801291821.w0TILoNl099437@repo.freebsd.org>

next in thread | raw e-mail | index | archive | help
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
 



Want to link to this message? Use this URL: <https://mail-archive.FreeBSD.org/cgi/mid.cgi?201801291821.w0TILoNl099437>