The "Samba" bug fixes :-)

ChangeLog

@@ -1,3 +1,8 @@
+2001-03-18  Werner Koch  <wk@gnupg.org>
+
+	* configure.in: Hardwire the use of -lsocket for some
+	systems. Thanks to Reinhard Wobst.
+
 2001-03-13  Werner Koch  <wk@gnupg.org>
 
 	* configure.in: Add copyright notice and -lwsock32.

NOTES

@@ -1,3 +1,7 @@
+Checking ElGamal signatures is really slow and the reason for the long 
+running time on parts o my keyring.  Because somekeys are also checked at startup, this is even worser.  I should invalidate my self signature with algo 16 or 20.
+
+Further problem:  It seems that the caching does only work in part.
 
 
 SCO UnixWare/7.1.0  reported by Allan Clark <allanc@sco.com> for 0.9.8

THANKS

@@ -50,6 +50,8 @@ Frank Stajano		   frank.stajano@cl.cam.ac.uk
 Frank Tobin		   ftobin@uiuc.edu
 Gabriel Rosenkoetter	   gr@eclipsed.net
 Gaël Quéri		   gqueri@mail.dotcom.fr
+Gene Carter                gcarter@lanier.com
+Georg Schwarz              georg.schwarz@iname.com
 Giampaolo Tomassoni        g.tomassoni@libero.it
 Gilbert Fernandes          gilbert_fernandes@hotmail.com
 Greg Louis		   glouis@dynamicro.on.ca
@@ -87,6 +89,7 @@ Karl Fogel		   kfogel@guanabana.onshore.com
 Karsten Thygesen	   karthy@kom.auc.dk
 Katsuhiro Kondou	   kondou@nec.co.jp
 Kazu Yamamoto		   kazu@iijlab.net
+Kevin Ryde                 user42@zip.com.au
 Klaus Singvogel            ks@caldera.de
 Lars Kellogg-Stedman	   lars@bu.edu
 L. Sassaman		   rabbi@quickie.net
@@ -119,6 +122,7 @@ Philippe Laliberte	   arsphl@oeil.qc.ca
 Peter Fales                psfales@lucent.com
 Peter Gutmann		   pgut001@cs.auckland.ac.nz
 Peter Marschall 	   Peter.Marschall@gedos.de
+Piotr Krukowiecki          piotr@pingu.ii.uj.edu.pl
 QingLong		   qinglong@bolizm.ihep.su
 Ralph Gillen		   gillen@theochem.uni-duesseldorf.de
 Rat			   ratinox@peorth.gweep.net

checks/ChangeLog

@@ -1,3 +1,14 @@
+2001-03-20  Werner Koch  <wk@gnupg.org>
+
+	* Makefile.am: Import the pubdemo.asc file 
+
+	* sigs.test (hash_algo_list): s/tiger/tiger192/
+
+2001-03-19  Werner Koch  <wk@gnupg.org>
+
+	* mkdemodirs (GPGDEMO): Add --allow-secret-key-import to all gpg
+	invocations.  Use echon -n instead of an argument with \c.
+
 2001-02-12  Werner Koch  <wk@gnupg.org>
 
 	* multisig.test: new

checks/Makefile.am

@@ -19,6 +19,7 @@
 ## Process this file with automake to create Makefile.in
 
 GPG_DEARMOR = ../g10/gpg --no-options --quiet --yes --dearmor
+GPG_IMPORT  = ../g10/gpg --homedir . --no-options --quiet --yes --import
 
 TESTS = version.test mds.test \
 	decrypt.test decrypt-dsa.test \
@@ -57,8 +58,9 @@ prepared.stamp: ./pubring.gpg ./secring.gpg ./plain-1 ./plain-2 ./plain-3 \
 	 echo timestamp >./prepared.stamp
 
 
-./pubring.gpg: $(srcdir)/pubring.asc
+./pubring.gpg: $(srcdir)/pubring.asc $(srcdir)/pubdemo.asc
 	 $(GPG_DEARMOR) -o ./pubring.gpg $(srcdir)/pubring.asc
+	 $(GPG_IMPORT) $(srcdir)/pubdemo.asc	 
 
 ./secring.gpg: $(srcdir)/secring.asc
 	 $(GPG_DEARMOR) -o ./secring.gpg $(srcdir)/secring.asc

checks/mkdemodirs

@@ -2,7 +2,7 @@
 
 set -e
 
