correct openssl include pathname management. <openssl/foo.h> should be

used (see openssl docs).

diff --git a/configure b/configure
index ac65efb1373089f69790455d0b77cc13368182cd..0359208ea639af3dafa5c83e2b009c43220b8dda 100755 (executable)
--- a/configure
+++ b/configure
@@ -4508,11 +4508,7 @@ for dir in /usr /usr/local /usr/local/ssl /usr/pkg; do
        if test -d $dir/lib -a -f $dir/lib/libcrypto.a; then
                ac_cv_ssleay_path=$dir
        fi
-       if test -d $dir/include/ssleay -a -f $dir/include/ssleay/des.h; then
-         incdir="-I$dir/include/ssleay"
-       elif test -d $dir/include/openssl -a -f $dir/include/openssl/des.h; then
-         incdir="-I$dir/include -I$dir/include/openssl"
-       elif test -d $dir/include -a -f $dir/include/des.h; then
+       if test -d $dir/include/openssl -a -f $dir/include/openssl/des.h; then
                incdir="-I$dir/include"
        fi
        if test "$ac_cv_ssleay_path" != "no" -a "$incdir" != "no"; then
@@ -4533,7 +4529,7 @@ if test "$ac_cv_ssleay_path" != no; then
                LIBS="$LIBS -lrsaref"
        fi
        echo $ac_n "checking for des_cbc_encrypt in -lcrypto""... $ac_c" 1>&6
-echo "configure:4537: checking for des_cbc_encrypt in -lcrypto" >&5
+echo "configure:4533: checking for des_cbc_encrypt in -lcrypto" >&5
 ac_lib_var=`echo crypto'_'des_cbc_encrypt | sed 'y%./+-%__p_%'`
 if eval "test \"`echo '$''{'ac_cv_lib_$ac_lib_var'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
@@ -4541,7 +4537,7 @@ else
   ac_save_LIBS="$LIBS"
 LIBS="-lcrypto  $LIBS"
 cat > conftest.$ac_ext <<EOF
