summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorjsing <>2015-09-01 15:18:23 +0000
committerjsing <>2015-09-01 15:18:23 +0000
commit5b40f63e9e5315b8e0dc705f2895c933a8a7cf3e (patch)
treefd8feac43621817aaf6c996d242494f06d635887
parent129b7e769281e2202a11fd7d8054118c56e13abf (diff)
downloadopenbsd-5b40f63e9e5315b8e0dc705f2895c933a8a7cf3e.tar.gz
openbsd-5b40f63e9e5315b8e0dc705f2895c933a8a7cf3e.tar.bz2
openbsd-5b40f63e9e5315b8e0dc705f2895c933a8a7cf3e.zip
Remove duplicate prototype for SSL_get_selected_srtp_profile().
From Aaron Burghardt.
Diffstat (limited to '')
-rw-r--r--src/lib/libssl/src/ssl/srtp.h3
-rw-r--r--src/lib/libssl/srtp.h3
2 files changed, 2 insertions, 4 deletions
diff --git a/src/lib/libssl/src/ssl/srtp.h b/src/lib/libssl/src/ssl/srtp.h
index 051a254034..6daa02a791 100644
--- a/src/lib/libssl/src/ssl/srtp.h
+++ b/src/lib/libssl/src/ssl/srtp.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: srtp.h,v 1.5 2014/12/14 15:30:50 jsing Exp $ */ 1/* $OpenBSD: srtp.h,v 1.6 2015/09/01 15:18:23 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -131,7 +131,6 @@ extern "C" {
131 131
132int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles); 132int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
133int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles); 133int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
134SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
135 134
136STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl); 135STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
137SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); 136SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
diff --git a/src/lib/libssl/srtp.h b/src/lib/libssl/srtp.h
index 051a254034..6daa02a791 100644
--- a/src/lib/libssl/srtp.h
+++ b/src/lib/libssl/srtp.h
@@ -1,4 +1,4 @@
1/* $OpenBSD: srtp.h,v 1.5 2014/12/14 15:30:50 jsing Exp $ */ 1/* $OpenBSD: srtp.h,v 1.6 2015/09/01 15:18:23 jsing Exp $ */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) 2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved. 3 * All rights reserved.
4 * 4 *
@@ -131,7 +131,6 @@ extern "C" {
131 131
132int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles); 132int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
133int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles); 133int SSL_set_tlsext_use_srtp(SSL *ctx, const char *profiles);
134SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
135 134
136STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl); 135STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
137SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s); 136SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);