Preparinglibgcrypt-1.4.4

4 files changed, 9 insertions, 3 deletions

diff --git a/src/ChangeLog b/src/ChangeLog
index fff10cec..89f34014 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,9 @@
+2009-01-22  Werner Koch  <wk@g10code.com>
+
+	* fips.c (_gcry_initialize_fips_mode): Remove superfluous const
+	from static string.  Reported by Albert Chin.
+	* hmac256.c (selftest): Ditto and change to unsigned char.
+
 2008-12-10  Werner Koch  <wk@g10code.com>
 
 	* hmac256.c (finalize): Fix for big endian hosts.
diff --git a/src/fips.c b/src/fips.c
index 6e0c9ece..9b24da94 100644
--- a/src/fips.c
+++ b/src/fips.c
@@ -136,9 +136,9 @@ _gcry_initialize_fips_mode (int force)
 
   /* Checking based on /proc file properties.  */
   {
+    static const char procfname[] = "/proc/sys/crypto/fips_enabled";
     FILE *fp;
     int saved_errno;
-    static const char const procfname[] = "/proc/sys/crypto/fips_enabled";
 
     fp = fopen (procfname, "r");
     if (fp)
diff --git a/src/gcrypt.h.in b/src/gcrypt.h.in
index 33b65e53..f1c3e310 100644
--- a/src/gcrypt.h.in
+++ b/src/gcrypt.h.in
@@ -1,6 +1,6 @@
 /* gcrypt.h -  GNU Cryptographic Library Interface              -*- c -*-
    Copyright (C) 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006
-                 2007, 2008  Free Software Foundation, Inc.
+                 2007, 2008, 2009  Free Software Foundation, Inc.
   
    This file is part of Libgcrypt.
   
diff --git a/src/hmac256.c b/src/hmac256.c
index daa9cbed..b2f83dd0 100644
--- a/src/hmac256.c
+++ b/src/hmac256.c
@@ -522,7 +522,7 @@ selftest (void)
     const char * const desc;
     const char * const data;
     const char * const key;
-    const char const expect[32];
+    const unsigned char expect[32];
   } tv[] =
     {
       { "data-28 key-4",