<p>Joshua Colp <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/8503">View Change</a></p><div style="white-space:pre-wrap">Approvals:
  George Joseph: Looks good to me, but someone else must approve
  Joshua Colp: Looks good to me, approved; Approved for Submit

</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_srtp: Add support for libsrtp2.x on openSUSE.<br><br>Since ASTERISK-26976, libSRTP 2.x can be used for sRTP. However, that change<br>added a private header which is not available on openSUSE for example. To<br>remain compatibility with very old libSRTP versions, the affected/missing<br>symbols AES_128_ICM and HMAC_SHA1 are defined manually.<br><br>ASTERISK-27733<br><br>Change-Id: I25c5cb8fa966043d1506ebef449e5a724412b4b6<br>---<br>M res/res_srtp.c<br>M res/srtp/srtp_compat.h<br>2 files changed, 2 insertions(+), 7 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/res_srtp.c b/res/res_srtp.c<br>index 773d533..f3f8999 100644<br>--- a/res/res_srtp.c<br>+++ b/res/res_srtp.c<br>@@ -41,7 +41,6 @@<br> <br> #if HAVE_SRTP_VERSION > 1<br> # include <srtp2/srtp.h><br>-# include <srtp2/crypto_types.h><br> # include "srtp/srtp_compat.h"<br> # include <openssl/rand.h><br> #else<br>diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h<br>index bf42082..a7f94c6 100644<br>--- a/res/srtp/srtp_compat.h<br>+++ b/res/srtp/srtp_compat.h<br>@@ -5,12 +5,8 @@<br> <br> #define crypto_policy_t srtp_crypto_policy_t<br> <br>-#if defined(SRTP_AES_ICM_128)<br>-#define AES_128_ICM SRTP_AES_ICM_128<br>-#else<br>-#define AES_128_ICM SRTP_AES_ICM<br>-#endif<br>-#define HMAC_SHA1 SRTP_HMAC_SHA1<br>+#define AES_128_ICM 1<br>+#define HMAC_SHA1 3<br> <br> #define err_status_t srtp_err_status_t<br> #define err_status_ok srtp_err_status_ok<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/8503">change 8503</a>. To unsubscribe, visit <a href="https://gerrit.asterisk.org/settings">settings</a>.</p><div itemscope itemtype="http://schema.org/EmailMessage"><div itemscope itemprop="action" itemtype="http://schema.org/ViewAction"><link itemprop="url" href="https://gerrit.asterisk.org/8503"/><meta itemprop="name" content="View Change"/></div></div>

<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 13 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I25c5cb8fa966043d1506ebef449e5a724412b4b6 </div>
<div style="display:none"> Gerrit-Change-Number: 8503 </div>
<div style="display:none"> Gerrit-PatchSet: 1 </div>
<div style="display:none"> Gerrit-Owner: Alexander Traud <pabstraud@compuserve.com> </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>