summaryrefslogtreecommitdiff
path: root/drivers/builtin_openssl2/ssl/d1_srtp.c
diff options
context:
space:
mode:
authorRémi Verschelde <remi@verschelde.fr>2016-04-18 19:21:46 +0200
committerRémi Verschelde <remi@verschelde.fr>2016-04-18 19:21:46 +0200
commit206895afae413df9a3961ce6793ce295babb5920 (patch)
tree0b16a8466e9f0f054176ecfb2fa24a6b942fcec6 /drivers/builtin_openssl2/ssl/d1_srtp.c
parent336cbfa7b63721757874f0fc5c33ec5dd31c5076 (diff)
parente97922f22038e9049ed4c2db5b3736dfaa0edde3 (diff)
Merge pull request #4329 from mrezai/openssl-1.0.2g
Update OpenSSL to version 1.0.2g
Diffstat (limited to 'drivers/builtin_openssl2/ssl/d1_srtp.c')
-rw-r--r--drivers/builtin_openssl2/ssl/d1_srtp.c3
1 files changed, 1 insertions, 2 deletions
diff --git a/drivers/builtin_openssl2/ssl/d1_srtp.c b/drivers/builtin_openssl2/ssl/d1_srtp.c
index 6c6e07ce90..64d0634a38 100644
--- a/drivers/builtin_openssl2/ssl/d1_srtp.c
+++ b/drivers/builtin_openssl2/ssl/d1_srtp.c
@@ -117,11 +117,10 @@
#include <stdio.h>
#include <openssl/objects.h>
#include "ssl_locl.h"
+#include "srtp.h"
#ifndef OPENSSL_NO_SRTP
-# include "srtp.h"
-
static SRTP_PROTECTION_PROFILE srtp_known_profiles[] = {
{
"SRTP_AES128_CM_SHA1_80",