rel 0.2.7 mit kleines Korrekturen

16 files changed, 46 insertions, 29 deletions

diff --git a/ChangeLog b/ChangeLog
index e8c5a015f..69cec0e24 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+Wed Feb 18 17:36:45 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* Makefile.am (checks): New.
+
 Sat Feb 14 15:37:55 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* configure.in (mpi_config_done): Removed asm links caching.
diff --git a/Makefile.am b/Makefile.am
index 9c07b7656..dd2a3565a 100644
--- a/Makefile.am
+++ b/Makefile.am
@@ -1,6 +1,6 @@
 ## Process this file with automake to produce Makefile.in
 
-SUBDIRS =  intl po zlib util mpi cipher tools g10
+SUBDIRS =  intl po zlib util mpi cipher tools g10 checks
 EXTRA_DIST = VERSION
 
 
@@ -18,3 +18,4 @@ dist-hook:
 	    done ; \
 	done
 
+
diff --git a/Makefile.in b/Makefile.in
index d5dd00b69..286b45306 100644
--- a/Makefile.in
+++ b/Makefile.in
@@ -86,7 +86,7 @@ RANLIB = @RANLIB@
 VERSION = @VERSION@
 ZLIBS = @ZLIBS@
 
-SUBDIRS =  intl po zlib util mpi cipher tools g10
+SUBDIRS =  intl po zlib util mpi cipher tools g10 checks
 EXTRA_DIST = VERSION
 ACLOCAL_M4 = $(top_srcdir)/aclocal.m4
 mkinstalldirs = $(SHELL) $(top_srcdir)/scripts/mkinstalldirs
diff --git a/NEWS b/NEWS
index f875e3399..e75ed83a5 100644
--- a/NEWS
+++ b/NEWS
@@ -17,6 +17,8 @@ Noteworthy changes in version 0.2.7
 
     * Assembler code for m68k (not tested).
 
+    * "make check" works.
+
 Noteworthy changes in version 0.2.6
 -----------------------------------
 
diff --git a/VERSION b/VERSION
index 2375f5a32..b0032849c 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-0.2.6a
+0.2.7
diff --git a/checks/Makefile.am b/checks/Makefile.am
new file mode 100644
index 000000000..4bf639739
--- /dev/null
+++ b/checks/Makefile.am
@@ -0,0 +1,9 @@
+## Process this file with automake to create Makefile.in
+
+TESTS = checkit
+
+TEST_FILES = pubring.asc secring.asc plain-1 plain-2 plain-3o.asc \
+	     plain-1.asc plain-2.asc plain-3.asc
+
+EXTRA_DIST = $(TESTS) $(TEST_FILES)
+
diff --git a/checks/checkit b/checks/checkit
index 1cc2f95ba..787da1153 100755
--- a/checks/checkit
+++ b/checks/checkit
@@ -89,12 +89,12 @@ run_g10maint --yes --dearmor -o pubring.g10 pubring.asc
 run_g10maint --yes --dearmor -o secring.g10 secring.asc
 run_g10maint --yes --dearmor -o plain-3 plain-3o.asc
 plain_files="$plain_files plain-3"
-
-
+# make sure all files are created
+echo "$usrpass1" | run_g10 --no-operation
 
 info Checking decryption
 for i in $plain_files ; do
-    echo "$usrpass1" | run_g10 --passphrase-fd 0 -o y --yes $i.asc
+run_g10 --passphrase-fd 0 -o y --yes $i.asc
     cmp $i y || error "$i: mismatch"
 done
 
diff --git a/checks/distfiles b/checks/distfiles
deleted file mode 100644
index 95d9302c0..000000000
--- a/checks/distfiles
+++ /dev/null
@@ -1,10 +0,0 @@
-checkit
-pubring.asc
-secring.asc
-plain-1
-plain-2
-plain-3o.asc
-plain-1.asc
-plain-2.asc
-plain-3.asc
-
diff --git a/configure.in b/configure.in
index 1270b7f04..e27b03131 100644
--- a/configure.in
+++ b/configure.in
@@ -211,5 +211,6 @@ cipher/Makefile
 g10/Makefile
 tools/Makefile
 zlib/Makefile