-GPG="../g10/gpg --batch --quiet --no-secmem-warning"
+GPG="../g10/gpg --batch --quiet --no-secmem-warning --allow-secret-key-import"
 NAMES='Alpha Bravo Charlie Delta Echo Foxtrot Golf Hotel India
        Juliet Kilo Lima Mike November Oscar Papa Quebec Romeo
        Sierra Tango Uniform Victor Whisky XRay Yankee Zulu'
@@ -19,9 +19,9 @@ $GPG --dearmor -o pubdemo.gpg --yes ../checks/pubdemo.asc
 [ -f ./tdb.tmp ] && rm ./tdb.tmp
 GPGDEMO="$GPG --homedir . --trustdb-name ./tdb.tmp --no-default-keyring
 	 --keyring pubdemo.gpg --secret-keyring secdemo.gpg"
-/bin/echo "Creating:\c"
+echo -n "Creating:"
 for name in $NAMES; do
-    /bin/echo " $name\c"
+    echo -n " $name"
     [ -d $name ] && rm -r $name
     mkdir $name
     $GPGDEMO --export-secret-key -o - $name > $name/Secret.gpg

checks/sigs.test

@@ -10,8 +10,8 @@ for i in $plain_files $data_files; do
 done
 
 hash_algo_list="ripemd160 sha1 md5"
-if have_hash_algo "TIGER"; then
+if have_hash_algo "TIGER192"; then
-  hash_algo_list="$hash_algo_list tiger"
+  hash_algo_list="$hash_algo_list tiger192"
 fi
 
 for da in $hash_algo_list ; do

cipher/ChangeLog

@@ -1,3 +1,10 @@
+2001-03-19  Werner Koch  <wk@gnupg.org>
+
+	* blowfish.c (encrypt,do_encrypt): Changed name to do_encrypt to
+	avoid name clahses with an encrypt function in stdlib.h of
+	Dynix/PIX.  Thanks to Gene Carter.
+	* elgamal.c (encrypt,do_encrypt): Ditto.
+
 2001-03-12  Werner Koch  <wk@gnupg.org>
 
 	* twofish.c (gnupgext_enum_func): Add some static when comnpiled

cipher/blowfish.c

@@ -280,7 +280,7 @@ function_F( BLOWFISH_context *bc, u32 x )
 
 
 static void
-encrypt(  BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr )
+do_encrypt(  BLOWFISH_context *bc, u32 *ret_xl, u32 *ret_xr )
 {
   #if BLOWFISH_ROUNDS == 16
     u32 xl, xr, *s0, *s1, *s2, *s3, *p;
@@ -419,7 +419,7 @@ encrypt_block( BLOWFISH_context *bc, byte *outbuf, byte *inbuf )
 
     d1 = inbuf[0] << 24 | inbuf[1] << 16 | inbuf[2] << 8 | inbuf[3];
     d2 = inbuf[4] << 24 | inbuf[5] << 16 | inbuf[6] << 8 | inbuf[7];
-    encrypt( bc, &d1, &d2 );
+    do_encrypt( bc, &d1, &d2 );
     outbuf[0] = (d1 >> 24) & 0xff;
     outbuf[1] = (d1 >> 16) & 0xff;
     outbuf[2] = (d1 >>	8) & 0xff;
@@ -524,27 +524,27 @@ bf_setkey( BLOWFISH_context *c, byte *key, unsigned keylen )
 
     datal = datar = 0;
     for(i=0; i < BLOWFISH_ROUNDS+2; i += 2 ) {
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->p[i]   = datal;
 	c->p[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s0[i]   = datal;
 	c->s0[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s1[i]   = datal;
 	c->s1[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s2[i]   = datal;
 	c->s2[i+1] = datar;
     }
     for(i=0; i < 256; i += 2 )	{
-	encrypt( c, &datal, &datar );
+	do_encrypt( c, &datal, &datar );
 	c->s3[i]   = datal;
 	c->s3[i+1] = datar;
     }

cipher/elgamal.c

@@ -50,7 +50,7 @@ static void test_keys( ELG_secret_key *sk, unsigned nbits );
 static MPI gen_k( MPI p );
 static void generate( ELG_secret_key *sk, unsigned nbits, MPI **factors );
 static int  check_secret_key( ELG_secret_key *sk );
-static void encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey );
+static void do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey );
 static void decrypt(MPI output, MPI a, MPI b, ELG_secret_key *skey );
 static void sign(MPI a, MPI b, MPI input, ELG_secret_key *skey);
 static int  verify(MPI a, MPI b, MPI input, ELG_public_key *pkey);
@@ -136,7 +136,7 @@ test_keys( ELG_secret_key *sk, unsigned nbits )
 	m_free(p);
     }
 
-    encrypt( out1_a, out1_b, test, &pk );
+    do_encrypt( out1_a, out1_b, test, &pk );
     decrypt( out2, out1_a, out1_b, sk );
     if( mpi_cmp( test, out2 ) )
 	log_fatal("ElGamal operation: encrypt, decrypt failed\n");
@@ -338,7 +338,7 @@ check_secret_key( ELG_secret_key *sk )
 
 
 static void
-encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey )
+do_encrypt(MPI a, MPI b, MPI input, ELG_public_key *pkey )
 {
     MPI k;
 
@@ -557,7 +557,7 @@ elg_encrypt( int algo, MPI *resarr, MPI data, MPI *pkey )
     pk.y = pkey[2];
     resarr[0] = mpi_alloc( mpi_get_nlimbs( pk.p ) );
     resarr[1] = mpi_alloc( mpi_get_nlimbs( pk.p ) );
-    encrypt( resarr[0], resarr[1], data, &pk );
+    do_encrypt( resarr[0], resarr[1], data, &pk );
     return 0;
 }
 

