diff options
Diffstat (limited to 'contrib/tcpdump/signature.c')
| -rw-r--r-- | contrib/tcpdump/signature.c | 26 |
1 files changed, 10 insertions, 16 deletions
diff --git a/contrib/tcpdump/signature.c b/contrib/tcpdump/signature.c index 204e3456e2d4..77d6e81ac3ab 100644 --- a/contrib/tcpdump/signature.c +++ b/contrib/tcpdump/signature.c @@ -16,16 +16,17 @@ */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include <config.h> #endif -#include <netdissect-stdinc.h> +#include "netdissect-stdinc.h" #include <string.h> #include <stdlib.h> #include "netdissect.h" #include "signature.h" +#include "diag-control.h" #ifdef HAVE_LIBCRYPTO #include <openssl/md5.h> @@ -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. @@ -130,7 +131,7 @@ signature_verify(netdissect_options *ndo, const u_char *pptr, u_int plen, /* * Do we have all the packet data to be checked? */ - if (!ND_TTEST2(*pptr, plen)) { + if (!ND_TTEST_LEN(pptr, plen)) { /* No. */ return (CANT_CHECK_SIGNATURE); } @@ -138,7 +139,7 @@ signature_verify(netdissect_options *ndo, const u_char *pptr, u_int plen, /* * Do we have the entire signature to check? */ - if (!ND_TTEST2(*sig_ptr, sizeof(sig))) { + if (!ND_TTEST_LEN(sig_ptr, sizeof(sig))) { /* No. */ return (CANT_CHECK_SIGNATURE); } @@ -190,7 +191,7 @@ signature_verify(netdissect_options *ndo, const u_char *pptr, u_int plen, } else { /* No - print the computed signature. */ for (i = 0; i < sizeof(sig); ++i) { - ND_PRINT((ndo, "%02x", sig[i])); + ND_PRINT("%02x", sig[i]); } return (SIGNATURE_INVALID); @@ -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: - */ |