From 57a643a0b59e9941cf23c33d40c5d4e4b547b7ba Mon Sep 17 00:00:00 2001 From: Guy Harris Date: Wed, 8 Jan 2014 16:05:54 -0800 Subject: [PATCH] struct newesp is required regardless of whether we have libcrypto or not. --- print-esp.c | 34 +++++++++++++++++----------------- 1 file changed, 17 insertions(+), 17 deletions(-) diff --git a/print-esp.c b/print-esp.c index d1ed4334..8b90641a 100644 --- a/print-esp.c +++ b/print-esp.c @@ -67,23 +67,6 @@ struct sockaddr_storage { #endif #endif /* HAVE_SOCKADDR_STORAGE */ -#ifdef HAVE_LIBCRYPTO -struct sa_list { - struct sa_list *next; - struct sockaddr_storage daddr; - u_int32_t spi; /* if == 0, then IKEv2 */ - int initiator; - u_char spii[8]; /* for IKEv2 */ - u_char spir[8]; - const EVP_CIPHER *evp; - int ivlen; - int authlen; - u_char authsecret[256]; - int authsecret_len; - u_char secret[256]; /* is that big enough for all secrets? */ - int secretlen; -}; - /* * Copyright (C) 1995, 1996, 1997, and 1998 WIDE Project. * All rights reserved. @@ -128,6 +111,23 @@ struct newesp { /*variable size, 32bit bound*/ /* Authentication data */ }; +#ifdef HAVE_LIBCRYPTO +struct sa_list { + struct sa_list *next; + struct sockaddr_storage daddr; + u_int32_t spi; /* if == 0, then IKEv2 */ + int initiator; + u_char spii[8]; /* for IKEv2 */ + u_char spir[8]; + const EVP_CIPHER *evp; + int ivlen; + int authlen; + u_char authsecret[256]; + int authsecret_len; + u_char secret[256]; /* is that big enough for all secrets? */ + int secretlen; +}; + /* * this will adjust ndo_packetp and ndo_snapend to new buffer! */ -- 2.39.5