icmp: clean up the extension code and comments.

[tcpdump] / print-esp.c

diff --git a/print-esp.c b/print-esp.c
index 61c3e13bffdae2da778ca29f5732f5929a22aaff..1e68c9d76cb6b4d8c8227d55b9e6ac4b5a41140f 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -47,6 +47,8 @@
 #include "netdissect.h"
 #include "extract.h"
 
+#include "diag-control.h"
+
 #ifdef HAVE_LIBCRYPTO
 #include "strtoaddr.h"
 #include "ascii_strcasecmp.h"
@@ -278,7 +280,7 @@ do_decrypt(netdissect_options *ndo, const char *caller, struct sa_list *sa,
  * dissecting anything in it and before it does any dissection of
  * anything in the old buffer.  That will free the new buffer.
  */
-USES_APPLE_DEPRECATED_API
+DIAG_OFF_DEPRECATION
 int esp_decrypt_buffer_by_ikev2_print(netdissect_options *ndo,
                                      int initiator,
                                      const u_char spii[8],
@@ -317,7 +319,7 @@ int esp_decrypt_buffer_by_ikev2_print(netdissect_options *ndo,
 
        if(end <= ct) return 0;
 
-       pt = do_decrypt(ndo, "esp_decrypt_buffer_by_ikev2_print", sa, iv,
+       pt = do_decrypt(ndo, __func__, sa, iv,
            ct, ctlen);
        if (pt == NULL)
                return 0;
@@ -334,10 +336,10 @@ int esp_decrypt_buffer_by_ikev2_print(netdissect_options *ndo,
 
        return 1;
 }
-USES_APPLE_RST
+DIAG_ON_DEPRECATION
 
 static void esp_print_addsa(netdissect_options *ndo,
-                           struct sa_list *sa, int sa_def)
+                           const struct sa_list *sa, int sa_def)
 {
        /* copy the "sa" */
 
@@ -384,10 +386,9 @@ static u_int hex2byte(netdissect_options *ndo, char *hexstring)
 /*
  * returns size of binary, 0 on failure.
  */
-static
-int espprint_decode_hex(netdissect_options *ndo,
-                       u_char *binbuf, unsigned int binbuf_len,
-                       char *hex)
+static int
+espprint_decode_hex(netdissect_options *ndo,
+                   u_char *binbuf, unsigned int binbuf_len, char *hex)
 {
        unsigned int len;
        int i;
@@ -413,7 +414,7 @@ int espprint_decode_hex(netdissect_options *ndo,
  * decode the form:    SPINUM@IP <tab> ALGONAME:0xsecret
  */
 
-USES_APPLE_DEPRECATED_API
+DIAG_OFF_DEPRECATION
 static int
 espprint_decode_encalgo(netdissect_options *ndo,
                        char *decode, struct sa_list *sa)
@@ -478,7 +479,7 @@ espprint_decode_encalgo(netdissect_options *ndo,
 
        return 1;
 }
-USES_APPLE_RST
+DIAG_ON_DEPRECATION
 
 /*
  * for the moment, ignore the auth algorithm, just hard code the authenticator
@@ -670,7 +671,7 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
        esp_print_addsa(ndo, &sa1, sa_def);
 }
 
-USES_APPLE_DEPRECATED_API
+DIAG_OFF_DEPRECATION
 static void esp_init(netdissect_options *ndo _U_)
 {
        /*
@@ -683,7 +684,7 @@ static void esp_init(netdissect_options *ndo _U_)
 #endif
        EVP_add_cipher_alias(SN_des_ede3_cbc, "3des");
 }
-USES_APPLE_RST
+DIAG_ON_DEPRECATION
 
 void esp_decodesecret_print(netdissect_options *ndo)
 {
@@ -720,7 +721,7 @@ void esp_decodesecret_print(netdissect_options *ndo)
 #endif
 
 #ifdef HAVE_LIBCRYPTO
-USES_APPLE_DEPRECATED_API
+DIAG_OFF_DEPRECATION
 #endif
 void
 esp_print(netdissect_options *ndo,
@@ -868,7 +869,7 @@ esp_print(netdissect_options *ndo,
                return;
        }
 
-       pt = do_decrypt(ndo, "esp_print", sa, iv, ct, payloadlen);
+       pt = do_decrypt(ndo, __func__, sa, iv, ct, payloadlen);
        if (pt == NULL)
                return;
 
@@ -920,5 +921,5 @@ esp_print(netdissect_options *ndo,
 #endif
 }
 #ifdef HAVE_LIBCRYPTO
-USES_APPLE_RST
+DIAG_ON_DEPRECATION
 #endif