<p>Joshua Colp <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/18741">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Joshua Colp: Looks good to me, but someone else must approve; Approved for Submit
George Joseph: Looks good to me, approved
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">chan_iax2: Allow compiling without OpenSSL.<br><br>ASTERISK_30007 accidentally made OpenSSL a<br>required depdendency. This adds an ifdef so<br>the relevant code is compiled only if OpenSSL<br>is available, since it only needs to be executed<br>if OpenSSL is available anyways.<br><br>ASTERISK-30083 #close<br><br>Change-Id: Iad05c1a9a8bd2a48e7edf8d234eaa9f80779e34d<br>---<br>M channels/chan_iax2.c<br>1 file changed, 4 insertions(+), 0 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/channels/chan_iax2.c b/channels/chan_iax2.c</span><br><span>index 210c344..6ff1896 100644</span><br><span>--- a/channels/chan_iax2.c</span><br><span>+++ b/channels/chan_iax2.c</span><br><span>@@ -6381,6 +6381,7 @@</span><br><span> </span><br><span> static int invalid_key(ast_aes_decrypt_key *ecx)</span><br><span> {</span><br><span style="color: hsl(120, 100%, 40%);">+#ifdef HAVE_OPENSSL</span><br><span> int i;</span><br><span> for (i = 0; i < 60; i++) {</span><br><span> if (ecx->rd_key[i]) {</span><br><span>@@ -6389,6 +6390,9 @@</span><br><span> }</span><br><span> /* if ast_aes_encrypt or ast_aes_decrypt is called, then we'll crash when calling AES_encrypt or AES_decrypt */</span><br><span> return -1;</span><br><span style="color: hsl(120, 100%, 40%);">+#else</span><br><span style="color: hsl(120, 100%, 40%);">+ return 0; /* Can't verify, but doesn't matter anyways */</span><br><span style="color: hsl(120, 100%, 40%);">+#endif</span><br><span> }</span><br><span> </span><br><span> static void build_encryption_keys(const unsigned char *digest, struct chan_iax2_pvt *pvt)</span><br><span></span><br></pre><div style="white-space:pre-wrap"></div><p>To view, visit <a href="https://gerrit.asterisk.org/c/asterisk/+/18741">change 18741</a>. To unsubscribe, or for help writing mail filters, 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/c/asterisk/+/18741"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 19 </div>
<div style="display:none"> Gerrit-Change-Id: Iad05c1a9a8bd2a48e7edf8d234eaa9f80779e34d </div>
<div style="display:none"> Gerrit-Change-Number: 18741 </div>
<div style="display:none"> Gerrit-PatchSet: 3 </div>
<div style="display:none"> Gerrit-Owner: N A <mail@interlinked.x10host.com> </div>
<div style="display:none"> Gerrit-Reviewer: Friendly Automation </div>
<div style="display:none"> Gerrit-Reviewer: George Joseph <gjoseph@digium.com> </div>
<div style="display:none"> Gerrit-Reviewer: Joshua Colp <jcolp@sangoma.com> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>