X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/64677b0d78ff168d98c3035e894c4910c021136e..a8abce5c5e2dce2ba6dbccd5d3829da104b80f9c:/print-esp.c diff --git a/print-esp.c b/print-esp.c index e6ff79ef..774ec72c 100644 --- a/print-esp.c +++ b/print-esp.c @@ -24,10 +24,10 @@ /* \summary: IPSEC Encapsulating Security Payload (ESP) printer */ #ifdef HAVE_CONFIG_H -#include "config.h" +#include #endif -#include +#include "netdissect-stdinc.h" #include #include @@ -192,8 +192,8 @@ int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo, const u_char *iv; unsigned int len; EVP_CIPHER_CTX *ctx; - unsigned int block_size, output_buffer_size; - u_char *output_buffer; + unsigned int block_size, buffer_size; + u_char *input_buffer, *output_buffer; /* initiator arg is any non-zero value */ if(initiator) initiator=1; @@ -228,19 +228,41 @@ int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo, (*ndo->ndo_warning)(ndo, "espkey init failed"); set_cipher_parameters(ctx, NULL, NULL, iv, 0); /* - * Allocate a buffer for the decrypted data. - * The output buffer must be separate from the input buffer, and - * its size must be a multiple of the cipher block size. + * Allocate buffers for the encrypted and decrypted data. + * Both buffers' sizes must be a multiple of the cipher block + * size, and the output buffer must be separate from the input + * buffer. */ block_size = (unsigned int)EVP_CIPHER_CTX_block_size(ctx); - output_buffer_size = len + (block_size - len % block_size); - output_buffer = (u_char *)malloc(output_buffer_size); + buffer_size = len + (block_size - len % block_size); + + /* + * Attempt to allocate the input buffer. + */ + input_buffer = (u_char *)malloc(buffer_size); + if (input_buffer == NULL) { + EVP_CIPHER_CTX_free(ctx); + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, + "can't allocate memory for encrypted data buffer"); + } + /* + * Copy the input data to the encrypted data buffer, and pad it + * with zeroes. + */ + memcpy(input_buffer, buf, len); + memset(input_buffer + len, 0, buffer_size - len); + + /* + * Attempt to allocate the output buffer. + */ + output_buffer = (u_char *)malloc(buffer_size); if (output_buffer == NULL) { - (*ndo->ndo_warning)(ndo, "can't allocate memory for decryption buffer"); + free(input_buffer); EVP_CIPHER_CTX_free(ctx); - return 0; + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, + "can't allocate memory for decryption buffer"); } - EVP_Cipher(ctx, output_buffer, buf, len); + EVP_Cipher(ctx, output_buffer, input_buffer, len); EVP_CIPHER_CTX_free(ctx); /* @@ -248,6 +270,7 @@ int esp_print_decrypt_buffer_by_ikev2(netdissect_options *ndo, * but changing this would require a more complicated fix. */ memcpy(buf, output_buffer, len); + free(input_buffer); free(output_buffer); ndo->ndo_packetp = buf; @@ -264,9 +287,11 @@ static void esp_print_addsa(netdissect_options *ndo, struct sa_list *nsa; + /* malloc() return used in a 'struct sa_list': do not free() */ nsa = (struct sa_list *)malloc(sizeof(struct sa_list)); if (nsa == NULL) - (*ndo->ndo_error)(ndo, "ran out of memory to allocate sa structure"); + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, + "esp_print_addsa: malloc"); *nsa = *sa; @@ -287,8 +312,8 @@ static u_int hexdigit(netdissect_options *ndo, char hex) else if (hex >= 'a' && hex <= 'f') return (hex - 'a' + 10); else { - (*ndo->ndo_error)(ndo, "invalid hex digit %c in espsecret\n", hex); - return 0; + (*ndo->ndo_error)(ndo, S_ERR_ND_ESP_SECRET, + "invalid hex digit %c in espsecret\n", hex); } } @@ -520,9 +545,9 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line, secretfile = fopen(filename, FOPEN_READ_TXT); if (secretfile == NULL) { - (*ndo->ndo_error)(ndo, "print_esp: can't open %s: %s\n", - filename, strerror(errno)); - return; + (*ndo->ndo_error)(ndo, S_ERR_ND_OPEN_FILE, + "print_esp: can't open %s: %s\n", + filename, strerror(errno)); } while (fgets(fileline, sizeof(fileline)-1, secretfile) != NULL) { @@ -661,10 +686,11 @@ esp_print(netdissect_options *ndo, const u_char *ivoff; const u_char *p; EVP_CIPHER_CTX *ctx; - unsigned int block_size, output_buffer_size; - u_char *output_buffer; + unsigned int block_size, buffer_size; + u_char *input_buffer, *output_buffer; #endif + ndo->ndo_protocol = "esp"; esp = (const struct newesp *)bp; #ifdef HAVE_LIBCRYPTO @@ -681,7 +707,7 @@ esp_print(netdissect_options *ndo, ep = ndo->ndo_snapend; if ((const u_char *)(esp + 1) >= ep) { - ND_PRINT("[|ESP]"); + nd_print_trunc(ndo); goto fail; } ND_PRINT("ESP(spi=0x%08x", EXTRACT_BE_U_4(esp->esp_spi)); @@ -717,7 +743,7 @@ esp_print(netdissect_options *ndo, if (sa->spi == EXTRACT_BE_U_4(esp->esp_spi) && sa->daddr_version == 6 && UNALIGNED_MEMCMP(&sa->daddr.in6, &ip6->ip6_dst, - sizeof(struct in6_addr)) == 0) { + sizeof(nd_ipv6)) == 0) { break; } } @@ -733,7 +759,7 @@ esp_print(netdissect_options *ndo, if (sa->spi == EXTRACT_BE_U_4(esp->esp_spi) && sa->daddr_version == 4 && UNALIGNED_MEMCMP(&sa->daddr.in4, &ip->ip_dst, - sizeof(struct in_addr)) == 0) { + sizeof(nd_ipv4)) == 0) { break; } } @@ -778,21 +804,43 @@ esp_print(netdissect_options *ndo, len = ep - (p + ivlen); /* - * Allocate a buffer for the decrypted data. - * The output buffer must be separate from the - * input buffer, and its size must be a multiple - * of the cipher block size. + * Allocate buffers for the encrypted and decrypted + * data. Both buffers' sizes must be a multiple of + * the cipher block size, and the output buffer must + * be separate from the input buffer. */ block_size = (unsigned int)EVP_CIPHER_CTX_block_size(ctx); - output_buffer_size = len + (block_size - len % block_size); - output_buffer = (u_char *)malloc(output_buffer_size); + buffer_size = len + (block_size - len % block_size); + + /* + * Attempt to allocate the input buffer. + */ + input_buffer = (u_char *)malloc(buffer_size); + if (input_buffer == NULL) { + EVP_CIPHER_CTX_free(ctx); + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, + "esp_print: can't allocate memory for encrypted data buffer"); + } + /* + * Copy the input data to the encrypted data buffer, + * and pad it with zeroes. + */ + memcpy(input_buffer, p + ivlen, len); + memset(input_buffer + len, 0, buffer_size - len); + + /* + * Attempt to allocate the output buffer. + */ + output_buffer = (u_char *)malloc(buffer_size); if (output_buffer == NULL) { - (*ndo->ndo_warning)(ndo, "can't allocate memory for decryption buffer"); + free(input_buffer); EVP_CIPHER_CTX_free(ctx); - return -1; + (*ndo->ndo_error)(ndo, S_ERR_ND_MEM_ALLOC, + "esp_print: can't allocate memory for decryption buffer"); } - EVP_Cipher(ctx, output_buffer, p + ivlen, len); + EVP_Cipher(ctx, output_buffer, input_buffer, len); + free(input_buffer); EVP_CIPHER_CTX_free(ctx); /* * XXX - of course this is wrong, because buf is a @@ -827,10 +875,3 @@ fail: #ifdef HAVE_LIBCRYPTO USES_APPLE_RST #endif - -/* - * Local Variables: - * c-style: whitesmith - * c-basic-offset: 8 - * End: - */