Force -t on in TESTonce.

[tcpdump] / print-esp.c

diff --git a/print-esp.c b/print-esp.c
index 247796da8426ed64b243f280607bcd957b5d121e..375075a3e53419c9ba3a927deff56c01048ef0b9 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -21,6 +21,8 @@
  * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE.
  */
 
+/* \summary: IPSEC Encapsulating Security Payload (ESP) printer */
+
 #ifdef HAVE_CONFIG_H
 #include "config.h"
 #endif
@@ -117,6 +119,32 @@ struct sa_list {
        int             secretlen;
 };
 
+#ifndef HAVE_EVP_CIPHER_CTX_NEW
+/*
+ * Allocate an EVP_CIPHER_CTX.
+ * Used if we have an older version of OpenSSL that doesn't provide
+ * routines to allocate and free them.
+ */
+static EVP_CIPHER_CTX *
+EVP_CIPHER_CTX_new(void)
+{
+       EVP_CIPHER_CTX *ctx;
+
+       ctx = malloc(sizeof(*ctx));
+       if (ctx == NULL)
+               return (NULL);
+       memset(ctx, 0, sizeof(*ctx));
+       return (ctx);
+}
+
+static void
+EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx)
+{
+       EVP_CIPHER_CTX_cleanup(ctx);
+       free(ctx);
+}
+#endif
+
 /*
  * this will adjust ndo_packetp and ndo_snapend to new buffer!
  */
@@ -129,7 +157,7 @@ int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo,
        struct sa_list *sa;
        const u_char *iv;
        int len;
-       EVP_CIPHER_CTX ctx;
+       EVP_CIPHER_CTX *ctx;
 
        /* initiator arg is any non-zero value */
        if(initiator) initiator=1;
@@ -157,12 +185,14 @@ int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo,
 
        if(end <= buf) return 0;
 
-       memset(&ctx, 0, sizeof(ctx));
-       if (EVP_CipherInit(&ctx, sa->evp, sa->secret, NULL, 0) < 0)
+       ctx = EVP_CIPHER_CTX_new();
+       if (ctx == NULL)
+               return 0;
+       if (EVP_CipherInit(ctx, sa->evp, sa->secret, NULL, 0) < 0)
                (*ndo->ndo_warning)(ndo, "espkey init failed");
-       EVP_CipherInit(&ctx, NULL, NULL, iv, 0);
-       EVP_Cipher(&ctx, buf, buf, len);
-       EVP_CIPHER_CTX_cleanup(&ctx);
+       EVP_CipherInit(ctx, NULL, NULL, iv, 0);
+       EVP_Cipher(ctx, buf, buf, len);
+       EVP_CIPHER_CTX_free(ctx);
 
        ndo->ndo_packetp = buf;
        ndo->ndo_snapend = end;
@@ -435,8 +465,9 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
 
                secretfile = fopen(filename, FOPEN_READ_TXT);
                if (secretfile == NULL) {
-                       perror(filename);
-                       exit(3);
+                       (*ndo->ndo_error)(ndo, "print_esp: can't open %s: %s\n",
+                           filename, strerror(errno));
+                       return;
                }
 
                while (fgets(fileline, sizeof(fileline)-1, secretfile) != NULL) {
@@ -501,8 +532,14 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line,
 USES_APPLE_DEPRECATED_API
 static void esp_init(netdissect_options *ndo _U_)
 {
-
+       /*
+        * 0.9.6 doesn't appear to define OPENSSL_API_COMPAT, so
+        * we check whether it's undefined or it's less than the
+        * value for 1.1.0.
+        */
+#if !defined(OPENSSL_API_COMPAT) || OPENSSL_API_COMPAT < 0x10100000L
        OpenSSL_add_all_algorithms();
+#endif
        EVP_add_cipher_alias(SN_des_ede3_cbc, "3des");
 }
 USES_APPLE_RST
@@ -568,7 +605,7 @@ esp_print(netdissect_options *ndo,
        int ivlen = 0;
        const u_char *ivoff;
        const u_char *p;
-       EVP_CIPHER_CTX ctx;
+       EVP_CIPHER_CTX *ctx;
 #endif
 
        esp = (const struct newesp *)bp;
@@ -672,15 +709,18 @@ esp_print(netdissect_options *ndo,
        ep = ep - sa->authlen;
 
        if (sa->evp) {
-               memset(&ctx, 0, sizeof(ctx));
-               if (EVP_CipherInit(&ctx, sa->evp, secret, NULL, 0) < 0)
-                       (*ndo->ndo_warning)(ndo, "espkey init failed");
-
-               p = ivoff;
-               EVP_CipherInit(&ctx, NULL, NULL, p, 0);
-               EVP_Cipher(&ctx, p + ivlen, p + ivlen, ep - (p + ivlen));
-               EVP_CIPHER_CTX_cleanup(&ctx);
-               advance = ivoff - (const u_char *)esp + ivlen;
+               ctx = EVP_CIPHER_CTX_new();
+               if (ctx != NULL) {
+                       if (EVP_CipherInit(ctx, sa->evp, secret, NULL, 0) < 0)
+                               (*ndo->ndo_warning)(ndo, "espkey init failed");
+
+                       p = ivoff;
+                       EVP_CipherInit(ctx, NULL, NULL, p, 0);
+                       EVP_Cipher(ctx, p + ivlen, p + ivlen, ep - (p + ivlen));
+                       EVP_CIPHER_CTX_free(ctx);
+                       advance = ivoff - (const u_char *)esp + ivlen;
+               } else
+                       advance = sizeof(struct newesp);
        } else
                advance = sizeof(struct newesp);