aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorWerner Koch <[email protected]>2005-03-07 12:39:09 +0000
committerWerner Koch <[email protected]>2005-03-07 12:39:09 +0000
commit37f8183d05f39fcf6165c368a2ec9129abf59b37 (patch)
tree20f90b243b6d8072da5bb89a229021279609f99c
parentDisable the "quick check" bytes for PK decryptions. This is in (diff)
downloadgnupg-37f8183d05f39fcf6165c368a2ec9129abf59b37.tar.gz
gnupg-37f8183d05f39fcf6165c368a2ec9129abf59b37.zip
(is_prime): Free A2. Fixed bug #423.
-rw-r--r--ChangeLog2
-rw-r--r--README6
-rw-r--r--cipher/ChangeLog4
-rw-r--r--cipher/primegen.c1
-rw-r--r--g10/ChangeLog4
-rw-r--r--g10/seckey-cert.c2
6 files changed, 15 insertions, 4 deletions
diff --git a/ChangeLog b/ChangeLog
index c74e87f45..3633c0871 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,5 +1,7 @@
2005-01-17 Werner Koch <[email protected]>
+ * README: Updated for SHA1 checkums.
+
* configure.ac: Make --without-included-zlib work as
expected. Reported by Norihiko Murase.
diff --git a/README b/README
index b549067a0..b12962d0d 100644
--- a/README
+++ b/README
@@ -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.
diff --git a/cipher/ChangeLog b/cipher/ChangeLog
index a96580ca1..68b79c46f 100644
--- a/cipher/ChangeLog
+++ b/cipher/ChangeLog
@@ -1,3 +1,7 @@
+2005-03-07 Werner Koch <[email protected]>
+
+ * primegen.c (is_prime): Free A2. Fixed bug #423.
+
2004-03-29 Werner Koch <[email protected]>
* elgamal.c (verify): s/exp/exponent/ to shutup a compiler
diff --git a/cipher/primegen.c b/cipher/primegen.c
index 9ee3436bf..c5b60525a 100644
--- a/cipher/primegen.c
+++ b/cipher/primegen.c
@@ -497,6 +497,7 @@ is_prime( MPI n, int steps, int *count )
mpi_free( z );
mpi_free( nminus1 );
mpi_free( q );
+ mpi_free (a2);
return rc;
}
diff --git a/g10/ChangeLog b/g10/ChangeLog
index ed26a2391..193bf7b08 100644
--- a/g10/ChangeLog
+++ b/g10/ChangeLog
@@ -1,3 +1,7 @@
+2005-02-21 Werner Koch <[email protected]>
+
+ * seckey-cert.c (do_check): Detect card diversion protection.
+
2005-02-09 David Shaw <[email protected]>
* mainproc.c (proc_symkey_enc): Set a flag to indicate that a
diff --git a/g10/seckey-cert.c b/g10/seckey-cert.c
index 8870ac3e3..596b8f595 100644
--- a/g10/seckey-cert.c
+++ b/g10/seckey-cert.c
@@ -49,7 +49,7 @@ do_check( PKT_secret_key *sk, const char *tryagain_text, int *canceled )
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;
}