Minor changes done for the Windows binary

8 files changed, 32 insertions, 8 deletions

diff --git a/VERSION b/VERSION
index 97195755a..a702fca56 100644
--- a/VERSION
+++ b/VERSION
@@ -1 +1 @@
-1.0.4a
+1.0.4-1
diff --git a/doc/README.W32 b/doc/README.W32
index d06db9070..0821c7749 100644
--- a/doc/README.W32
+++ b/doc/README.W32
@@ -61,7 +61,11 @@ or for snapshots (with a letter appended to the version number)
 
   ftp://ftp.gnupg.org/pub/gcrypt/devel/gnupg-1.0.nx.tar.gz
 
-this is the same source as for the Unix version.
+this is the same source as for the Unix version.  If your binary
+version of GnuPG is called something like gnupg-w32-1.0.4-1.zip, you
+should find a patch file named gnupg-w32-1.0.4-1.0.4-1.diff.gz at the
+same location, which has to ne applied to the stock gpg source file.
+Instructions are at the top of this file.
 
 To build it, you need the MingW32/CPD kit, which is available at
 
diff --git a/g10/ChangeLog b/g10/ChangeLog
index e776f171c..d5f62ae1a 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,9 @@
+2000-10-23  Werner Koch  <[email protected]>
+
+	* keygen.c (read_parameter_file): Add a cast for isspace().
+
+	* status.c (myread): Use SIGINT instead of SIGHUP for DOS. 
+
 2000-10-19  Werner Koch  <[email protected]>
 
 	* g10.c: New option --ignore-crc-error
diff --git a/g10/keygen.c b/g10/keygen.c
index 51cdbd611..2ebad085d 100644
--- a/g10/keygen.c
+++ b/g10/keygen.c
@@ -1269,17 +1269,17 @@ read_parameter_file( const char *fname )
 	    err = "line too long";
 	    break;
 	}
-	for( p = line; isspace(*p); p++ )
+	for( p = line; isspace(*(byte*)p); p++ )
 	    ;
 	if( !*p || *p == '#' )
 	    continue;
 	keyword = p;
 	if( *keyword == '%' ) {
-	    for( ; !isspace(*p); p++ )
+	    for( ; !isspace(*(byte*)p); p++ )
 		;
 	    if( *p )
 		*p++ = 0;
-	    for( ; isspace(*p); p++ )
+	    for( ; isspace(*(byte*)p); p++ )
 		;
 	    value = p;
 	    trim_trailing_ws( value, strlen(value) );
@@ -1325,7 +1325,7 @@ read_parameter_file( const char *fname )
 	}
 	if( *p )
 	    *p++ = 0;
-	for( ; isspace(*p); p++ )
+	for( ; isspace(*(byte*)p); p++ )
 	    ;
 	if( !*p ) {
 	    err = "missing argument";
diff --git a/g10/status.c b/g10/status.c
index 116d146de..6c1388316 100644
--- a/g10/status.c
+++ b/g10/status.c
@@ -360,7 +360,11 @@ myread(int fd, void *buf, size_t count)
             eof_emmited++;
         }
         else { /* Ctrl-D not caught - do something reasonable */
+          #ifdef HAVE_DOSISH_SYSTEM
+            raise (SIGINT);  /* nothing to hangup under DOS */
+          #else
             raise (SIGHUP); /* no more input data */
+          #endif
         }
     }    
     return rc;
diff --git a/scripts/mk-w32-dist b/scripts/mk-w32-dist
index 0a070a905..0b407ec39 100755
--- a/scripts/mk-w32-dist
+++ b/scripts/mk-w32-dist
@@ -21,9 +21,9 @@ rm * || true
 ln ../g10/gpg gpg.exe
 i386--mingw32-strip gpg.exe
 if [ -t ../doc/gpg.man ] ; then
-  cat ../doc/gpg.man >gpg.man
+  sed `printf "s/\b.//g"` ../doc/gpg.man >gpg.man
 else
-  man -T latin1 -l ../doc/gpg.1 >gpg.man
+  man -T latin1 -l ../doc/gpg.1 | sed `printf "s/\b.//g"`  >gpg.man
 fi
 todos gpg.man
 cp ${srcdir}/README .
@@ -32,3 +32,5 @@ ln ${srcdir}/doc/README.W32 .
 todos README.W32
 for i in ${srcdir}/po/*.gmo; do ln $i "$(basename $i .gmo).mo" ; done
 zip "gnupg-w32-$(cat ${srcdir}/VERSION).zip" *
+
+
diff --git a/util/ChangeLog b/util/ChangeLog
index 8aee8a72b..956387baf 100644
--- a/util/ChangeLog
+++ b/util/ChangeLog
@@ -1,3 +1,7 @@
+2000-10-23  Werner Koch  <[email protected]>
+
+	* secmem.c (lock_pool): Don't print warnbing for Windows.
+
 2000-10-16  Werner Koch  <[email protected]>
 
 	* secmem.c (lock_pool): Fixed error checking for Linux.
diff --git a/util/secmem.c b/util/secmem.c
index 1420597e8..ec74aeffd 100644
--- a/util/secmem.c
+++ b/util/secmem.c
@@ -159,6 +159,10 @@ lock_pool( void *p, size_t n )
      * wipes out the memory on a free().
      * Therefore it is sufficient to suppress the warning
      */
+  #elif defined (HAVE_DOSISH_SYSTEM)
+    /* It does not make sense to print such a warning, given the fact that 
+     * this whole Windows !@#$% and their user base are inherently insecure
+     */
   #else
     log_info("Please note that you don't have secure memory on this system\n");
   #endif