configure.in

@@ -327,21 +327,28 @@ if test "$ac_cv_header_gdbm_h" = yes ; then
 fi
 fi
 
-
 dnl Solaris needs -lsocket and -lnsl. Unisys system includes
 dnl gethostbyname in libsocket but needs libnsl for socket.
-AC_CHECK_LIB(nsl, gethostbyname)
+dnl The test does not workfor all system, so some are hardcoded here.
-AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
+case "${target}" in
-if test x$ac_need_libsocket = x1; then
+   i386-univel-sysv4*)
-    LIBS="$LIBS -lsocket"
+        LIBS="$LIBS -lsocket -lnsl"
-fi
+        ;;
-if test x$ac_try_nsl = x1; then
+   *)
-    AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
+      AC_CHECK_LIB(nsl, gethostbyname)
-    if test x$ac_need_libnsl = x1
+      AC_CHECK_LIB(socket, socket, ac_need_libsocket=1, ac_try_nsl=1)
-    then
+      if test x$ac_need_libsocket = x1; then
-        LIBS="$LIBS -lnsl"
+          LIBS="$LIBS -lsocket"
-    fi
+      fi
-fi
+      if test x$ac_try_nsl = x1; then
+         AC_CHECK_LIB(nsl, gethostbyname, ac_need_libnsl=1)
+         if test x$ac_need_libnsl = x1
+         then
+            LIBS="$LIBS -lnsl"
+         fi
+      fi
+      ;;
+esac
 
 
 if test "$try_dynload" = yes ; then

g10/ChangeLog

@@ -1,5 +1,24 @@
+2001-03-21  Werner Koch  <wk@gnupg.org>
+
+	* status.c: Add sys/types.h so that it runs on Ultrix.  Reported
+	by Georg Schwarz.x
+
+	* build-packet.c (build_sig_subpkt): Fixed generaton of packet
+	length header in case where 2 bytes headers are needed.  Thanks to
+	Piotr Krukowiecki.
+
+2001-03-19  Werner Koch  <wk@gnupg.org>
+
+	* g10.c (main): the default keyring is no always used unless
+	--no-default-keyring is given.  
+
+	* ringedit.c (add_keyblock_resource): invalidate cache after file
+	creation.
+
 2001-03-15  Werner Koch  <wk@gnupg.org>
 
+	* keygen.c (ask_algo): Changed the warning of the ElGamal S+E Algo.
+
 	* keylist.c (print_capabilities): New.
 	(list_keyblock_colon): and use it here.
 

g10/build-packet.c

@@ -818,7 +818,7 @@ build_sig_subpkt( PKT_signature *sig, sigsubpkttype_t type,
     }
     else if( nlen == 2 ) {
 	data[n0+2] = (buflen+1-192) / 256 + 192;
-	data[n0+3] = (buflen+1-192) & 256;
+	data[n0+3] = (buflen+1-192) % 256;
 	data[n0+4] = type;
 	memcpy(data+n0+5, buffer, buflen );
     }

