From: Harlan Stenn <stenn@ntp.org>
Date: Wed, 17 May 2000 03:17:42 +0000 (-0000)
Subject: ChangeLog, build, configure, configure.in, flock-build:
X-Git-Tag: NTP_4_0_99_J~2
X-Git-Url: http://git.ipfire.org/cgi-bin/gitweb.cgi?a=commitdiff_plain;h=6a3cc1687bc85383a4a454ca6342e0a2df5ddcd4;p=thirdparty%2Fntp.git

ChangeLog, build, configure, configure.in, flock-build:
  * build (KEYSUF):
  * flock-build:
  * configure.in: Lose the "md5" options from the --with-crypto
  check; Dave hates it.

bk: 39220f56gQnNraAmFjT3h77EawWHmg
---

diff --git a/ChangeLog b/ChangeLog
index 6ac8f519d..5d44be474 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,10 @@
 2000-05-16  Harlan Stenn  <stenn@whimsy.udel.edu>
 
+	* build (KEYSUF): 
+	* flock-build: 
+	* configure.in: Lose the "md5" options from the --with-crypto
+	check; Dave hates it.
+
 	* ntpd/ntp_util.c (stats_config): 
 	* ntpd/ntp_loopfilter.c (loop_config): 
 	* libntp/systime.c (adj_systime): 
diff --git a/build b/build
index 7b2dda03b..acbb6737c 100755
--- a/build
+++ b/build
@@ -50,8 +50,8 @@ case "$CONFIG_ARGS" in
  *--with-crypto=autokey*)
     KEYSUF="-autokey"
     ;;
- *--with-crypto=md5*)
-    [ -d rsaref2 ] && KEYSUF="-md5"
+ *--without-crypto*)
+    [ -d rsaref2 ] && KEYSUF="-norsaref"
     ;;
 esac
 
diff --git a/configure b/configure
index 9fcdf75ca..1c7e417b6 100755
--- a/configure
+++ b/configure
@@ -143,7 +143,7 @@ ac_arg_enable_help="$ac_arg_enable_help
 ac_arg_enable_help="$ac_arg_enable_help
   --enable-VARITEXT       s VARITEXT clock"
 ac_arg_with_help="$ac_arg_with_help
-  --with-crypto           + ={md5,autokey,rsaref}"
+  --with-crypto           + ={autokey,rsaref}"
 ac_arg_enable_help="$ac_arg_enable_help
   --enable-kmem           s read /dev/kmem for tick and/or tickadj"
 ac_arg_enable_help="$ac_arg_enable_help
@@ -9911,9 +9911,9 @@ else
 fi
 
 case "$ans" in
- no) ans=md5 ;;
+ no) ;;
  yes|rsaref)
-    ans=md5
+    ans=no
     if test -f $srcdir/rsaref2/source/rsa.c
     then
 	ans=rsaref
@@ -9933,7 +9933,7 @@ EOF
 esac
 
 case "$ans" in
- md5) ;;
+ no) ;;
  *)
     cat >>confdefs.h <<\EOF
 #define AUTOKEY 
diff --git a/configure.in b/configure.in
index 026b21c6e..30ecb9737 100644
--- a/configure.in
+++ b/configure.in
@@ -2227,12 +2227,12 @@ AC_SUBST(LIBRSAREF)
 AC_SUBST(MAKE_LIBRSAREF)
 AC_SUBST(MAKE_NTP_GENKEYS)
 AC_MSG_CHECKING(for the level of crypto support)
-AC_ARG_WITH(crypto,	[  --with-crypto           + ={md5,autokey,rsaref}],
+AC_ARG_WITH(crypto,	[  --with-crypto           + ={autokey,rsaref}],
 [ans=$withval], [ans=yes])
 case "$ans" in
- no) ans=md5 ;;
+ no) ;;
  yes|rsaref)
-    ans=md5
+    ans=no
     if test -f $srcdir/rsaref2/source/rsa.c
     then
 	ans=rsaref
@@ -2246,7 +2246,7 @@ case "$ans" in
 esac
 AC_SUBST(AUTOKEY)
 case "$ans" in
- md5) ;;
+ no) ;;
  *)
     AC_DEFINE(AUTOKEY, , [Autokey?])
     AUTOKEY=1
diff --git a/flock-build b/flock-build
index b5273accc..1f3babea2 100755
--- a/flock-build
+++ b/flock-build
@@ -29,5 +29,5 @@ do
     echo $i
     ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks $BUILD_ARGS" &
     ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --with-crypto=autokey $BUILD_ARGS" &
-    ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --with-crypto=md5 $BUILD_ARGS" &
+    ssh $i "cd $c_d ; ./build $SIG --enable-parse-clocks --without-crypto $BUILD_ARGS" &
 done