X-Git-Url: https://git.tcpdump.org/tcpdump/blobdiff_plain/ec799d60f6cd3f41041b57efe3963c28dda94d4a..1a04b92e365f5ed01ca38619b41bcc4fc9cbd63c:/print-esp.c diff --git a/print-esp.c b/print-esp.c index ade654a3..ade700a2 100644 --- a/print-esp.c +++ b/print-esp.c @@ -21,57 +21,92 @@ * MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE. */ -#ifndef lint -static const char rcsid[] _U_ = - "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.58 2007-12-07 00:03:07 mcr Exp $ (LBL)"; -#endif +/* \summary: IPSEC Encapsulating Security Payload (ESP) printer */ #ifdef HAVE_CONFIG_H #include "config.h" #endif -#include - -#include +#include +#include #include +/* Any code in this file that depends on HAVE_LIBCRYPTO depends on + * HAVE_OPENSSL_EVP_H too. Undefining the former when the latter isn't defined + * is the simplest way of handling the dependency. + */ #ifdef HAVE_LIBCRYPTO #ifdef HAVE_OPENSSL_EVP_H #include +#else +#undef HAVE_LIBCRYPTO #endif #endif -#include +#include "netdissect.h" +#include "strtoaddr.h" +#include "extract.h" + +#include "ascii_strcasecmp.h" #include "ip.h" -#include "esp.h" -#ifdef INET6 #include "ip6.h" -#endif -#include "netdissect.h" -#include "addrtoname.h" -#include "extract.h" +/* + * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. + * All rights reserved. + * + * Redistribution and use in source and binary forms, with or without + * modification, are permitted provided that the following conditions + * are met: + * 1. Redistributions of source code must retain the above copyright + * notice, this list of conditions and the following disclaimer. + * 2. Redistributions in binary form must reproduce the above copyright + * notice, this list of conditions and the following disclaimer in the + * documentation and/or other materials provided with the distribution. + * 3. Neither the name of the project nor the names of its contributors + * may be used to endorse or promote products derived from this software + * without specific prior written permission. + * + * THIS SOFTWARE IS PROVIDED BY THE PROJECT AND CONTRIBUTORS ``AS IS'' AND + * ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE + * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR PURPOSE + * ARE DISCLAIMED. IN NO EVENT SHALL THE PROJECT OR CONTRIBUTORS BE LIABLE + * FOR ANY DIRECT, INDIRECT, INCIDENTAL, SPECIAL, EXEMPLARY, OR CONSEQUENTIAL + * DAMAGES (INCLUDING, BUT NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS + * OR SERVICES; LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION) + * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT + * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY + * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF + * SUCH DAMAGE. + */ + +/* + * RFC1827/2406 Encapsulated Security Payload. + */ -#ifndef HAVE_SOCKADDR_STORAGE -#ifdef INET6 -struct sockaddr_storage { - union { - struct sockaddr_in sin; - struct sockaddr_in6 sin6; - } un; +struct newesp { + uint32_t esp_spi; /* ESP */ + uint32_t esp_seq; /* Sequence number */ + /*variable size*/ /* (IV and) Payload data */ + /*variable size*/ /* padding */ + /*8bit*/ /* pad size */ + /*8bit*/ /* next header */ + /*8bit*/ /* next header */ + /*variable size, 32bit bound*/ /* Authentication data */ }; -#else -#define sockaddr_storage sockaddr -#endif -#endif /* HAVE_SOCKADDR_STORAGE */ #ifdef HAVE_LIBCRYPTO +union inaddr_u { + struct in_addr in4; + struct in6_addr in6; +}; struct sa_list { struct sa_list *next; - struct sockaddr_storage daddr; - u_int32_t spi; /* if == 0, then IKEv2 */ + u_int daddr_version; + union inaddr_u daddr; + uint32_t spi; /* if == 0, then IKEv2 */ int initiator; u_char spii[8]; /* for IKEv2 */ u_char spir[8]; @@ -84,22 +119,84 @@ 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 + +#ifdef HAVE_EVP_CIPHERINIT_EX +/* + * Initialize the cipher by calling EVP_CipherInit_ex(), because + * calling EVP_CipherInit() will reset the cipher context, clearing + * the cipher, so calling it twice, with the second call having a + * null cipher, will clear the already-set cipher. EVP_CipherInit_ex(), + * however, won't reset the cipher context, so you can use it to specify + * the IV oin a second call after a first call to EVP_CipherInit_ex() + * to set the cipher and the key. + * + * XXX - is there some reason why we need to make two calls? + */ +static int +set_cipher_parameters(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, + const unsigned char *key, + const unsigned char *iv, int enc) +{ + return EVP_CipherInit_ex(ctx, cipher, NULL, key, iv, enc); +} +#else +/* + * Initialize the cipher by calling EVP_CipherInit(), because we don't + * have EVP_CipherInit_ex(); we rely on it not trashing the context. + */ +static int +set_cipher_parameters(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *cipher, + const unsigned char *key, + const unsigned char *iv, int enc) +{ + return EVP_CipherInit(ctx, cipher, key, iv, enc); +} +#endif + /* * this will adjust ndo_packetp and ndo_snapend to new buffer! */ +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; + unsigned int len; + EVP_CIPHER_CTX *ctx; + unsigned int block_size, output_buffer_size; + u_char *output_buffer; /* initiator arg is any non-zero value */ if(initiator) initiator=1; - + /* see if we can find the SA, and if so, decode it */ for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) { if (sa->spi == 0 @@ -123,19 +220,41 @@ 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 (set_cipher_parameters(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); + 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. + */ + 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); + if (output_buffer == NULL) { + (*ndo->ndo_warning)(ndo, "can't allocate memory for decryption buffer"); + EVP_CIPHER_CTX_free(ctx); + return 0; + } + EVP_Cipher(ctx, output_buffer, buf, len); + EVP_CIPHER_CTX_free(ctx); + + /* + * XXX - of course this is wrong, because buf is a const buffer, + * but changing this would require a more complicated fix. + */ + memcpy(buf, output_buffer, len); + free(output_buffer); ndo->ndo_packetp = buf; ndo->ndo_snapend = end; return 1; - } +USES_APPLE_RST static void esp_print_addsa(netdissect_options *ndo, struct sa_list *sa, int sa_def) @@ -192,12 +311,12 @@ int espprint_decode_hex(netdissect_options *ndo, int i; len = strlen(hex) / 2; - + if (len > binbuf_len) { (*ndo->ndo_warning)(ndo, "secret is too big: %d\n", len); return 0; } - + i = 0; while (hex[0] != '\0' && hex[1]!='\0') { binbuf[i] = hex2byte(ndo, hex); @@ -212,24 +331,23 @@ int espprint_decode_hex(netdissect_options *ndo, * decode the form: SPINUM@IP ALGONAME:0xsecret */ +USES_APPLE_DEPRECATED_API static int espprint_decode_encalgo(netdissect_options *ndo, char *decode, struct sa_list *sa) { - int len; size_t i; const EVP_CIPHER *evp; int authlen = 0; char *colon, *p; - + colon = strchr(decode, ':'); if (colon == NULL) { (*ndo->ndo_warning)(ndo, "failed to decode espsecret: %s\n", decode); return 0; } *colon = '\0'; - - len = colon - decode; + if (strlen(decode) > strlen("-hmac96") && !strcmp(decode + strlen(decode) - strlen("-hmac96"), "-hmac96")) { @@ -251,11 +369,11 @@ espprint_decode_encalgo(netdissect_options *ndo, sa->ivlen = 0; return 0; } - + sa->evp = evp; sa->authlen = authlen; sa->ivlen = EVP_CIPHER_iv_length(evp); - + colon++; if (colon[0] == '0' && colon[1] == 'x') { /* decode some hex! */ @@ -265,7 +383,7 @@ espprint_decode_encalgo(netdissect_options *ndo, if(sa->secretlen == 0) return 0; } else { i = strlen(colon); - + if (i < sizeof(sa->secret)) { memcpy(sa->secret, colon, i); sa->secretlen = i; @@ -277,6 +395,7 @@ espprint_decode_encalgo(netdissect_options *ndo, return 1; } +USES_APPLE_RST /* * for the moment, ignore the auth algorith, just hard code the authenticator @@ -294,9 +413,9 @@ espprint_decode_authalgo(netdissect_options *ndo, return 0; } *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; @@ -313,21 +432,21 @@ static void esp_print_decode_ikeline(netdissect_options *ndo, char *line, int ilen, rlen; char *authkey; char *enckey; - + init = strsep(&line, " \t"); icookie = strsep(&line, " \t"); rcookie = strsep(&line, " \t"); authkey = strsep(&line, " \t"); enckey = strsep(&line, " \t"); - + /* if any fields are missing */ if(!init || !icookie || !rcookie || !authkey || !enckey) { (*ndo->ndo_warning)(ndo, "print_esp: failed to find all fields for ikev2 at %s:%u", file, lineno); - + return; } - + ilen = strlen(icookie); rlen = strlen(rcookie); @@ -341,7 +460,7 @@ static void esp_print_decode_ikeline(netdissect_options *ndo, char *line, (*ndo->ndo_warning)(ndo, "init=%s icookie=%s(%u) rcookie=%s(%u)", init, icookie, ilen, rcookie, rlen); - + return; } @@ -356,7 +475,7 @@ static void esp_print_decode_ikeline(netdissect_options *ndo, char *line, if(!espprint_decode_encalgo(ndo, enckey, &sa1)) return; if(!espprint_decode_authalgo(ndo, authkey, &sa1)) return; - + esp_print_addsa(ndo, &sa1, FALSE); } @@ -383,28 +502,30 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line, if (line == NULL) { decode = spikey; spikey = NULL; + /* sa1.daddr.version = 0; */ /* memset(&sa1.daddr, 0, sizeof(sa1.daddr)); */ /* sa1.spi = 0; */ sa_def = 1; } 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) @@ -412,63 +533,48 @@ 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; - } + } if (spikey) { - + char *spistr, *foo; - u_int32_t spino; - struct sockaddr_in *sin; -#ifdef INET6 - struct sockaddr_in6 *sin6; -#endif - + uint32_t spino; + spistr = strsep(&spikey, "@"); - + spino = strtoul(spistr, &foo, 0); if (spistr == foo || !spikey) { (*ndo->ndo_warning)(ndo, "print_esp: failed to decode spi# %s\n", foo); return; } - + sa1.spi = spino; - - sin = (struct sockaddr_in *)&sa1.daddr; -#ifdef INET6 - sin6 = (struct sockaddr_in6 *)&sa1.daddr; - if (inet_pton(AF_INET6, spikey, &sin6->sin6_addr) == 1) { -#ifdef HAVE_SOCKADDR_SA_LEN - sin6->sin6_len = sizeof(struct sockaddr_in6); -#endif - sin6->sin6_family = AF_INET6; - } else -#endif - if (inet_pton(AF_INET, spikey, &sin->sin_addr) == 1) { -#ifdef HAVE_SOCKADDR_SA_LEN - sin->sin_len = sizeof(struct sockaddr_in); -#endif - sin->sin_family = AF_INET; - } else { - (*ndo->ndo_warning)(ndo, "print_esp: can not decode IP# %s\n", spikey); - return; - } + + if (strtoaddr6(spikey, &sa1.daddr.in6) == 1) { + sa1.daddr_version = 6; + } 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) { /* skip any blank spaces */ while (isspace((unsigned char)*decode)) decode++; - + if(!espprint_decode_encalgo(ndo, decode, &sa1)) { return; } @@ -477,12 +583,20 @@ static void esp_print_decode_onesecret(netdissect_options *ndo, char *line, esp_print_addsa(ndo, &sa1, sa_def); } +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 void esp_print_decodesecret(netdissect_options *ndo) { @@ -512,6 +626,9 @@ void esp_print_decodesecret(netdissect_options *ndo) #endif +#ifdef HAVE_LIBCRYPTO +USES_APPLE_DEPRECATED_API +#endif int esp_print(netdissect_options *ndo, const u_char *bp, const int length, const u_char *bp2 @@ -519,37 +636,35 @@ esp_print(netdissect_options *ndo, _U_ #endif , - int *nhdr + u_int *nhdr #ifndef HAVE_LIBCRYPTO _U_ #endif , - int *padlen + u_int *padlen #ifndef HAVE_LIBCRYPTO _U_ #endif ) { - register const struct newesp *esp; - register const u_char *ep; + const struct newesp *esp; + const u_char *ep; #ifdef HAVE_LIBCRYPTO - struct ip *ip; + const struct ip *ip; struct sa_list *sa = NULL; - int espsecret_keylen; -#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; - int blocksz; + const u_char *ivoff; + const u_char *p; + EVP_CIPHER_CTX *ctx; + unsigned int block_size, output_buffer_size; + u_char *output_buffer; #endif - esp = (struct newesp *)bp; + esp = (const struct newesp *)bp; #ifdef HAVE_LIBCRYPTO secret = NULL; @@ -564,13 +679,13 @@ 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; } - (*ndo->ndo_printf)(ndo, "ESP(spi=0x%08x", EXTRACT_32BITS(&esp->esp_spi)); - (*ndo->ndo_printf)(ndo, ",seq=0x%x)", EXTRACT_32BITS(&esp->esp_seq)); - (*ndo->ndo_printf)(ndo, ", length %u", length); + ND_PRINT((ndo, "ESP(spi=0x%08x", EXTRACT_BE_U_4(&esp->esp_spi))); + ND_PRINT((ndo, ",seq=0x%x)", EXTRACT_BE_U_4(&esp->esp_seq))); + ND_PRINT((ndo, ", length %u", length)); #ifndef HAVE_LIBCRYPTO goto fail; @@ -586,41 +701,38 @@ 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)) + if (!EXTRACT_BE_U_2(&ip6->ip6_plen)) goto fail; /* if we can't get nexthdr, we do not need to decrypt it */ - len = sizeof(struct ip6_hdr) + EXTRACT_16BITS(&ip6->ip6_plen); + len = sizeof(struct ip6_hdr) + EXTRACT_BE_U_2(&ip6->ip6_plen); /* see if we can find the SA, and if so, decode it */ for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) { - struct sockaddr_in6 *sin6 = (struct sockaddr_in6 *)&sa->daddr; - if (sa->spi == EXTRACT_32BITS(&esp->esp_spi) && - sin6->sin6_family == AF_INET6 && - memcmp(&sin6->sin6_addr, &ip6->ip6_dst, + 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) { break; } } break; -#endif /*INET6*/ case 4: /* nexthdr & padding are in the last fragment */ - if (EXTRACT_16BITS(&ip->ip_off) & IP_MF) + if (EXTRACT_BE_U_2(&ip->ip_off) & IP_MF) goto fail; - len = EXTRACT_16BITS(&ip->ip_len); + len = EXTRACT_BE_U_2(&ip->ip_len); /* see if we can find the SA, and if so, decode it */ for (sa = ndo->ndo_sa_list_head; sa != NULL; sa = sa->next) { - struct sockaddr_in *sin = (struct sockaddr_in *)&sa->daddr; - if (sa->spi == EXTRACT_32BITS(&esp->esp_spi) && - sin->sin_family == AF_INET && - sin->sin_addr.s_addr == ip->ip_dst.s_addr) { + 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) { break; } } @@ -634,7 +746,7 @@ esp_print(netdissect_options *ndo, */ if (sa == NULL) sa = ndo->ndo_sa_default; - + /* if not found fail */ if (sa == NULL) goto fail; @@ -647,44 +759,73 @@ esp_print(netdissect_options *ndo, ep = bp2 + len; } - ivoff = (u_char *)(esp + 1) + 0; + /* pointer to the IV, if there is one */ + ivoff = (const u_char *)(esp + 1) + 0; + /* length of the IV, if there is one; 0, if there isn't */ ivlen = sa->ivlen; secret = sa->secret; - espsecret_keylen = sa->secretlen; 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"); - - blocksz = EVP_CIPHER_CTX_block_size(&ctx); + ctx = EVP_CIPHER_CTX_new(); + if (ctx != NULL) { + if (set_cipher_parameters(ctx, sa->evp, secret, NULL, 0) < 0) + (*ndo->ndo_warning)(ndo, "espkey init failed"); + + p = ivoff; + set_cipher_parameters(ctx, NULL, NULL, p, 0); + 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. + */ + 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); + if (output_buffer == NULL) { + (*ndo->ndo_warning)(ndo, "can't allocate memory for decryption buffer"); + EVP_CIPHER_CTX_free(ctx); + return -1; + } - 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; + EVP_Cipher(ctx, output_buffer, p + ivlen, len); + EVP_CIPHER_CTX_free(ctx); + /* + * XXX - of course this is wrong, because buf is a + * const buffer, but changing this would require a + * more complicated fix. + */ + 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); /* sanity check for pad length */ - if (ep - bp < *(ep - 2)) + if (ep - bp < EXTRACT_U_1(ep - 2)) goto fail; if (padlen) - *padlen = *(ep - 2) + 2; + *padlen = EXTRACT_U_1(ep - 2) + 2; if (nhdr) - *nhdr = *(ep - 1); + *nhdr = EXTRACT_U_1(ep - 1); - (ndo->ndo_printf)(ndo, ": "); + ND_PRINT((ndo, ": ")); return advance; #endif fail: return -1; } +#ifdef HAVE_LIBCRYPTO +USES_APPLE_RST +#endif /* * Local Variables: