See ChangeLog: Sat Jun 26 12:15:59 CEST 1999 Werner Koch

7 files changed, 23 insertions, 9 deletions

diff --git a/g10/ChangeLog b/g10/ChangeLog
index cadd4a122..96c2c9b5a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,5 +1,15 @@
-Tue Jun 15 12:21:08 CEST 1999  Werner Koch  <[email protected]>
+Sat Jun 26 12:15:59 CEST 1999  Werner Koch  <[email protected]>
+
+
+	* dearmor.c (enarmor_file): Fixed comment string.
+	* tdbdump.c (export_ownertrust): Text fix.
+	* tbio.c (tdbio_invalid): Ditto.
 
+	* parse-packet.c (parse_key): Made temp buffer larger.
+
+	* Makefile.am (install-data-local): Add missing backslashes
+
+Tue Jun 15 12:21:08 CEST 1999  Werner Koch  <[email protected]>
 
 	* g10.c (main): Made iterated+salted the default S2K method.
 
@@ -13,7 +23,7 @@ Tue Jun 15 12:21:08 CEST 1999  Werner Koch  <[email protected]>
 Mon Jun 14 21:18:54 CEST 1999 Michael Roth <[email protected]>
 
 	* g10.c: New options --openpgp, --no-tty, --emit-version,
-          --default-comment and --lock-multiple
+	  --default-comment and --lock-multiple
 
 Thu Jun 10 14:18:23 CEST 1999  Werner Koch  <[email protected]>
 
diff --git a/g10/Makefile.am b/g10/Makefile.am
index 22e08f27b..6170b1691 100644
--- a/g10/Makefile.am
+++ b/g10/Makefile.am
@@ -86,8 +86,8 @@ install-data-local:
 	$(INSTALL_DATA) $(srcdir)/options.skel \
 				$(DESTDIR)$(pkgdatadir)/options.skel
 	@set -e;\
-	 if test -f $(DESTDIR)$(bindir)/gpgm ; then
-	   echo "removing obsolete gpgm binary"
-	   rm $(DESTDIR)$(bindir)/gpgm ;
+	 if test -f $(DESTDIR)$(bindir)/gpgm ; then \
+	   echo "removing obsolete gpgm binary" ;   \
+	   rm $(DESTDIR)$(bindir)/gpgm ;	    \
 	 fi
 
diff --git a/g10/dearmor.c b/g10/dearmor.c
index 43fc6b059..e87dffcd9 100644
--- a/g10/dearmor.c
+++ b/g10/dearmor.c
@@ -103,7 +103,7 @@ enarmor_file( const char *fname )
 	goto leave;
 
     afx.what = 4;
-    afx.hdrlines = "Comment: Use \"gpgm --dearmor\" for unpacking\n";
+    afx.hdrlines = "Comment: Use \"gpg --dearmor\" for unpacking\n";
     iobuf_push_filter( out, armor_filter, &afx );
 
     while( (c = iobuf_get(inp)) != -1 )
diff --git a/g10/keyedit.c b/g10/keyedit.c
index 614043888..91a4d6bdf 100644
--- a/g10/keyedit.c
+++ b/g10/keyedit.c
@@ -842,10 +842,12 @@ keyedit_menu( const char *username, STRLIST locusr, STRLIST commands )
 	    break;
 
 	  case cmdADDKEY:
+	secmem_dump_stats();
 	    if( generate_subkeypair( keyblock, sec_keyblock ) ) {
 		redisplay = 1;
 		sec_modified = modified = 1;
 	    }
+	secmem_dump_stats();
 	    break;
 
 
diff --git a/g10/parse-packet.c b/g10/parse-packet.c
index 730386cc2..5ce7e2660 100644
--- a/g10/parse-packet.c
+++ b/g10/parse-packet.c
@@ -1281,7 +1281,7 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
 
     if( pkttype == PKT_SECRET_KEY || pkttype == PKT_SECRET_SUBKEY ) {
 	PKT_secret_key *sk = pkt->pkt.secret_key;
-	byte temp[8];
+	byte temp[16];
 
 	if( !npkey ) {
 	    sk->skey[0] = mpi_set_opaque( NULL,
@@ -1370,6 +1370,8 @@ parse_key( IOBUF inp, int pkttype, unsigned long pktlen,
 	     * so a
 	     *	 sk->protect.ivlen = cipher_get_blocksize(sk->protect.algo);
 	     * won't work.  The only solution I see is to hardwire it here.
+	     * NOTE: if you change the ivlen above 16, don't forget to
+	     * enlarge temp.
 	     */
 	    switch( sk->protect.algo ) {
 	      case 7: case 8: case 9: /* reserved for AES */
diff --git a/g10/tdbdump.c b/g10/tdbdump.c
index 1d1808466..2d3502caf 100644
--- a/g10/tdbdump.c
+++ b/g10/tdbdump.c
@@ -399,7 +399,7 @@ export_ownertrust()
 
     init_trustdb();
     printf(_("# List of assigned trustvalues, created %s\n"
-	     "# (Use \"gpgm --import-ownertrust\" to restore them)\n"),
+	     "# (Use \"gpg --import-ownertrust\" to restore them)\n"),
 	   asctimestamp( make_timestamp() ) );
     for(recnum=0; !tdbio_read_record( recnum, &rec, 0); recnum++ ) {
 	if( rec.rectype == RECTYPE_DIR ) {
diff --git a/g10/tdbio.c b/g10/tdbio.c
index 1d05aae37..39f1d5677 100644
--- a/g10/tdbio.c
+++ b/g10/tdbio.c
@@ -1627,7 +1627,7 @@ void
 tdbio_invalid(void)
 {
     log_error(_(
-	"The trustdb is corrupted; please run \"gpgm --fix-trustdb\".\n") );
+	"the trustdb is corrupted; please run \"gpg --fix-trustdb\".\n") );
     g10_exit(2);
 }