g10/g10.c

@@ -605,7 +605,7 @@ main( int argc, char **argv )
     char *configname = NULL;
     unsigned configlineno;
     int parse_debug = 0;
-    int default_config =1;
+    int default_config = 1;
     int default_keyring = 1;
     int greeting = 0;
     int nogreeting = 0;
@@ -1128,11 +1128,11 @@ main( int argc, char **argv )
     if( cmd != aDeArmor && cmd != aEnArmor
 	&& !(cmd == aKMode && argc == 2 ) ) {
 
-	if( !sec_nrings && default_keyring )  /* add default secret rings */
+	if( !sec_nrings || default_keyring )  /* add default secret rings */
 	    add_keyblock_resource("secring.gpg", 0, 1);
 	for(sl = sec_nrings; sl; sl = sl->next )
 	    add_keyblock_resource( sl->d, 0, 1 );
-	if( !nrings && default_keyring )  /* add default ring */
+	if( !nrings || default_keyring )  /* add default ring */
 	    add_keyblock_resource("pubring.gpg", 0, 0);
 	for(sl = nrings; sl; sl = sl->next )
 	    add_keyblock_resource( sl->d, 0, 0 );

g10/keygen.c

@@ -416,8 +416,10 @@ gen_dsa(unsigned int nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 }
 
 #if 0
-/* we can't enable generation right now, becuase we first need to implement
+/* we can't enable generation right now, becuase we first need to
- * the keyflags */
+ * implement the keyflags - the problem is that we need to change all
+ * signature editing function to keep the ketflags associated with an
+ * RSA key.  */
 static int
 gen_rsa(int algo, unsigned nbits, KBNODE pub_root, KBNODE sec_root, DEK *dek,
 	STRING2KEY *s2k, PKT_secret_key **ret_sk, u32 expireval )
@@ -568,7 +570,7 @@ ask_algo( int addmode )
       #endif
 	else if( algo == 4 ) {
 	    if( cpr_get_answer_is_yes("keygen.algo.elg_se",_(
-		"Do you really want to create a sign and encrypt key? "))) {
+		"The use of this algorithm is deprecated - create anyway? "))){
 		algo = PUBKEY_ALGO_ELGAMAL;
 		break;
 	    }

g10/ringedit.c

@@ -198,7 +198,7 @@ add_keyblock_resource( const char *url, int force, int secret )
     char *filename = NULL;
     int rc = 0;
     enum resource_type rt = rt_UNKNOWN;
-
+    const char *created_fname = NULL;
 
     /* Do we have an URL?
      *	gnupg-gdbm:filename  := this is a GDBM resource
@@ -317,12 +317,14 @@ add_keyblock_resource( const char *url, int force, int secret )
 	      #endif
 		if( !opt.quiet )
 		    log_info(_("%s: keyring created\n"), filename );
+                created_fname = filename;
 	    }
 	}
       #if HAVE_DOSISH_SYSTEM || 1
 	iobuf_close( iobuf );
 	iobuf = NULL;
-	/* must close it again */
+        if (created_fname) /* must invalidate that ugly cache */
+            iobuf_ioctl (NULL, 2, 0, (char*)created_fname);
       #endif
 	break;
 

g10/status.c

@@ -30,6 +30,7 @@
     #include <sys/capability.h>
   #endif
   #ifdef HAVE_SYS_IPC_H
+    #include <sys/types.h>
     #include <sys/ipc.h>
   #endif
   #ifdef HAVE_SYS_SHM_H

mpi/ChangeLog

@@ -1,3 +1,9 @@
+2001-03-18  Werner Koch  <wk@gnupg.org>
+
+	* config.links (mpi_sflags): Use i386 code for i386.  According to
+	tests by Kevin Ryde the i586 code runs slow on i386 CPUs.  Ditto
+	for i786.
+
 2000-10-24  Werner Koch  <wk@gnupg.org>
 
 	* mips3/: Changed a few comments to C-style. By Jeff Long.

mpi/config.links

@@ -12,18 +12,18 @@ echo '/* created by config.links - do not edit */' >./mpi/asm-syntax.h
 
 if test "$try_asm_modules" = "yes" ; then
 case "${target}" in