-#line 4545 "configure"
+#line 4541 "configure"
 #include "confdefs.h"
 /* Override any gcc2 internal prototype to avoid an error.  */
 /* We use char because int might match the return type of a gcc2
@@ -4552,7 +4548,7 @@ int main() {
 des_cbc_encrypt()
 ; return 0; }
 EOF
-if { (eval echo configure:4556: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
+if { (eval echo configure:4552: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext}; then
   rm -rf conftest*
   eval "ac_cv_lib_$ac_lib_var=yes"
 else
@@ -4586,17 +4582,17 @@ fi
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4590: checking for $ac_hdr" >&5
+echo "configure:4586: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4595 "configure"
+#line 4591 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4600: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4596: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4625,12 +4621,12 @@ done
 
        if test "$ac_cv_header_cast_h" = "yes"; then
                echo $ac_n "checking for buggy CAST128""... $ac_c" 1>&6
-echo "configure:4629: checking for buggy CAST128" >&5
+echo "configure:4625: checking for buggy CAST128" >&5
                if test "$cross_compiling" = yes; then
   buggy_cast128="cross-compiling, assume yes"
 else
   cat > conftest.$ac_ext <<EOF
-#line 4634 "configure"
+#line 4630 "configure"
 #include "confdefs.h"
 
 #include <cast.h>
@@ -4649,7 +4645,7 @@ main()
                return 1;
 }
 EOF
-if { (eval echo configure:4653: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
+if { (eval echo configure:4649: \"$ac_link\") 1>&5; (eval $ac_link) 2>&5; } && test -s conftest${ac_exeext} && (./conftest; exit) 2>/dev/null
 then
   buggy_cast128=yes
 else
@@ -4681,17 +4677,17 @@ for ac_hdr in rc5.h
 do
 ac_safe=`echo "$ac_hdr" | sed 'y%./+-%__p_%'`
 echo $ac_n "checking for $ac_hdr""... $ac_c" 1>&6
-echo "configure:4685: checking for $ac_hdr" >&5
+echo "configure:4681: checking for $ac_hdr" >&5
 if eval "test \"`echo '$''{'ac_cv_header_$ac_safe'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6
 else
   cat > conftest.$ac_ext <<EOF
-#line 4690 "configure"
+#line 4686 "configure"
 #include "confdefs.h"
 #include <$ac_hdr>
 EOF
 ac_try="$ac_cpp conftest.$ac_ext >/dev/null 2>conftest.out"
-{ (eval echo configure:4695: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
+{ (eval echo configure:4691: \"$ac_try\") 1>&5; (eval $ac_try) 2>&5; }
 ac_err=`grep -v '^ *+' conftest.out | grep -v "^conftest.${ac_ext}\$"`
 if test -z "$ac_err"; then
   rm -rf conftest*
@@ -4736,7 +4732,7 @@ done
 # SVR4 /usr/ucb/install, which tries to use the nonexistent group "staff"
 # ./install, which can be erroneously created by make from ./install.sh.
 echo $ac_n "checking for a BSD compatible install""... $ac_c" 1>&6
-echo "configure:4740: checking for a BSD compatible install" >&5
+echo "configure:4736: checking for a BSD compatible install" >&5
 if test -z "$INSTALL"; then
 if eval "test \"`echo '$''{'ac_cv_path_install'+set}'`\" = set"; then
   echo $ac_n "(cached) $ac_c" 1>&6

diff --git a/configure.in b/configure.in
index 8851f0fc9d0c9b1b95e442ba05f70ac91dc8ea3a..176912395ae3d6cf3682d346e962927ee324fb19 100644 (file)
--- a/configure.in
+++ b/configure.in
@@ -1,4 +1,4 @@
-dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.134 2001-01-20 07:22:22 guy Exp $ (LBL)
+dnl @(#) $Header: /tcpdump/master/tcpdump/configure.in,v 1.135 2001-04-13 02:56:38 itojun Exp $ (LBL)
 dnl
 dnl Copyright (c) 1994, 1995, 1996, 1997
 dnl    The Regents of the University of California.  All rights reserved.
@@ -6,7 +6,7 @@ dnl
 dnl Process this file with autoconf to produce a configure script.
 dnl
 
-AC_REVISION($Revision: 1.134 $)
+AC_REVISION($Revision: 1.135 $)
 AC_PREREQ(2.13)
 AC_INIT(tcpdump.c)
 
@@ -535,11 +535,7 @@ for dir in /usr /usr/local /usr/local/ssl /usr/pkg; do
        if test -d $dir/lib -a -f $dir/lib/libcrypto.a; then
                ac_cv_ssleay_path=$dir
        fi
-       if test -d $dir/include/ssleay -a -f $dir/include/ssleay/des.h; then
-         incdir="-I$dir/include/ssleay"
-       elif test -d $dir/include/openssl -a -f $dir/include/openssl/des.h; then
-         incdir="-I$dir/include -I$dir/include/openssl"
-       elif test -d $dir/include -a -f $dir/include/des.h; then
+       if test -d $dir/include/openssl -a -f $dir/include/openssl/des.h; then
                incdir="-I$dir/include"
        fi
        if test "$ac_cv_ssleay_path" != "no" -a "$incdir" != "no"; then

diff --git a/print-esp.c b/print-esp.c
index a57e072b31a654d9efeb7c6bbe100ced23c7c2c5..152b6c6aafda10f90be4a79e824ace1e63ce8b64 100644 (file)
--- a/print-esp.c
+++ b/print-esp.c
@@ -23,7 +23,7 @@
 
 #ifndef lint
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.17 2000-12-12 09:58:41 itojun Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.18 2001-04-13 02:56:38 itojun Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -39,13 +39,13 @@ static const char rcsid[] =
 #include <netinet/in.h>
 
 #ifdef HAVE_LIBCRYPTO
-#include <des.h>
-#include <blowfish.h>
+#include <openssl/des.h>
+#include <openssl/blowfish.h>
 #ifdef HAVE_RC5_H
-#include <rc5.h>
+#include <openssl/rc5.h>
 #endif
 #ifdef HAVE_CAST_H
-#include <cast.h>
+#include <openssl/cast.h>
 #endif
 #endif