[Asterisk-code-review] res srtp: Add support for libsrtp2.x on openSUSE. (asterisk[13])

[Joshua Colp]

Joshua Colp has submitted this change and it was merged. ( https://gerrit.asterisk.org/8503 )

Change subject: res_srtp: Add support for libsrtp2.x on openSUSE.
......................................................................

res_srtp: Add support for libsrtp2.x on openSUSE.

Since ASTERISK-26976, libSRTP 2.x can be used for sRTP. However, that change
added a private header which is not available on openSUSE for example. To
remain compatibility with very old libSRTP versions, the affected/missing
symbols AES_128_ICM and HMAC_SHA1 are defined manually.

ASTERISK-27733

Change-Id: I25c5cb8fa966043d1506ebef449e5a724412b4b6
---
M res/res_srtp.c
M res/srtp/srtp_compat.h
2 files changed, 2 insertions(+), 7 deletions(-)

Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Approved for Submit



diff --git a/res/res_srtp.c b/res/res_srtp.c
index 773d533..f3f8999 100644
--- a/res/res_srtp.c
+++ b/res/res_srtp.c
@@ -41,7 +41,6 @@
 
 #if HAVE_SRTP_VERSION > 1
 # include <srtp2/srtp.h>
-# include <srtp2/crypto_types.h>
 # include "srtp/srtp_compat.h"
 # include <openssl/rand.h>
 #else
diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h
index bf42082..a7f94c6 100644
--- a/res/srtp/srtp_compat.h
+++ b/res/srtp/srtp_compat.h
@@ -5,12 +5,8 @@
 
 #define crypto_policy_t srtp_crypto_policy_t
 
-#if defined(SRTP_AES_ICM_128)
-#define AES_128_ICM SRTP_AES_ICM_128
-#else
-#define AES_128_ICM SRTP_AES_ICM
-#endif
-#define HMAC_SHA1 SRTP_HMAC_SHA1
+#define AES_128_ICM 1
+#define HMAC_SHA1 3
 
 #define err_status_t srtp_err_status_t
 #define err_status_ok srtp_err_status_ok

-- 
To view, visit https://gerrit.asterisk.org/8503
To unsubscribe, visit https://gerrit.asterisk.org/settings

Gerrit-Project: asterisk
Gerrit-Branch: 13
Gerrit-MessageType: merged
Gerrit-Change-Id: I25c5cb8fa966043d1506ebef449e5a724412b4b6
Gerrit-Change-Number: 8503
Gerrit-PatchSet: 1
Gerrit-Owner: Alexander Traud <pabstraud at compuserve.com>
Gerrit-Reviewer: George Joseph <gjoseph at digium.com>
Gerrit-Reviewer: Jenkins2
Gerrit-Reviewer: Joshua Colp <jcolp at digium.com>
-------------- next part --------------
An HTML attachment was scrubbed...
URL: <http://lists.digium.com/pipermail/asterisk-code-review/attachments/20180314/ca48992e/attachment.html>