X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/d6af516cbc7c874404cb07456a6e80a8e9ddd9b4..06df4f81b66c76be479e2dd1e2d18a011410037b:/print-esp.c diff --git a/print-esp.c b/print-esp.c index 78f3253b..52081491 100644 --- a/print-esp.c +++ b/print-esp.c @@ -21,12 +21,13 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#define NETDISSECT_REWORKED +/* \summary: IPSEC Encapsulating Security Payload (ESP) printer */ + #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include +#include #include #include @@ -43,13 +44,14 @@ #endif #endif +#include "netdissect.h" +#include "strtoaddr.h" +#include "extract.h" + +#include "ascii_strcasecmp.h" + #include "ip.h" -#ifdef INET6 #include "ip6.h" -#endif - -#include "interface.h" -#include "extract.h" /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. @@ -85,8 +87,8 @@ */ struct newesp { - u_int32_t esp_spi; /* ESP */ - u_int32_t esp_seq; /* Sequence number */ + uint32_t esp_spi; /* ESP */ + uint32_t esp_seq; /* Sequence number */ /*variable size*/ /* (IV and) Payload data */ /*variable size*/ /* padding */ /*8bit*/ /* pad size */ @@ -98,15 +100,13 @@ struct newesp { #ifdef HAVE_LIBCRYPTO union inaddr_u { struct in_addr in4; -#ifdef INET6 struct in6_addr in6; -#endif }; struct sa_list { struct sa_list *next; u_int daddr_version; union inaddr_u daddr; - u_int32_t spi; /* if == 0, then IKEv2 */ + uint32_t spi; /* if == 0, then IKEv2 */ int initiator; u_char spii[8]; /* for IKEv2 */ u_char spir[8]; @@ -119,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! */ @@ -126,12 +152,13 @@ USES_APPLE_DEPRECATED_API int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo, int initiator, u_char spii[8], u_char spir[8], - u_char *buf, u_char *end) + const u_char *buf, const u_char *end) { struct sa_list *sa; - u_char *iv; - int len; - EVP_CIPHER_CTX ctx; + const u_char *iv; + u_char *buf_mut, *output_buffer; + int len, block_size, cipher_nid, output_buffer_size ; + EVP_CIPHER_CTX *ctx; /* initiator arg is any non-zero value */ if(initiator) initiator=1; @@ -159,18 +186,35 @@ 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); + + /* We need a block size */ + block_size = EVP_CIPHER_CTX_block_size(ctx); + /* We need the buffer size to be multiple of a block size */ + output_buffer_size = len + (block_size - len % block_size); + output_buffer = (u_char *)calloc(output_buffer_size, sizeof(u_char)); + /* EVP_Cipher output buffer should be different from the input one. + * Also it should be of size that is multiple of cipher block size. */ + EVP_Cipher(ctx, output_buffer, buf, len); + EVP_CIPHER_CTX_free(ctx); + + buf_mut = (u_char*) buf; + /* Of course this is wrong, because buf is a const buffer, but changing this + * would require more complicated fix. */ + memcpy(buf_mut, output_buffer, len); + free(output_buffer); ndo->ndo_packetp = buf; ndo->ndo_snapend = end; return 1; + } USES_APPLE_RST @@ -332,8 +376,8 @@ espprint_decode_authalgo(netdissect_options *ndo, } *colon = '\0'; - if(strcasecmp(colon,"sha1") == 0 || - strcasecmp(colon,"md5") == 0) { + if(ascii_strcasecmp(colon,"sha1") == 0 || + ascii_strcasecmp(colon,"md5") == 0) { sa->authlen = 12; } return 1; @@ -427,22 +471,23 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line, } else decode = line; - if (spikey && strcasecmp(spikey, "file") == 0) { + if (spikey && ascii_strcasecmp(spikey, "file") == 0) { /* open file and read it */ FILE *secretfile; char fileline[1024]; - int lineno=0; + int subfile_lineno=0; char *nl; char *filename = 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) { - lineno++; + subfile_lineno++; /* remove newline from the line */ nl = strchr(fileline, '\n'); if (nl) @@ -450,14 +495,14 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line, if (fileline[0] == '#') continue; if (fileline[0] == '\0') continue; - esp_print_decode_onesecret(ndo, fileline, filename, lineno); + esp_print_decode_onesecret(ndo, fileline, filename, subfile_lineno); } fclose(secretfile); return; } - if (spikey && strcasecmp(spikey, "ikev2") == 0) { + if (spikey && ascii_strcasecmp(spikey, "ikev2") == 0) { esp_print_decode_ikeline(ndo, line, file, lineno); return; } @@ -465,7 +510,7 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line, if (spikey) { char *spistr, *foo; - u_int32_t spino; + uint32_t spino; spistr = strsep(&spikey, "@"); @@ -477,17 +522,14 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line, sa1.spi = spino; -#ifdef INET6 - if (inet_pton(AF_INET6, spikey, &sa1.daddr.in6) == 1) { + if (strtoaddr6(spikey, &sa1.daddr.in6) == 1) { sa1.daddr_version = 6; - } else -#endif - if (inet_pton(AF_INET, spikey, &sa1.daddr.in4) == 1) { - sa1.daddr_version = 4; - } else { - (*ndo->ndo_warning)(ndo, "print_esp: can not decode IP# %s\n", spikey); - return; - } + } else if (strtoaddr(spikey, &sa1.daddr.in4) == 1) { + sa1.daddr_version = 4; + } else { + (*ndo->ndo_warning)(ndo, "print_esp: can not decode IP# %s\n", spikey); + return; + } } if (decode) { @@ -506,8 +548,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 @@ -564,21 +612,21 @@ esp_print(netdissect_options *ndo, register const struct newesp *esp; register const u_char *ep; #ifdef HAVE_LIBCRYPTO - struct ip *ip; + const struct ip *ip; struct sa_list *sa = NULL; -#ifdef INET6 - struct ip6_hdr *ip6 = NULL; -#endif + const struct ip6_hdr *ip6 = NULL; int advance; int len; u_char *secret; int ivlen = 0; - u_char *ivoff; - u_char *p; - EVP_CIPHER_CTX ctx; + const u_char *ivoff; + const u_char *p; + EVP_CIPHER_CTX *ctx; + u_char *buf_mut, *output_buffer; + int block_size, cipher_nid, output_buffer_size; #endif - esp = (struct newesp *)bp; + esp = (const struct newesp *)bp; #ifdef HAVE_LIBCRYPTO secret = NULL; @@ -593,8 +641,8 @@ esp_print(netdissect_options *ndo, /* 'ep' points to the end of available data. */ ep = ndo->ndo_snapend; - if ((u_char *)(esp + 1) >= ep) { - fputs("[|ESP]", stdout); + if ((const u_char *)(esp + 1) >= ep) { + ND_PRINT((ndo, "[|ESP]")); goto fail; } ND_PRINT((ndo, "ESP(spi=0x%08x", EXTRACT_32BITS(&esp->esp_spi))); @@ -615,11 +663,10 @@ esp_print(netdissect_options *ndo, if (ndo->ndo_sa_list_head == NULL) goto fail; - ip = (struct ip *)bp2; + ip = (const struct ip *)bp2; switch (IP_V(ip)) { -#ifdef INET6 case 6: - ip6 = (struct ip6_hdr *)bp2; + ip6 = (const struct ip6_hdr *)bp2; /* we do not attempt to decrypt jumbograms */ if (!EXTRACT_16BITS(&ip6->ip6_plen)) goto fail; @@ -636,7 +683,6 @@ esp_print(netdissect_options *ndo, } } break; -#endif /*INET6*/ case 4: /* nexthdr & padding are in the last fragment */ if (EXTRACT_16BITS(&ip->ip_off) & IP_MF) @@ -675,21 +721,35 @@ esp_print(netdissect_options *ndo, ep = bp2 + len; } - ivoff = (u_char *)(esp + 1) + 0; + ivoff = (const u_char *)(esp + 1) + 0; ivlen = sa->ivlen; secret = sa->secret; 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 - (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); + len = ep - (p + ivlen); + + /* We need a block size */ + block_size = EVP_CIPHER_CTX_block_size(ctx); + /* We need the buffer size to be multiple of a block size */ + output_buffer_size = len + (block_size - len % block_size); + output_buffer = (u_char *)calloc(output_buffer_size, sizeof(u_char)); + /* EVP_Cipher output buffer should be different from the input one. + * Also it should be of size that is multiple of cipher block size. */ + EVP_Cipher(ctx, output_buffer, p + ivlen, len); + EVP_CIPHER_CTX_free(ctx); + memcpy(p + ivlen, output_buffer, len); + free(output_buffer); + advance = ivoff - (const u_char *)esp + ivlen; + } else + advance = sizeof(struct newesp); } else advance = sizeof(struct newesp);