LIBGCRYPT-1-2-BRANCH libgcrypt (6 files)

[cvs user wk]

    Date: Wednesday, September 15, 2004 @ 12:23:04
  Author: wk
    Path: /cvs/libgcrypt/libgcrypt
     Tag: LIBGCRYPT-1-2-BRANCH

Modified: cipher/ChangeLog cipher/pubkey.c cipher/random.c cipher/random.h
          src/ChangeLog src/global.c

* random.c (read_pool): Fixed dropping of the volatile warning when
passing MY_PID to add_random.

* pubkey.c (sexp_data_to_mpi): Fixed syntax error. Aiih committing
changes without compiling is a real brown paper bag bug.

* global.c (gcry_control): Adjusted random into call for the
changed API in random.c.  Seemed we never compiled the entire
thing since May.


------------------+
 cipher/ChangeLog |    8 ++++++++
 cipher/pubkey.c  |    2 +-
 cipher/random.c  |    5 ++++-
 cipher/random.h  |    2 +-
 src/ChangeLog    |    6 ++++++
 src/global.c     |    4 +++-
 6 files changed, 23 insertions(+), 4 deletions(-)


Index: libgcrypt/cipher/ChangeLog
diff -u libgcrypt/cipher/ChangeLog:1.211.2.3 libgcrypt/cipher/ChangeLog:1.211.2.4
--- libgcrypt/cipher/ChangeLog:1.211.2.3	Thu Aug 19 12:16:54 2004
+++ libgcrypt/cipher/ChangeLog	Wed Sep 15 12:23:04 2004
@@ -1,3 +1,11 @@
+2004-09-15  Werner Koch  <wk at g10code.de>
+
+	* random.c (read_pool): Fixed dropping of the volatile warning when
+	passing MY_PID to add_random.
+
+	* pubkey.c (sexp_data_to_mpi): Fixed syntax error. Aiih committing
+	changes without compiling is a real brown paper bag bug.
+
 2004-08-19  Werner Koch  <wk at g10code.de>
 
 	* pubkey.c (sexp_data_to_mpi): Changed the zero random byte
Index: libgcrypt/cipher/pubkey.c
diff -u libgcrypt/cipher/pubkey.c:1.69.2.2 libgcrypt/cipher/pubkey.c:1.69.2.3
--- libgcrypt/cipher/pubkey.c:1.69.2.2	Thu Aug 19 12:16:54 2004
+++ libgcrypt/cipher/pubkey.c	Wed Sep 15 12:23:04 2004
@@ -1213,7 +1213,7 @@
                   if (!p[j])
                     p[j] = pp[--k];
                   if (p[j])
-                    j++
+                    j++;
                 }
               gcry_free (pp);
             }
Index: libgcrypt/cipher/random.c
diff -u libgcrypt/cipher/random.c:1.69.2.2 libgcrypt/cipher/random.c:1.69.2.3
--- libgcrypt/cipher/random.c:1.69.2.2	Sat Aug 14 22:15:51 2004
+++ libgcrypt/cipher/random.c	Wed Sep 15 12:23:04 2004
@@ -763,7 +763,10 @@
   
   /* Mix the pid in so that we for sure won't deliver the same random
      after a fork. */
-  add_randomness (&my_pid, sizeof (my_pid), 0);
+  {
+    pid_t apid = my_pid;
+    add_randomness (&apid, sizeof (apid), 0);
+  }
 
   /* Mix the pool (if add_randomness() didn't it). */
   if (!just_mixed)
Index: libgcrypt/cipher/random.h
diff -u libgcrypt/cipher/random.h:1.19 libgcrypt/cipher/random.h:1.19.2.1
--- libgcrypt/cipher/random.h:1.19	Tue Nov 18 15:25:30 2003
+++ libgcrypt/cipher/random.h	Wed Sep 15 12:23:04 2004
@@ -22,7 +22,7 @@
 
 #include "types.h"
 
-void _gcry_random_initialize (void);
+void _gcry_random_initialize (int);
 void _gcry_register_random_progress (void (*cb)(void *,const char*,int,int,int),
                                      void *cb_data );
 void _gcry_random_dump_stats(void);
Index: libgcrypt/src/ChangeLog
diff -u libgcrypt/src/ChangeLog:1.151.2.4 libgcrypt/src/ChangeLog:1.151.2.5
--- libgcrypt/src/ChangeLog:1.151.2.4	Sun Aug 22 10:53:16 2004
+++ libgcrypt/src/ChangeLog	Wed Sep 15 12:23:04 2004
@@ -1,3 +1,9 @@
+2004-09-15  Werner Koch  <wk at g10code.de>
+
+	* global.c (gcry_control): Adjusted random into call for the
+	changed API in random.c.  Seemed we never compiled the entire
+	thing since May.
+
 2004-08-22  Moritz Schulte  <moritz at g10code.com>
 
 	* secmem.c (_gcry_secmem_init): Try to lock pool into core not
Index: libgcrypt/src/global.c
diff -u libgcrypt/src/global.c:1.45 libgcrypt/src/global.c:1.45.2.1
--- libgcrypt/src/global.c:1.45	Thu Apr 15 11:00:22 2004
+++ libgcrypt/src/global.c	Wed Sep 15 12:23:04 2004
@@ -263,7 +263,9 @@
         if (! init_finished)
 	  {
             global_init ();
-            _gcry_random_initialize ();
+            /* Do only a basic random initialization, i.e. init the
+               mutexes. */
+            _gcry_random_initialize (0);
             init_finished = 1;
 	  }
         break;