From: John Fitzgibbon <john_fitzgibbon@yahoo.com>
Date: Mon, 18 Aug 2014 21:55:19 +0000 (-0400)
Subject: RT2724: Remove extra declaration
X-Git-Tag: OpenSSL_1_0_2-beta3~92
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=383f0e349f0516440a37db29a6b81b8f6c49207f;p=oweals%2Fopenssl.git

RT2724: Remove extra declaration

Extra SSL_get_selected_srtp_profile() declaration in ssl/srtp.h
causes -Werror builds to fail.

Cherry-picked from 3609b02305c3678525930ff9bacb566c0122ea2a

Reviewed-by: Tim Hudson <tjh@openssl.org>
---

diff --git a/ssl/srtp.h b/ssl/srtp.h
index c0cf33ef28..ae364d0ff9 100644
--- a/ssl/srtp.h
+++ b/ssl/srtp.h
@@ -132,7 +132,6 @@ 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);