<p>Jenkins2 <strong>merged</strong> this change.</p><p><a href="https://gerrit.asterisk.org/6417">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve
Kevin Harwell: Looks good to me, approved
Jenkins2: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">res_srtp: Add support for libsrtp2.1.<br><br>Asterisk is able to use libSRTP 2.0.x. However since libSRTP 2.1.x, the macro<br>SRTP_AES_ICM got renamed to SRTP_AES_ICM_128. Beside to still compile with<br>previous versions of libSRTP, this change allows libSRTP 2.1.x as well.<br><br>ASTERISK-27253 #close<br><br>Change-Id: I2e6eb3c3bc844fee8a624060a2eb6f182dc70315<br>---<br>M res/srtp/srtp_compat.h<br>1 file changed, 0 insertions(+), 3 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;">diff --git a/res/srtp/srtp_compat.h b/res/srtp/srtp_compat.h<br>index c23daab..56ffca1 100644<br>--- a/res/srtp/srtp_compat.h<br>+++ b/res/srtp/srtp_compat.h<br>@@ -16,9 +16,6 @@<br> #define crypto_policy_set_aes_gcm_128_8_auth srtp_crypto_policy_set_aes_gcm_128_8_auth<br> #define crypto_policy_set_aes_gcm_256_8_auth srtp_crypto_policy_set_aes_gcm_256_8_auth<br> <br>-#define AES_128_ICM SRTP_AES_ICM<br>-#define HMAC_SHA1 SRTP_HMAC_SHA1<br>-<br> #define err_status_t srtp_err_status_t<br> #define err_status_ok srtp_err_status_ok<br> #define err_status_fail srtp_err_status_fail<br></pre><p>To view, visit <a href="https://gerrit.asterisk.org/6417">change 6417</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/6417"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 14 </div>
<div style="display:none"> Gerrit-MessageType: merged </div>
<div style="display:none"> Gerrit-Change-Id: I2e6eb3c3bc844fee8a624060a2eb6f182dc70315 </div>
<div style="display:none"> Gerrit-Change-Number: 6417 </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: Jenkins2 </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Kevin Harwell <kharwell@digium.com> </div>