-    i[34]86*-*-freebsd*-elf  | \
+    i[3467]86*-*-freebsd*-elf  | \
-    i[34]86*-*-freebsd[3-9]* | \
+    i[3467]86*-*-freebsd[3-9]* | \
-    i[34]86*-*-freebsdelf*   | \
+    i[3467]86*-*-freebsdelf*   | \
-    i[34]86*-*-netbsd* )
+    i[3467]86*-*-netbsd* )
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
        cat  $srcdir/mpi/i386/syntax.h	   >>./mpi/asm-syntax.h
        path="i386"
        ;;
-    i[56]86*-*-freebsd*-elf  | \
+    i586*-*-freebsd*-elf  | \
-    i[56]86*-*-freebsd[3-9]* | \
+    i586*-*-freebsd[3-9]* | \
-    i[56]86*-*-freebsdelf*   | \
+    i586*-*-freebsdelf*   | \
-    i[56]86*-*-netbsd*	     | \
+    i586*-*-netbsd*	     | \
     pentium-*-netbsd*	     | \
     pentiumpro-*-netbsd*)
        echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
@@ -35,38 +35,38 @@ case "${target}" in
        cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
        path="i386"
        ;;
-    i[34]86*-*-linuxaout*  | \
+    i[3467]86*-*-linuxaout*  | \
-    i[34]86*-*-linuxoldld* | \
+    i[3467]86*-*-linuxoldld* | \
-    i[34]86*-*-*bsd*)
+    i[3467]86*-*-*bsd*)
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
 	path="i386"
 	;;
-    i[56]86*-*-linuxaout*  | \
+    i586*-*-linuxaout*  | \
-    i[56]86*-*-linuxoldld* | \
+    i586*-*-linuxoldld* | \
-    i[56]86*-*-*bsd*)
+    i586*-*-*bsd*)
 	echo '#define BSD_SYNTAX' >>./mpi/asm-syntax.h
 	echo '#define X86_BROKEN_ALIGN' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
 	path="i586 i386"
 	;;
-    i[34]86*-msdosdjgpp*)
+    i[3467]86*-msdosdjgpp*)
 	echo '#define BSD_SYNTAX'        >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
 	path="i386"
 	;;
-    i[56]86*-msdosdjgpp*)
+    i586*-msdosdjgpp*)
 	echo '#define BSD_SYNTAX'        >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	 >>./mpi/asm-syntax.h
 	path="i586 i386"
 	;;
-    i[34]86*-*-*)
+    i[3467]86*-*-*)
 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h
 	cat  $srcdir/mpi/i386/syntax.h	    >>./mpi/asm-syntax.h
 	path="i386"
 	;;
-    i[56]86*-*-*  | \
+    i586*-*-*  | \
     pentium-*-*   | \
     pentiumpro-*-*)
 	echo '#define ELF_SYNTAX' >>./mpi/asm-syntax.h

po/ChangeLog

@@ -1,3 +1,7 @@
+2001-03-18  Werner Koch  <wk@gnupg.org>
+
+	* de.po, de.glo: Updated. 
+
 2001-02-22  Werner Koch  <wk@gnupg.org>
 
 	* de.po, de.glo: Updated.

po/de.glo

@@ -1,6 +1,6 @@
 # Glossary for GnuPG german translation
 # Zusammenstellung der Liste:
-# Copyright (C) 1998 Free Software Foundation, Inc.
+# Copyright (C) 1998, 1999, 2000, 20001 Free Software Foundation, Inc.
 # Walter Koch <koch@hsp.de>, 1998.
 #
 # This is just a textfile for your information.

tools/ChangeLog

@@ -1,3 +1,7 @@
+2001-03-21  Werner Koch  <wk@gnupg.org>
+
+	* shmtest.c: Add sys/types.h
+
 Fri Sep 15 18:40:36 CEST 2000  Werner Koch  <wk@openit.de>
 
         * ring-a-party: An array start at offset 1 no 0.  Many thanks to Mike

tools/shmtest.c

@@ -10,6 +10,7 @@
 #include <signal.h>
 #include <unistd.h>
 #ifdef HAVE_SYS_IPC_H
+  #include <sys/types.h>
   #include <sys/ipc.h>
 #endif
 #ifdef HAVE_SYS_SHM_H

util/iobuf.c

@@ -1,5 +1,5 @@
 /* iobuf.c  -  file handling
- *	Copyright (C) 1998, 1999, 2000 Free Software Foundation, Inc.
+ *	Copyright (C) 1998, 1999, 2000, 2001 Free Software Foundation, Inc.
  *
  * This file is part of GnuPG.
  *