switch to HAVE_LIBCRYPTO

diff --git a/configure b/configure
index 2edaf1bf18ed45c3bbdff87d022f36275854d07a..091fc113e614885e93dd8d127746674c14cd8605 100755 (executable)
--- a/configure
+++ b/configure
@@ -1,6 +1,6 @@
 #! /bin/sh
 
-# From configure.in Revision: 1.25 
+# From configure.in Revision: 1.26 
 
 
 

diff --git a/print-esp.c b/print-esp.c
index 06fc7f90663b902dc156e06969281640853b84c9..f7690bde1a4fc9090ec59e59b9edc23eb14fbd2a 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.5 1999-12-15 08:10:18 fenner Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/print-esp.c,v 1.6 2000-01-15 02:33:06 mcr Exp $ (LBL)";
 #endif
 
 #ifdef HAVE_CONFIG_H
@@ -49,7 +49,7 @@ static const char rcsid[] =
 #include <netinet/udp_var.h>
 #include <netinet/tcp.h>
 
-#ifdef CRYPTO
+#ifdef HAVE_LIBCRYPTO
 #include <des.h>
 #include <blowfish.h>
 #ifdef HAVE_RC5_H
@@ -197,7 +197,7 @@ esp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
 
        switch (algo) {
        case DESCBC:
-#ifdef CRYPTO
+#ifdef HAVE_LIBCRYPTO
            {
                u_char iv[8];
                des_key_schedule schedule;
@@ -232,10 +232,10 @@ esp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
            }
 #else
                goto fail;
-#endif /*CRYPTO*/
+#endif /*HAVE_LIBCRYPTO*/
 
        case BLOWFISH:
-#ifdef CRYPTO
+#ifdef HAVE_LIBCRYPTO
            {
                BF_KEY schedule;
                u_char *p;
@@ -250,10 +250,10 @@ esp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
            }
 #else
                goto fail;
-#endif /*CRYPTO*/
+#endif /*HAVE_LIBCRYPTO*/
 
        case RC5:
-#if defined(CRYPTO) && defined(HAVE_RC5_H)
+#if defined(HAVE_LIBCRYPTO) && defined(HAVE_RC5_H)
            {
                RC5_32_KEY schedule;
                u_char *p;
@@ -269,10 +269,10 @@ esp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
            }
 #else
                goto fail;
-#endif /*CRYPTO*/
+#endif /*HAVE_LIBCRYPTO*/
 
        case CAST128:
-#if defined(CRYPTO) && defined(HAVE_CAST_H) && !defined(HAVE_BUGGY_CAST128)
+#if defined(HAVE_LIBCRYPTO) && defined(HAVE_CAST_H) && !defined(HAVE_BUGGY_CAST128)
            {
                CAST_KEY schedule;
                u_char *p;
@@ -287,10 +287,10 @@ esp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
            }
 #else
                goto fail;
-#endif /*CRYPTO*/
+#endif /*HAVE_LIBCRYPTO*/
 
        case DES3CBC:
-#if defined(CRYPTO)
+#if defined(HAVE_LIBCRYPTO)
            {
                des_key_schedule s1, s2, s3;
                u_char *p;
@@ -308,7 +308,7 @@ esp_print(register const u_char *bp, register const u_char *bp2, int *nhdr)
            }
 #else
                goto fail;
-#endif /*CRYPTO*/
+#endif /*HAVE_LIBCRYPTO*/
 
        case NONE:
        default:

diff --git a/tcpdump.c b/tcpdump.c
index efac90f3664af2d85d567e75978cb4e38e729b6d..65cb2ed7f022847e48b19b36b5433e65c84806c0 100644 (file)
--- a/tcpdump.c
+++ b/tcpdump.c
@@ -24,7 +24,7 @@ static const char copyright[] =
     "@(#) Copyright (c) 1988, 1989, 1990, 1991, 1992, 1993, 1994, 1995, 1996, 1997\n\
 The Regents of the University of California.  All rights reserved.\n";
 static const char rcsid[] =
-    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.139 1999-12-29 01:12:55 mcr Exp $ (LBL)";
+    "@(#) $Header: /tcpdump/master/tcpdump/tcpdump.c,v 1.140 2000-01-15 02:33:06 mcr Exp $ (LBL)";
 #endif
 
 /*
@@ -185,7 +185,7 @@ main(int argc, char **argv)
 
 #if 0
                case 'A':
-#ifndef CRYPTO
+#ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif
                        ahsecret = optarg;
@@ -207,7 +207,7 @@ main(int argc, char **argv)
                        break;
 
                case 'E':
-#ifndef CRYPTO
+#ifndef HAVE_LIBCRYPTO
                        warning("crypto code not compiled in");
 #endif
                        espsecret = optarg;