Avoiding conditional directives that break statements

[tcpdump] / signature.c

diff --git a/signature.c b/signature.c
index c55645fe2bdf9687239f499cc59420b4fcadf347..18449fc24bc2ff016612e9434dcdec039f1c52f8 100644 (file)
--- a/signature.c
+++ b/signature.c
@@ -1,4 +1,4 @@
-/* 
+/*

  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
  * distributions retain the above copyright notice and this paragraph
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that: (1) source code
  * distributions retain the above copyright notice and this paragraph


@@ -11,24 +11,19 @@
  * FOR A PARTICULAR PURPOSE.
  *
  * Functions for signature and digest verification.
  * FOR A PARTICULAR PURPOSE.
  *
  * Functions for signature and digest verification.

- * 
+ *

  * Original code by Hannes Gredler ([email protected])
  */
 
  * Original code by Hannes Gredler ([email protected])
  */
 

-#ifndef lint
-static const char rcsid[] _U_ =
-    "@(#) $Header: /tcpdump/master/tcpdump/signature.c,v 1.2 2008-09-22 20:22:10 guy Exp $ (LBL)";
-#endif
-

 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
 

-#include <tcpdump-stdinc.h>
+#include <netdissect-stdinc.h>

 
 #include <string.h>
 
 
 #include <string.h>
 

-#include "interface.h"
+#include "netdissect.h"

 #include "signature.h"
 
 #ifdef HAVE_LIBCRYPTO
 #include "signature.h"
 
 #ifdef HAVE_LIBCRYPTO


@@ -48,9 +43,10 @@ const struct tok signature_check_values[] = {
  * Compute a HMAC MD5 sum.
  * Taken from rfc2104, Appendix.
  */
  * Compute a HMAC MD5 sum.
  * Taken from rfc2104, Appendix.
  */

+USES_APPLE_DEPRECATED_API

 static void
 static void

-signature_compute_hmac_md5(const u_int8_t *text, int text_len, unsigned char *key,
-                           unsigned int key_len, u_int8_t *digest)
+signature_compute_hmac_md5(const uint8_t *text, int text_len, unsigned char *key,
+                           unsigned int key_len, uint8_t *digest)

 {
     MD5_CTX context;
     unsigned char k_ipad[65];    /* inner padding - key XORd with ipad */
 {
     MD5_CTX context;
     unsigned char k_ipad[65];    /* inner padding - key XORd with ipad */


@@ -110,6 +106,7 @@ signature_compute_hmac_md5(const u_int8_t *text, int text_len, unsigned char *ke
     MD5_Update(&context, digest, 16);     /* then results of 1st hash */
     MD5_Final(digest, &context);          /* finish up 2nd pass */
 }
     MD5_Update(&context, digest, 16);     /* then results of 1st hash */
     MD5_Final(digest, &context);          /* finish up 2nd pass */
 }

+USES_APPLE_RST

 #endif
 
 #ifdef HAVE_LIBCRYPTO
 #endif
 
 #ifdef HAVE_LIBCRYPTO


@@ -118,10 +115,11 @@ signature_compute_hmac_md5(const u_int8_t *text, int text_len, unsigned char *ke
  * Currently only MD5 is supported.
  */
 int
  * Currently only MD5 is supported.
  */
 int

-signature_verify (const u_char *pptr, u_int plen, u_char *sig_ptr)
+signature_verify(netdissect_options *ndo,
+                 const u_char *pptr, u_int plen, u_char *sig_ptr)

 {
 {

-    u_int8_t rcvsig[16];
-    u_int8_t sig[16];
+    uint8_t rcvsig[16];
+    uint8_t sig[16];

     unsigned int i;
 
     /*
     unsigned int i;
 
     /*


@@ -130,12 +128,12 @@ signature_verify (const u_char *pptr, u_int plen, u_char *sig_ptr)
     memcpy(rcvsig, sig_ptr, sizeof(rcvsig));
     memset(sig_ptr, 0, sizeof(rcvsig));
 
     memcpy(rcvsig, sig_ptr, sizeof(rcvsig));
     memset(sig_ptr, 0, sizeof(rcvsig));
 

-    if (!sigsecret) {
+    if (!ndo->ndo_sigsecret) {

         return (CANT_CHECK_SIGNATURE);
     }
 
         return (CANT_CHECK_SIGNATURE);
     }
 

-    signature_compute_hmac_md5(pptr, plen, (unsigned char *)sigsecret,
-                               strlen(sigsecret), sig);
+    signature_compute_hmac_md5(pptr, plen, (unsigned char *)ndo->ndo_sigsecret,
+                               strlen(ndo->ndo_sigsecret), sig);

 
     if (memcmp(rcvsig, sig, sizeof(sig)) == 0) {
         return (SIGNATURE_VALID);
 
     if (memcmp(rcvsig, sig, sizeof(sig)) == 0) {
         return (SIGNATURE_VALID);


@@ -143,7 +141,7 @@ signature_verify (const u_char *pptr, u_int plen, u_char *sig_ptr)
     } else {
 
         for (i = 0; i < sizeof(sig); ++i) {
     } else {
 
         for (i = 0; i < sizeof(sig); ++i) {

-            (void)printf("%02x", sig[i]);
+            ND_PRINT((ndo, "%02x", sig[i]));

         }
 
         return (SIGNATURE_INVALID);
         }
 
         return (SIGNATURE_INVALID);