summaryrefslogtreecommitdiffstats
path: root/crypto/openssl/ssl/srtp.h
diff options
context:
space:
mode:
authorjkim <jkim@FreeBSD.org>2014-10-15 19:59:43 +0000
committerjkim <jkim@FreeBSD.org>2014-10-15 19:59:43 +0000
commit0b5b22505e1ef2430c5c6add5faa65f35be97ad4 (patch)
tree97eced83822374c92f4921f85ffbe3d7a5208843 /crypto/openssl/ssl/srtp.h
parent44cc4e9f2029f7ca83413a801230adbf8e00915d (diff)
downloadFreeBSD-src-0b5b22505e1ef2430c5c6add5faa65f35be97ad4.zip
FreeBSD-src-0b5b22505e1ef2430c5c6add5faa65f35be97ad4.tar.gz
MFC: r273144, r273146
Merge OpenSSL 1.0.1j. Relnotes: yes
Diffstat (limited to 'crypto/openssl/ssl/srtp.h')
-rw-r--r--crypto/openssl/ssl/srtp.h4
1 files changed, 4 insertions, 0 deletions
diff --git a/crypto/openssl/ssl/srtp.h b/crypto/openssl/ssl/srtp.h
index 1e9ed3a..fe5217e 100644
--- a/crypto/openssl/ssl/srtp.h
+++ b/crypto/openssl/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);
SRTP_PROTECTION_PROFILE *SSL_get_selected_srtp_profile(SSL *s);
STACK_OF(SRTP_PROTECTION_PROFILE) *SSL_get_srtp_profiles(SSL *ssl);
+#endif
+
#ifdef __cplusplus
}
#endif
OpenPOWER on IntegriCloud