projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
0a64a86
)
RT2724: Remove extra declaration
author
John Fitzgibbon
<john_fitzgibbon@yahoo.com>
Mon, 18 Aug 2014 21:55:19 +0000
(17:55 -0400)
committer
Rich Salz
<rsalz@akamai.com>
Tue, 26 Aug 2014 20:55:54 +0000
(16:55 -0400)
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>
ssl/srtp.h
patch
|
blob
|
history
diff --git
a/ssl/srtp.h
b/ssl/srtp.h
index c0cf33ef288c7bce0814da8289e7438d1c96f58f..ae364d0ff9e9d795705944d7614c8dc775dfd7aa 100644
(file)
--- 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);