<p>Friendly Automation <strong>submitted</strong> this change.</p><p><a href="https://gerrit.asterisk.org/c/asterisk/+/17900">View Change</a></p><div style="white-space:pre-wrap">Approvals:
Sean Bright: Looks good to me, but someone else must approve
George Joseph: Looks good to me, approved
Friendly Automation: Approved for Submit
</div><pre style="font-family: monospace,monospace; white-space: pre-wrap;">include: Remove unimplemented HMAC declarations<br><br>Remove the HMAC declarations from the includes. They are<br>not implemented nor used anywhere, and their presence breaks the build<br>on NetBSD that delivers an incompatible hmac() function in <stdlib.h>.<br><br>ASTERISK-29818<br><br>Change-Id: I0c4b88645e30174b1b63846a6b328625b69c2ea7<br>---<br>M include/asterisk/sha1.h<br>1 file changed, 0 insertions(+), 57 deletions(-)<br><br></pre><pre style="font-family: monospace,monospace; white-space: pre-wrap;"><span>diff --git a/include/asterisk/sha1.h b/include/asterisk/sha1.h</span><br><span>index 071693e..c88fd2e 100644</span><br><span>--- a/include/asterisk/sha1.h</span><br><span>+++ b/include/asterisk/sha1.h</span><br><span>@@ -294,63 +294,6 @@</span><br><span> extern int USHAHashSizeBits(enum SHAversion whichSha);</span><br><span> extern const char *USHAHashName(enum SHAversion whichSha);</span><br><span> </span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * HMAC Keyed-Hashing for Message Authentication, RFC 2104,</span><br><span style="color: hsl(0, 100%, 40%);">- * for all SHAs.</span><br><span style="color: hsl(0, 100%, 40%);">- * This interface allows a fixed-length text input to be used.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hmac(SHAversion whichSha, /* which SHA algorithm to use */</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *text, /* pointer to data stream */</span><br><span style="color: hsl(0, 100%, 40%);">- int text_len, /* length of data stream */</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *key, /* pointer to authentication key */</span><br><span style="color: hsl(0, 100%, 40%);">- int key_len, /* length of authentication key */</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t digest[USHAMaxHashSize]); /* caller digest to fill in */</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * HMAC Keyed-Hashing for Message Authentication, RFC 2104,</span><br><span style="color: hsl(0, 100%, 40%);">- * for all SHAs.</span><br><span style="color: hsl(0, 100%, 40%);">- * This interface allows any length of text input to be used.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hmacReset(HMACContext *context, enum SHAversion whichSha,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *key, int key_len);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hmacInput(HMACContext *context, const unsigned char *text,</span><br><span style="color: hsl(0, 100%, 40%);">- int text_len);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hmacFinalBits(HMACContext *context, uint8_t bits,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int bit_count);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hmacResult(HMACContext *context,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t digest[USHAMaxHashSize]);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * HKDF HMAC-based Extract-and-Expand Key Derivation Function,</span><br><span style="color: hsl(0, 100%, 40%);">- * RFC 5869, for all SHAs.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hkdf(SHAversion whichSha, const unsigned char *salt,</span><br><span style="color: hsl(0, 100%, 40%);">- int salt_len, const unsigned char *ikm, int ikm_len,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *info, int info_len,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t okm[ ], int okm_len);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hkdfExtract(SHAversion whichSha, const unsigned char *salt,</span><br><span style="color: hsl(0, 100%, 40%);">- int salt_len, const unsigned char *ikm,</span><br><span style="color: hsl(0, 100%, 40%);">- int ikm_len, uint8_t prk[USHAMaxHashSize]);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hkdfExpand(SHAversion whichSha, const uint8_t prk[ ],</span><br><span style="color: hsl(0, 100%, 40%);">- int prk_len, const unsigned char *info,</span><br><span style="color: hsl(0, 100%, 40%);">- int info_len, uint8_t okm[ ], int okm_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span style="color: hsl(0, 100%, 40%);">-/*</span><br><span style="color: hsl(0, 100%, 40%);">- * HKDF HMAC-based Extract-and-Expand Key Derivation Function,</span><br><span style="color: hsl(0, 100%, 40%);">- * RFC 5869, for all SHAs.</span><br><span style="color: hsl(0, 100%, 40%);">- * This interface allows any length of text input to be used.</span><br><span style="color: hsl(0, 100%, 40%);">- */</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hkdfReset(HKDFContext *context, enum SHAversion whichSha,</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *salt, int salt_len);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hkdfInput(HKDFContext *context, const unsigned char *ikm,</span><br><span style="color: hsl(0, 100%, 40%);">- int ikm_len);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hkdfFinalBits(HKDFContext *context, uint8_t ikm_bits,</span><br><span style="color: hsl(0, 100%, 40%);">- unsigned int ikm_bit_count);</span><br><span style="color: hsl(0, 100%, 40%);">-extern int hkdfResult(HKDFContext *context,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t prk[USHAMaxHashSize],</span><br><span style="color: hsl(0, 100%, 40%);">- const unsigned char *info, int info_len,</span><br><span style="color: hsl(0, 100%, 40%);">- uint8_t okm[USHAMaxHashSize], int okm_len);</span><br><span style="color: hsl(0, 100%, 40%);">-</span><br><span> /************************ sha-private.h ************************/</span><br><span> /***************** See RFC 6234 for details. *******************/</span><br><span> /*</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/+/17900">change 17900</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/+/17900"/><meta itemprop="name" content="View Change"/></div></div>
<div style="display:none"> Gerrit-Project: asterisk </div>
<div style="display:none"> Gerrit-Branch: 16 </div>
<div style="display:none"> Gerrit-Change-Id: I0c4b88645e30174b1b63846a6b328625b69c2ea7 </div>
<div style="display:none"> Gerrit-Change-Number: 17900 </div>
<div style="display:none"> Gerrit-PatchSet: 2 </div>
<div style="display:none"> Gerrit-Owner: Sean Bright <sean@seanbright.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: Sean Bright <sean@seanbright.com> </div>
<div style="display:none"> Gerrit-CC: Michał Górny <mgorny@NetBSD.org> </div>
<div style="display:none"> Gerrit-MessageType: merged </div>