+checks/Makefile
 ],[echo timestamp >stamp-h; sed -e "/POTFILES =/r po/POTFILES" po/Makefile.in > po/Makefile])
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index 6be310564..c352db6fb 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+Wed Feb 18 18:39:02 1998  Werner Koch  (wk@isil.d.shuttle.de)
+
+	* Makefile.am (OMIT_DEPENDENCIES): New.
+
+	* rsa.c: Replaced log_bug by BUG.
+
 Wed Feb 18 13:35:58 1998  Werner Koch  (wk@isil.d.shuttle.de)
 
 	* mainproc.c (do_check_sig): Now uses hash_public_cert.
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 44cc3ae94..a2a72f778 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -2,6 +2,7 @@
 
 INCLUDES = -I$(top_srcdir)/include
 EXTRA_DIST = OPTIONS  pubring.asc
+OMIT_DEPENDENCIES = zlib.h zconf.h
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 
 bin_PROGRAMS = g10 g10maint
@@ -59,5 +60,6 @@ g10maint_SOURCES = g10maint.c	\
 
 LDADD = @INTLLIBS@ $(needed_libs) @ZLIBS@
 
+
 $(PROGRAMS): $(needed_libs)
 
diff --git a/g10/Makefile.in b/g10/Makefile.in
index 318423c56..6b2a3b25a 100644
--- a/g10/Makefile.in
+++ b/g10/Makefile.in
@@ -88,6 +88,7 @@ ZLIBS = @ZLIBS@
 
 INCLUDES = -I$(top_srcdir)/include
 EXTRA_DIST = OPTIONS  pubring.asc
+OMIT_DEPENDENCIES = zlib.h zconf.h
 needed_libs = ../cipher/libcipher.a ../mpi/libmpi.a ../util/libutil.a
 
 bin_PROGRAMS = g10 g10maint
diff --git a/g10/g10maint.c b/g10/g10maint.c
index c743bf9a3..3204aab2b 100644
--- a/g10/g10maint.c
+++ b/g10/g10maint.c
@@ -422,15 +422,17 @@ main( int argc, char **argv )
 	tty_printf("%s", strusage(15) );
     }
 
-    if( !sec_nrings || default_keyring ) { /* add default secret rings */
-	char *p = make_filename(opt.homedir, "secring.g10", NULL );
-	add_secret_keyring(p);
-	m_free(p);
-    }
-    if( !nrings || default_keyring ) { /* add default ring */
-	char *p = make_filename(opt.homedir, "pubring.g10", NULL );
-	add_keyring(p);
-	m_free(p);
+    if( cmd != aDeArmor && cmd != aEnArmor ) {
+	if( !sec_nrings || default_keyring ) { /* add default secret rings */
+	    char *p = make_filename(opt.homedir, "secring.g10", NULL );
+	    add_secret_keyring(p);
+	    m_free(p);
+	}
+	if( !nrings || default_keyring ) { /* add default ring */
+	    char *p = make_filename(opt.homedir, "pubring.g10", NULL );
+	    add_keyring(p);
+	    m_free(p);
+	}
     }
 
     if( argc ) {
diff --git a/g10/rsa.c b/g10/rsa.c
index b81e1b1bf..f1e8f7b61 100644
--- a/g10/rsa.c
+++ b/g10/rsa.c
@@ -58,7 +58,7 @@ g10_rsa_encrypt( PKT_public_cert *pkc, PKT_pubkey_enc *enc, DEK *dek )
 	m_free(ustr);
     }
  #else
-    log_bug(NULL);
+    BUG();
  #endif/* ! HAVE_RSA_CIPHER*/
 }
 
@@ -96,7 +96,7 @@ g10_rsa_sign( PKT_secret_cert *skc, PKT_signature *sig,
 	m_free(ustr);
     }
  #else
-    log_bug(NULL);
+    BUG();
  #endif/* ! HAVE_RSA_CIPHER*/
 }
 
diff --git a/mpi/m68k/distfiles b/mpi/m68k/distfiles
index 4693a209f..c69629e7b 100644
--- a/mpi/m68k/distfiles
+++ b/mpi/m68k/distfiles
@@ -1,5 +1,5 @@
 syntax.h
-mpih-lshift.S
+mpih-shift.S
 mpih-add1.S
 mpih-sub1.S
 
diff --git a/scripts/mkdiff b/scripts/mkdiff
index ae7435369..86eea361a 100755
--- a/scripts/mkdiff
+++ b/scripts/mkdiff
@@ -18,7 +18,6 @@ echo "Unpacking previous and current tar"
 tar xzf "g10-$curr_ver.tar.gz"
 tar xzf "g10-$prev_ver.tar.gz"
 
-read
 
 echo "Diffing"
 tmp_name="g10-$curr_ver.diff.tmp"