libjingle-srtp2.patch

   1 --- libjingle-0.6.14/configure.ac.orig  2021-03-02 21:47:58.773423197 +0100
   2 +++ libjingle-0.6.14/configure.ac       2021-03-02 22:12:18.325516125 +0100
   3 @@ -64,7 +64,10 @@
   4    fi
   5  fi
   6
   7 +PKG_CHECK_MODULES(LIBSRTP, libsrtp2 >= 2, [enable_srtp=yes
   8 +AC_DEFINE([HAVE_SRTP2], [1], [SRTP is SRTP2])], [
   9  PKG_CHECK_MODULES(LIBSRTP, libsrtp >= 1.4.4, enable_srtp=yes, enable_srtp=no)
  10 +])
  11  if test x$enable_srtp = xno ; then
  12          HAVE_SRTP=no
  13  else
  14 --- libjingle-0.6.14/talk/session/phone/srtpfilter.cc.orig      2012-02-28 16:22:42.000000000 +0100
  15 +++ libjingle-0.6.14/talk/session/phone/srtpfilter.cc   2021-03-03 06:46:37.868335637 +0100
  16 @@ -26,6 +26,7 @@
  17   */
  18
  19  #undef HAVE_CONFIG_H
  20 +#include "config.h"
  21
  22  #include "talk/session/phone/srtpfilter.h"
  23
  24 @@ -42,11 +43,18 @@
  25  // #define SRTP_DEBUG
  26
  27  #ifdef HAVE_SRTP
  28 -#ifdef SRTP_RELATIVE_PATH
  29 -#include "srtp.h"  // NOLINT
  30 +#ifdef HAVE_SRTP2
  31 +#include <srtp2/srtp.h>
  32 +#define err_status_ok srtp_err_status_ok
  33 +#define err_status_auth_fail srtp_err_status_auth_fail
  34 +#define err_status_replay_fail srtp_err_status_replay_fail
  35 +#define err_status_replay_old srtp_err_status_replay_old
  36 +#define crypto_policy_set_aes_cm_128_hmac_sha1_32 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_32
  37 +#define crypto_policy_set_aes_cm_128_hmac_sha1_80 srtp_crypto_policy_set_aes_cm_128_hmac_sha1_80
  38 +#define ssrc_type_t srtp_ssrc_type_t
  39  #else
  40 -#include "third_party/libsrtp/include/srtp.h"
  41 -#endif  // SRTP_RELATIVE_PATH
  42 +#include <srtp.h>
  43 +#endif  // HAVE_SRTP2
  44  #ifdef _DEBUG
  45  extern "C" debug_module_t mod_srtp;
  46  extern "C" debug_module_t mod_auth;
  47 --- libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in.orig    2021-03-02 22:14:51.918017377 +0100
  48 +++ libjingle-0.6.14/pkgconfig/jinglesessionphone.pc.in 2021-03-02 22:31:17.589344203 +0100
  49 @@ -7,6 +7,6 @@
  50  Description: Jingle Session Phone Library
  51  Requires:
  52  Version: @VERSION@
  53 -Libs: -L${libdir} -lpthread -ljinglesessionphone -lsrtp
  54 +Libs: -L${libdir} -lpthread -ljinglesessionphone @LIBSRTP_LIBS@
  55  Cflags: -I${includedir}/libjingle-@LIBJINGLE_MAJORMINOR@ -DPOSIX
  56
  57 --- libjingle-0.6.14/talk/session/phone/srtpfilter.h.orig       2012-02-28 16:22:42.000000000 +0100
  58 +++ libjingle-0.6.14/talk/session/phone/srtpfilter.h    2021-03-03 19:25:24.358364152 +0100
  59 @@ -41,8 +41,8 @@
  60
  61  // Forward declaration to avoid pulling in libsrtp headers here
  62  struct srtp_event_data_t;
  63 -struct srtp_ctx_t;
  64 -typedef srtp_ctx_t* srtp_t;
  65 +struct srtp_ctx_t_;
  66 +typedef srtp_ctx_t_* srtp_t;
  67  struct srtp_policy_t;
  68
  69  namespace cricket {