--- gvpe/configure	2005/03/25 16:05:21	1.29
+++ gvpe/configure	2005/12/05 12:58:05	1.30
@@ -894,12 +894,12 @@
   --enable-max-mtu=BYTES  enable mtu sizes upto BYTES bytes (default 1500).
                           Use 9100 for jumbogram support.
   --disable-compression   Disable compression support.
-  --enable-cipher         Select the symmetric cipher (default "bf"). Must be
-                          one of "bf" (blowfish), "aes-128" (rijndael),
-                          "aes-192" or "aes-256".
-  --enable-digest         Select the digets algorithm to use (default "sha1").
-                          Must be one of "sha1", "ripemd160", "md5" or "md4"
-                          (insecure).
+  --enable-cipher         Select the symmetric cipher (default "aes-128").
+                          Must be one of "bf" (blowfish), "aes-128"
+                          (rijndael), "aes-192" or "aes-256".
+  --enable-digest         Select the digets algorithm to use (default
+                          "ripemd160"). Must be one of "sha1", "ripemd160",
+                          "md5" or "md4" (insecure).
 
 Optional Packages:
   --with-PACKAGE[=ARG]    use PACKAGE [ARG=yes]
@@ -9723,6 +9723,7 @@
 fi
 
 
+
 # Check whether --enable-icmp or --disable-icmp was given.
 if test "${enable_icmp+set}" = set; then
   enableval="$enable_icmp"
@@ -10040,7 +10041,7 @@
 _ACEOF
 
 
-CIPHER=bf_cbc
+CIPHER=aes_128_cbc
 # Check whether --enable-cipher or --disable-cipher was given.
 if test "${enable_cipher+set}" = set; then
   enableval="$enable_cipher"
@@ -10056,7 +10057,7 @@
 _ACEOF
 
 
-DIGEST=sha1
+DIGEST=ripemd160
 # Check whether --enable-digest or --disable-digest was given.
 if test "${enable_digest+set}" = set; then
   enableval="$enable_digest"
@@ -10083,8 +10084,6 @@
 
 
 
-
-
                                                             ac_config_files="$ac_config_files Makefile po/Makefile.in src/Makefile doc/Makefile lib/Makefile m4/Makefile"
 
 cat >confcache <<\_ACEOF
@@ -11647,6 +11646,27 @@
 ac_clean_files=$ac_clean_files_save
 
 
+# configure is writing to config.log, and then calls config.status.
+# config.status does its own redirection, appending to config.log.
+# Unfortunately, on DOS this fails, as config.log is still kept open
+# by configure, so config.status won't be able to write to it; its
+# output is simply discarded.  So we exec the FD to /dev/null,
+# effectively closing config.log, so it can be properly (re)opened and
+# appended to by config.status.  When coming back to configure, we
+# need to make the FD available again.
+if test "$no_create" != yes; then
+  ac_cs_success=:
+  ac_config_status_args=
+  test "$silent" = yes &&
+    ac_config_status_args="$ac_config_status_args --quiet"
+  exec 5>/dev/null
+  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
+  exec 5>>config.log
+  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
+  # would make configure fail if this is the last instruction.
+  $ac_cs_success || { (exit 1); exit 1; }
+fi
+
 
 echo
 echo "***"
@@ -11658,7 +11678,10 @@
 echo "*** HMAC length:  $HMAC"
 echo "*** RAND used:    $RAND"
 echo "*** Max. MTU:     $MTU"
-echo "*** Compression:  $COMPRESS"
+
+echo "***"
+echo "*** Enable options:"
+grep ENABLE_ config.h | sed -e 's/^/*** /'
 
 if test "x$DIGEST" = xmd4; then
 echo "***"
@@ -11676,29 +11699,6 @@
 fi
 
 echo "***"
-
 echo
 
 
-
-# configure is writing to config.log, and then calls config.status.
-# config.status does its own redirection, appending to config.log.
-# Unfortunately, on DOS this fails, as config.log is still kept open
-# by configure, so config.status won't be able to write to it; its
-# output is simply discarded.  So we exec the FD to /dev/null,
-# effectively closing config.log, so it can be properly (re)opened and
-# appended to by config.status.  When coming back to configure, we
-# need to make the FD available again.
-if test "$no_create" != yes; then
-  ac_cs_success=:
-  ac_config_status_args=
-  test "$silent" = yes &&
-    ac_config_status_args="$ac_config_status_args --quiet"
-  exec 5>/dev/null
-  $SHELL $CONFIG_STATUS $ac_config_status_args || ac_cs_success=false
-  exec 5>>config.log
-  # Use ||, not &&, to avoid exiting from the if with $? = 1, which
-  # would make configure fail if this is the last instruction.
-  $ac_cs_success || { (exit 1); exit 1; }
-fi
-