X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/fb2479d733dbe8a991d11909b319341f7db62ab1..a63600a1fc28dbc7ae7ce9f996829c49a25fb33c:/signature.c diff --git a/signature.c b/signature.c index 466af01f..77d6e81a 100644 --- a/signature.c +++ b/signature.c @@ -26,6 +26,7 @@ #include "netdissect.h" #include "signature.h" +#include "diag-control.h" #ifdef HAVE_LIBCRYPTO #include @@ -45,7 +46,7 @@ const struct tok signature_check_values[] = { * Compute a HMAC MD5 sum. * Taken from rfc2104, Appendix. */ -USES_APPLE_DEPRECATED_API +DIAG_OFF_DEPRECATION static void signature_compute_hmac_md5(const uint8_t *text, int text_len, unsigned char *key, unsigned int key_len, uint8_t *digest) @@ -81,8 +82,8 @@ signature_compute_hmac_md5(const uint8_t *text, int text_len, unsigned char *key */ /* start out by storing key in pads */ - memset(k_ipad, 0, sizeof k_ipad); - memset(k_opad, 0, sizeof k_opad); + memset(k_ipad, 0, sizeof(k_ipad)); + memset(k_opad, 0, sizeof(k_opad)); memcpy(k_ipad, key, key_len); memcpy(k_opad, key, key_len); @@ -108,7 +109,7 @@ signature_compute_hmac_md5(const uint8_t *text, int text_len, unsigned char *key MD5_Update(&context, digest, 16); /* then results of 1st hash */ MD5_Final(digest, &context); /* finish up 2nd pass */ } -USES_APPLE_RST +DIAG_ON_DEPRECATION /* * Verify a cryptographic signature of the packet. @@ -205,10 +206,3 @@ signature_verify(netdissect_options *ndo _U_, const u_char *pptr _U_, return (CANT_CHECK_SIGNATURE); } #endif - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 4 - * End: - */