STABLE-BRANCH-1-2 gnupg (6 files)

[cvs user wk]

    Date: Monday, March 7, 2005 @ 13:39:09
  Author: wk
    Path: /cvs/gnupg/gnupg
     Tag: STABLE-BRANCH-1-2

Modified: ChangeLog README cipher/ChangeLog cipher/primegen.c
          g10/ChangeLog g10/seckey-cert.c

(is_prime): Free A2.  Fixed bug #423.


-------------------+
 ChangeLog         |    2 ++
 README            |    6 +++---
 cipher/ChangeLog  |    4 ++++
 cipher/primegen.c |    1 +
 g10/ChangeLog     |    4 ++++
 g10/seckey-cert.c |    2 +-
 6 files changed, 15 insertions(+), 4 deletions(-)


Index: gnupg/ChangeLog
diff -u gnupg/ChangeLog:1.118.2.88 gnupg/ChangeLog:1.118.2.89
--- gnupg/ChangeLog:1.118.2.88	Mon Jan 17 11:12:13 2005
+++ gnupg/ChangeLog	Mon Mar  7 13:39:09 2005
@@ -1,5 +1,7 @@
 2005-01-17  Werner Koch  <wk at g10code.com>
 
+	* README: Updated for SHA1 checkums.
+
 	* configure.ac: Make --without-included-zlib work as
 	expected. Reported by Norihiko Murase.
 
Index: gnupg/README
diff -u gnupg/README:1.71.2.17 gnupg/README:1.71.2.18
--- gnupg/README:1.71.2.17	Mon Dec 27 18:27:11 2004
+++ gnupg/README	Mon Mar  7 13:39:09 2005
@@ -108,13 +108,13 @@
 
 
     b) If you don't have any of the above programs, you have to verify
-       the MD5 checksum:
+       the SHA1 checksum:
 
-	$ md5sum gnupg-x.y.z.tar.gz
+	$ sha1sum gnupg-x.y.z.tar.gz
 
        This should yield an output _similar_ to this:
 
-	fd9351b26b3189c1d577f0970f9dcadc  gnupg-x.y.z.tar.gz
+	fd935112345678b26b3189c1d577f0970f9dcadc  gnupg-x.y.z.tar.gz
 
        Now check that this checksum is _exactly_ the same as the one
        published via the announcement list and probably via Usenet.
Index: gnupg/cipher/ChangeLog
diff -u gnupg/cipher/ChangeLog:1.111.2.22 gnupg/cipher/ChangeLog:1.111.2.23
--- gnupg/cipher/ChangeLog:1.111.2.22	Mon Mar 29 15:56:57 2004
+++ gnupg/cipher/ChangeLog	Mon Mar  7 13:39:09 2005
@@ -1,3 +1,7 @@
+2005-03-07  Werner Koch  <wk at g10code.com>
+
+	* primegen.c (is_prime): Free A2.  Fixed bug #423.
+
 2004-03-29  Werner Koch  <wk at gnupg.org>
 
 	* elgamal.c (verify): s/exp/exponent/ to shutup a compiler
Index: gnupg/cipher/primegen.c
diff -u gnupg/cipher/primegen.c:1.32.2.2 gnupg/cipher/primegen.c:1.32.2.3
--- gnupg/cipher/primegen.c:1.32.2.2	Fri Oct 10 11:19:48 2003
+++ gnupg/cipher/primegen.c	Mon Mar  7 13:39:09 2005
@@ -497,6 +497,7 @@
     mpi_free( z );
     mpi_free( nminus1 );
     mpi_free( q );
+    mpi_free (a2);
 
     return rc;
 }
Index: gnupg/g10/ChangeLog
diff -u gnupg/g10/ChangeLog:1.249.2.234 gnupg/g10/ChangeLog:1.249.2.235
--- gnupg/g10/ChangeLog:1.249.2.234	Thu Feb 10 05:11:35 2005
+++ gnupg/g10/ChangeLog	Mon Mar  7 13:39:08 2005
@@ -1,3 +1,7 @@
+2005-02-21  Werner Koch  <wk at g10code.com>
+
+	* seckey-cert.c (do_check): Detect card diversion protection.
+
 2005-02-09  David Shaw  <dshaw at jabberwocky.com>
 
 	* mainproc.c (proc_symkey_enc): Set a flag to indicate that a
Index: gnupg/g10/seckey-cert.c
diff -u gnupg/g10/seckey-cert.c:1.67.2.4 gnupg/g10/seckey-cert.c:1.67.2.5
--- gnupg/g10/seckey-cert.c:1.67.2.4	Sun Jun 27 20:26:49 2004
+++ gnupg/g10/seckey-cert.c	Mon Mar  7 13:39:08 2005
@@ -49,7 +49,7 @@
 	CIPHER_HANDLE cipher_hd=NULL;
 	PKT_secret_key *save_sk;
 
-	if( sk->protect.s2k.mode == 1001 ) {
+	if( sk->protect.s2k.mode == 1001 || sk->protect.s2k.mode == 1002 ) {
 	    log_info(_("secret key parts are not available\n"));
 	    return G10ERR_GENERAL;
 	}