diff options
| author | miod <> | 2014-04-13 15:16:40 +0000 |
|---|---|---|
| committer | miod <> | 2014-04-13 15:16:40 +0000 |
| commit | 52628ee3f51f011b463aaedb1a28aa0524b43cb3 (patch) | |
| tree | 4bd2adeac981051908ec5756401424bbb4e57d6a /src/lib/libssl/d1_srtp.c | |
| parent | 40c22d3625a3818690c889ed6216fedf2be522c9 (diff) | |
| download | openbsd-52628ee3f51f011b463aaedb1a28aa0524b43cb3.tar.gz openbsd-52628ee3f51f011b463aaedb1a28aa0524b43cb3.tar.bz2 openbsd-52628ee3f51f011b463aaedb1a28aa0524b43cb3.zip | |
Import OpenSSL 1.0.1g
Diffstat (limited to '')
| -rw-r--r-- | src/lib/libssl/d1_srtp.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/src/lib/libssl/d1_srtp.c b/src/lib/libssl/d1_srtp.c index 928935bd8b..ab9c41922c 100644 --- a/src/lib/libssl/d1_srtp.c +++ b/src/lib/libssl/d1_srtp.c | |||
| @@ -115,11 +115,12 @@ | |||
| 115 | Copyright (C) 2011, RTFM, Inc. | 115 | Copyright (C) 2011, RTFM, Inc. |
| 116 | */ | 116 | */ |
| 117 | 117 | ||
| 118 | #ifndef OPENSSL_NO_SRTP | ||
| 119 | |||
| 120 | #include <stdio.h> | 118 | #include <stdio.h> |
| 121 | #include <openssl/objects.h> | 119 | #include <openssl/objects.h> |
| 122 | #include "ssl_locl.h" | 120 | #include "ssl_locl.h" |
| 121 | |||
| 122 | #ifndef OPENSSL_NO_SRTP | ||
| 123 | |||
| 123 | #include "srtp.h" | 124 | #include "srtp.h" |
| 124 | 125 | ||
| 125 | 126 | ||