summaryrefslogtreecommitdiffstats
path: root/ssl
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2014-10-15 01:23:07 +0100
committerGeoff Thorpe <geoff@openssl.org>2014-10-15 08:56:16 -0400
commit3dd814ac4d0581af363068e83b5fa8d5271063d5 (patch)
treebeb2d6e3f6b57e11c0f178de840c596e60fc5943 /ssl
parente659eff2c0ac6da05dd968a9354c9a69ca7f57b4 (diff)
Fix SRTP compile issues for windows
Related to CVE-2014-3513 This fix was developed by the OpenSSL Team Reviewed-by: Tim Hudson <tjh@openssl.org> Conflicts: util/mkdef.pl util/ssleay.num
Diffstat (limited to 'ssl')
-rw-r--r--ssl/srtp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/ssl/srtp.h b/ssl/srtp.h
index ae364d0ff9..dfdab0ed82 100644
--- a/ssl/srtp.h
+++ b/ssl/srtp.h
@@ -130,12 +130,16 @@ extern "C" {
#define SRTP_NULL_SHA1_80 0x0005
#define SRTP_NULL_SHA1_32 0x0006
+#ifndef OPENSSL_NO_SRTP
+
int SSL_CTX_set_tlsext_use_srtp(SSL_CTX *ctx, const char *profiles);
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
+
#ifdef __cplusplus
}
#endif