generic-library/webrtc
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Update libsrtp includes in preparation of roll into Chromium.

Browse Source 
This CL is in preparation to roll the libsrtp update which landed in
https://codereview.chromium.org/936663005/ into Chromium.

BUG=https://code.google.com/p/chromium/issues/detail?id=328475
R=juberti@webrtc.org

Review URL: https://webrtc-codereview.appspot.com/40209004

Cr-Commit-Position: refs/heads/master@{#8838}
git-svn-id: http://webrtc.googlecode.com/svn/trunk@8838 4adac7df-926f-26a2-2b94-8c16560cd09d
This commit is contained in:
jiayl@webrtc.org 2015-03-23 22:11:49 +00:00
parent a3ffc56cee
commit a197a5eed6
4 changed files with 17 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
talk/session/media/externalhmac.cc
View File

@ -31,11 +31,15 @@
#include <stdlib.h> // For malloc/free. #include <stdlib.h> // For malloc/free.
extern "C" {
#ifdef SRTP_RELATIVE_PATH #ifdef SRTP_RELATIVE_PATH
#include "srtp.h" // NOLINT #include "srtp.h" // NOLINT
#include "crypto_kernel.h" // NOLINT
#else #else
#include "third_party/libsrtp/include/srtp.h" #include "third_party/libsrtp/srtp/include/srtp.h"
#include "third_party/libsrtp/srtp/crypto/include/crypto_kernel.h"
#endif // SRTP_RELATIVE_PATH #endif // SRTP_RELATIVE_PATH
}
#include "webrtc/base/logging.h" #include "webrtc/base/logging.h"

4
talk/session/media/externalhmac.h
View File

@ -47,11 +47,13 @@
#if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH) #if defined(HAVE_SRTP) && defined(ENABLE_EXTERNAL_AUTH)
#include "webrtc/base/basictypes.h" #include "webrtc/base/basictypes.h"
extern "C" {
#ifdef SRTP_RELATIVE_PATH #ifdef SRTP_RELATIVE_PATH
#include "auth.h" // NOLINT #include "auth.h" // NOLINT
#else #else
#include "third_party/libsrtp/crypto/include/auth.h" #include "third_party/libsrtp/srtp/crypto/include/auth.h"
#endif // SRTP_RELATIVE_PATH #endif // SRTP_RELATIVE_PATH
}
#define EXTERNAL_HMAC_SHA1 HMAC_SHA1 + 1 #define EXTERNAL_HMAC_SHA1 HMAC_SHA1 + 1
#define HMAC_KEY_LENGTH 20 #define HMAC_KEY_LENGTH 20

8
talk/session/media/srtpfilter.cc
View File

@ -43,15 +43,15 @@
// #define SRTP_DEBUG // #define SRTP_DEBUG
#ifdef HAVE_SRTP #ifdef HAVE_SRTP
extern "C" {
#ifdef SRTP_RELATIVE_PATH #ifdef SRTP_RELATIVE_PATH
#include "srtp.h" // NOLINT #include "srtp.h" // NOLINT
extern "C" srtp_stream_t srtp_get_stream(srtp_t srtp, uint32_t ssrc);
#include "srtp_priv.h" // NOLINT #include "srtp_priv.h" // NOLINT
#else #else
#include "third_party/libsrtp/include/srtp.h" #include "third_party/libsrtp/srtp/include/srtp.h"
extern "C" srtp_stream_t srtp_get_stream(srtp_t srtp, uint32_t ssrc); #include "third_party/libsrtp/srtp/include/srtp_priv.h"
#include "third_party/libsrtp/include/srtp_priv.h"
#endif // SRTP_RELATIVE_PATH #endif // SRTP_RELATIVE_PATH
}
#ifdef ENABLE_EXTERNAL_AUTH #ifdef ENABLE_EXTERNAL_AUTH
#include "talk/session/media/externalhmac.h" #include "talk/session/media/externalhmac.h"
#endif // ENABLE_EXTERNAL_AUTH #endif // ENABLE_EXTERNAL_AUTH

6
talk/session/media/srtpfilter_unittest.cc
View File

@ -32,11 +32,15 @@
#include "webrtc/base/byteorder.h" #include "webrtc/base/byteorder.h"
#include "webrtc/base/gunit.h" #include "webrtc/base/gunit.h"
#include "webrtc/base/thread.h" #include "webrtc/base/thread.h"
extern "C" {
#ifdef SRTP_RELATIVE_PATH #ifdef SRTP_RELATIVE_PATH
#include "crypto/include/err.h" #include "crypto/include/err.h"
#include "crypto/include/datatypes.h"
#else #else
#include "third_party/libsrtp/crypto/include/err.h" #include "third_party/libsrtp/srtp/crypto/include/err.h"
#include "third_party/libsrtp/srtp/crypto/include/datatypes.h"
#endif #endif
}
using cricket::CS_AES_CM_128_HMAC_SHA1_80; using cricket::CS_AES_CM_128_HMAC_SHA1_80;
using cricket::CS_AES_CM_128_HMAC_SHA1_32; using cricket::CS_AES_CM_128_HMAC_SHA1_32;