From owner-svn-src-all@freebsd.org Thu Jan 25 23:38:06 2018 Return-Path: Delivered-To: svn-src-all@mailman.ysv.freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [IPv6:2610:1c1:1:606c::19:1]) by mailman.ysv.freebsd.org (Postfix) with ESMTP id 461F0ED5700; Thu, 25 Jan 2018 23:38:06 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from mxrelay.nyi.freebsd.org (mxrelay.nyi.freebsd.org [IPv6:2610:1c1:1:606c::19:3]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client CN "mxrelay.nyi.freebsd.org", Issuer "Let's Encrypt Authority X3" (verified OK)) by mx1.freebsd.org (Postfix) with ESMTPS id ECA39780AF; Thu, 25 Jan 2018 23:38:05 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org (repo.freebsd.org [IPv6:2610:1c1:1:6068::e6a:0]) (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits)) (Client did not present a certificate) by mxrelay.nyi.freebsd.org (Postfix) with ESMTPS id E7A0213C10; Thu, 25 Jan 2018 23:38:05 +0000 (UTC) (envelope-from jkim@FreeBSD.org) Received: from repo.freebsd.org ([127.0.1.37]) by repo.freebsd.org (8.15.2/8.15.2) with ESMTP id w0PNc5lb057769; Thu, 25 Jan 2018 23:38:05 GMT (envelope-from jkim@FreeBSD.org) Received: (from jkim@localhost) by repo.freebsd.org (8.15.2/8.15.2/Submit) id w0PNc5Qc057768; Thu, 25 Jan 2018 23:38:05 GMT (envelope-from jkim@FreeBSD.org) Message-Id: <201801252338.w0PNc5Qc057768@repo.freebsd.org> X-Authentication-Warning: repo.freebsd.org: jkim set sender to jkim@FreeBSD.org using -f From: Jung-uk Kim Date: Thu, 25 Jan 2018 23:38:05 +0000 (UTC) To: src-committers@freebsd.org, svn-src-all@freebsd.org, svn-src-head@freebsd.org Subject: svn commit: r328419 - head/crypto/openssl/ssl X-SVN-Group: head X-SVN-Commit-Author: jkim X-SVN-Commit-Paths: head/crypto/openssl/ssl X-SVN-Commit-Revision: 328419 X-SVN-Commit-Repository: base MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit X-BeenThere: svn-src-all@freebsd.org X-Mailman-Version: 2.1.25 Precedence: list List-Id: "SVN commit messages for the entire src tree \(except for " user" and " projects" \)" List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Thu, 25 Jan 2018 23:38:06 -0000 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