--- gvpe/configure	2014/06/18 20:40:51	1.55
+++ gvpe/configure	2016/06/30 11:43:38	1.57
@@ -722,6 +722,7 @@
 docdir
 oldincludedir
 includedir
+runstatedir
 localstatedir
 sharedstatedir
 sysconfdir
@@ -763,7 +764,6 @@
 enable_dns
 enable_rsa_length
 enable_hmac_length
-enable_rand_length
 enable_max_mtu
 enable_compression
 enable_cipher
@@ -821,6 +821,7 @@
 sysconfdir='${prefix}/etc'
 sharedstatedir='${prefix}/com'
 localstatedir='${prefix}/var'
+runstatedir='${localstatedir}/run'
 includedir='${prefix}/include'
 oldincludedir='/usr/include'
 docdir='${datarootdir}/doc/${PACKAGE}'
@@ -1073,6 +1074,15 @@
   | -silent | --silent | --silen | --sile | --sil)
     silent=yes ;;
 
+  -runstatedir | --runstatedir | --runstatedi | --runstated \
+  | --runstate | --runstat | --runsta | --runst | --runs \
+  | --run | --ru | --r)
+    ac_prev=runstatedir ;;
+  -runstatedir=* | --runstatedir=* | --runstatedi=* | --runstated=* \
+  | --runstate=* | --runstat=* | --runsta=* | --runst=* | --runs=* \
+  | --run=* | --ru=* | --r=*)
+    runstatedir=$ac_optarg ;;
+
   -sbindir | --sbindir | --sbindi | --sbind | --sbin | --sbi | --sb)
     ac_prev=sbindir ;;
   -sbindir=* | --sbindir=* | --sbindi=* | --sbind=* | --sbin=* \
@@ -1210,7 +1220,7 @@
 for ac_var in	exec_prefix prefix bindir sbindir libexecdir datarootdir \
 		datadir sysconfdir sharedstatedir localstatedir includedir \
 		oldincludedir docdir infodir htmldir dvidir pdfdir psdir \
-		libdir localedir mandir
+		libdir localedir mandir runstatedir
 do
   eval ac_val=\$$ac_var
   # Remove trailing slashes.
@@ -1363,6 +1373,7 @@
   --sysconfdir=DIR        read-only single-machine data [PREFIX/etc]
   --sharedstatedir=DIR    modifiable architecture-independent data [PREFIX/com]
   --localstatedir=DIR     modifiable single-machine data [PREFIX/var]
+  --runstatedir=DIR       modifiable per-process data [LOCALSTATEDIR/run]
   --libdir=DIR            object code libraries [EPREFIX/lib]
   --includedir=DIR        C header files [PREFIX/include]
   --oldincludedir=DIR     C header files for non-gcc [/usr/include]
@@ -1430,16 +1441,12 @@
   --enable-hmac-length=BYTES
                           use a hmac of length BYTES bytes (default 12).
                           Allowed values are 4, 8, 12, 16.
-  --enable-rand-length=BYTES
-                          use BYTES bytes of extra randomness (default 12).
-                          Allowed values are 0, 4, 8, 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=CIPHER  Select the symmetric cipher (default "aes-128").
-                          Must be one of "bf" (blowfish), "aes-128"
-                          (rijndael), "aes-192", "aes-256", "camellia-128" or
-                          "camellia-256".
+                          Must be one of "aes-128" (rijndael), "aes-192", or
+                          "aes-256".
   --enable-hmac-digest=HMAC
                           Select the HMAC digest algorithm to use (default
                           "sha1"). Must be one of "sha512", "sha256", "sha1",
@@ -8484,19 +8491,6 @@
 _ACEOF
 
 
-RANDSIZE=12
-# Check whether --enable-rand-length was given.
-if test "${enable_rand_length+set}" = set; then :
-  enableval=$enable_rand_length; RANDSIZE=$enableval
-
-fi
-
-
-cat >>confdefs.h <<_ACEOF
-#define RAND_SIZE $RANDSIZE
-_ACEOF
-
-
 MTU=1500
 # Check whether --enable-max-mtu was given.
 if test "${enable_max_mtu+set}" = set; then :
@@ -8525,15 +8519,15 @@
 _ACEOF
 
 
-CIPHER=aes_128_cbc
+CIPHER=aes_128_ctr
 # Check whether --enable-cipher was given.
 if test "${enable_cipher+set}" = set; then :
-  enableval=$enable_cipher; if test "x$enableval" = xbf          ; then CIPHER=bf_cbc          ; fi
-  if test "x$enableval" = xaes-128     ; then CIPHER=aes_128_cbc     ; fi
-  if test "x$enableval" = xaes-192     ; then CIPHER=aes_192_cbc     ; fi
-  if test "x$enableval" = xaes-256     ; then CIPHER=aes_256_cbc     ; fi
-  if test "x$enableval" = xcamellia-128; then CIPHER=camellia_128_cbc; fi
-  if test "x$enableval" = xcamellia-256; then CIPHER=camellia_256_cbc; fi
+  enableval=$enable_cipher; #if test "x$enableval" = xbf          ; then CIPHER=bf_ctr          ; fi
+  if test "x$enableval" = xaes-128     ; then CIPHER=aes_128_ctr     ; fi
+  if test "x$enableval" = xaes-192     ; then CIPHER=aes_192_ctr     ; fi
+  if test "x$enableval" = xaes-256     ; then CIPHER=aes_256_ctr     ; fi
+  #if test "x$enableval" = xcamellia-128; then CIPHER=camellia_128_ctr; fi
+  #if test "x$enableval" = xcamellia-256; then CIPHER=camellia_256_ctr; fi
 
 fi
 
@@ -10148,7 +10142,6 @@
 echo "*** Digest used:  $DIGEST"
 echo "*** Authdigest:   $AUTH"
 echo "*** HMAC length:  $HMAC"
-echo "*** RAND used:    $RAND"
 echo "*** Max. MTU:     $MTU"
 
 echo "***"
@@ -10160,11 +10153,6 @@
 echo "*** WARNING: The hmac length you have chosen ($HMACSIZE) is quite insecure"
 fi
 
-if test "$RANDSIZE" -lt 12; then
-echo "***"
-echo "*** WARNING: The random prefix you have chosen ($RANDSIZE) is probably insecure"
-fi
-
 echo "***"
 echo