From 8316958553958ddb20c2f18a1d6287e48d022946 Mon Sep 17 00:00:00 2001 From: Werner Koch Date: Thu, 22 Jan 2009 19:06:01 +0000 Subject: Preparing --- AUTHORS | 5 +++-- ChangeLog | 10 ++++++++-- NEWS | 7 ++++--- README | 4 ++-- THANKS | 1 + cipher/ChangeLog | 4 ++++ cipher/ecc.c | 2 +- configure.ac | 6 +++--- doc/gcrypt.texi | 2 +- m4/ChangeLog | 5 +++++ m4/noexecstack.m4 | 2 +- random/ChangeLog | 5 +++++ random/random.c | 2 +- src/ChangeLog | 6 ++++++ src/fips.c | 2 +- src/gcrypt.h.in | 2 +- src/hmac256.c | 2 +- 17 files changed, 48 insertions(+), 19 deletions(-) diff --git a/AUTHORS b/AUTHORS index 699e7a82..0372c284 100644 --- a/AUTHORS +++ b/AUTHORS @@ -1,4 +1,5 @@ Library: Libgcrypt +Homepage: http://www.gnu.org/software/libgcrypt/ Maintainer: Werner Koch Bug reports: or http://bugs.gnupg.org Security related bug reports: @@ -116,8 +117,8 @@ It has a permissive license and is copyright by atsec information security corporation. See the file for details. - Copyright 1998, 1999, 2000, 2001, 2002, 2003, - 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2006, + 2007, 2008, 2009 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/ChangeLog b/ChangeLog index 6690deda..bb874269 100644 --- a/ChangeLog +++ b/ChangeLog @@ -1,3 +1,9 @@ +2009-01-22 Werner Koch + + Release 1.4.4. + + * configure.ac: Bump LT version to C16/A5/R2. + 2008-10-30 Werner Koch * configure.ac: Remove option --enable-gcc-warnings. Autodetect @@ -1326,8 +1332,8 @@ Fri Feb 13 19:43:41 1998 Werner Koch (wk@isil.d.shuttle.de) * Makefile.am: Likewise - Copyright 1998, 1999, 2000, 2001, 2002, 2003, - 2004, 2006, 2007, 2008 Free Software Foundation, Inc. + Copyright 1998, 1999, 2000, 2001, 2002, 2003, 2004, 2006, + 2007, 2008, 2009 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/NEWS b/NEWS index 4fee4fce..e4a202be 100644 --- a/NEWS +++ b/NEWS @@ -1,4 +1,4 @@ -Noteworthy changes in version 1.4.4 +Noteworthy changes in version 1.4.4 (2009-01-22) ------------------------------------------------ * Publish GCRY_MODULE_ID_USER and GCRY_MODULE_ID_USER_LAST constants. @@ -12,7 +12,7 @@ Noteworthy changes in version 1.4.4 and DSA keys using the FIPS 186-2 algorithm. * The transient-key flag is now also supported for DSA key - generation. DSA domain parameters may given as well. + generation. DSA domain parameters may be given as well. Noteworthy changes in version 1.4.3 (2008-09-18) @@ -585,7 +585,8 @@ Noteworthy changes in version 1.1.3 (2001-05-31) into into libgcrypt and GnuPG. -Copyright 2001, 2002, 2003, 2004, 2007, 2008 Free Software Foundation, Inc. +Copyright 2001, 2002, 2003, 2004, 2007, 2008, + 2009 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/README b/README index 0b382308..78dbd037 100644 --- a/README +++ b/README @@ -3,8 +3,8 @@ Version 1.4.4 - Copyright 2000, 2002, 2003, 2004, 2007, - 2008 Free Software Foundation, Inc. + Copyright 2000, 2002, 2003, 2004, 2007, 2008, + 2009 Free Software Foundation, Inc. This file is free software; as a special exception the author gives unlimited permission to copy and/or distribute it, with or without diff --git a/THANKS b/THANKS index 34bd99b9..f34974d3 100644 --- a/THANKS +++ b/THANKS @@ -2,6 +2,7 @@ Libgcrypt is based on the GnuPG code. Here is a list of people, who helped in GnuPG and Libgcrypt development. Please help us to keep it complete and free of errors. +Albert Chin china at thewrittenword com Allan Clark allanc@sco.com Anand Kumria wildfire@progsoc.uts.edu.au Andreas Metzler ametzler at downhill.at.eu.org diff --git a/cipher/ChangeLog b/cipher/ChangeLog index 8c7e1b46..8924f17e 100644 --- a/cipher/ChangeLog +++ b/cipher/ChangeLog @@ -1,3 +1,7 @@ +2009-01-22 Werner Koch + + * ecc.c (compute_keygrip): Remove superfluous const. + 2009-01-06 Werner Koch * rmd160.c (oid_spec_rmd160): Add TeleTrust identifier. diff --git a/cipher/ecc.c b/cipher/ecc.c index 978c6d12..fcbd8e3a 100644 --- a/cipher/ecc.c +++ b/cipher/ecc.c @@ -1208,9 +1208,9 @@ ecc_get_nbits (int algo, gcry_mpi_t *pkey) static gpg_err_code_t compute_keygrip (gcry_md_hd_t md, gcry_sexp_t keyparam) { + static const char names[] = "pabgnq"; gpg_err_code_t ec = 0; gcry_sexp_t l1; - static const char const names[] = "pabgnq"; gcry_mpi_t values[6]; int idx; diff --git a/configure.ac b/configure.ac index 85ec5f7d..50fb071d 100644 --- a/configure.ac +++ b/configure.ac @@ -1,6 +1,6 @@ # Configure.ac script for Libgcrypt # 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. # @@ -27,7 +27,7 @@ min_automake_version="1.10" # Set my_issvn to "yes" for non-released code. Remember to run an # "svn up" and "autogen.sh" right before creating a distribution. m4_define([my_version], [1.4.4]) -m4_define([my_issvn], [yes]) +m4_define([my_issvn], [no]) m4_define([svn_revision], m4_esyscmd([printf "%d" $(svn info 2>/dev/null \ | sed -n '/^Revision:/ s/[^0-9]//gp'|head -1)])) @@ -40,7 +40,7 @@ AC_INIT([libgcrypt], # (No interfaces changed: REVISION++) LIBGCRYPT_LT_CURRENT=16 LIBGCRYPT_LT_AGE=5 -LIBGCRYPT_LT_REVISION=1 +LIBGCRYPT_LT_REVISION=2 # If the API is changed in an incompatible way: increment the next counter. diff --git a/doc/gcrypt.texi b/doc/gcrypt.texi index 2cdc9af5..e3289949 100644 --- a/doc/gcrypt.texi +++ b/doc/gcrypt.texi @@ -2844,7 +2844,7 @@ building blocks of the library. @strong{This interface has a few known problems; most noteworthy an inherent tendency to leak memory. It might not be available in -forthcoming versions Libgcrypt.} +forthcoming versions of Libgcrypt.} @menu diff --git a/m4/ChangeLog b/m4/ChangeLog index 49c1b321..fc1433b0 100644 --- a/m4/ChangeLog +++ b/m4/ChangeLog @@ -1,3 +1,8 @@ +2009-01-22 Werner Koch + + * noexecstack.m4: Replace non portable grep -q. Reported by + Albert Chin. + 2007-02-22 Werner Koch * noexecstack.m4: Change default to enable it. diff --git a/m4/noexecstack.m4 b/m4/noexecstack.m4 index f1924a79..4aab484f 100644 --- a/m4/noexecstack.m4 +++ b/m4/noexecstack.m4 @@ -37,7 +37,7 @@ void foo() {} EOF if AC_TRY_COMMAND([${CC} $CFLAGS $CPPFLAGS -S -o conftest.s conftest.c >/dev/null]) \ - && grep -q .note.GNU-stack conftest.s \ + && grep .note.GNU-stack conftest.s >/dev/null \ && AC_TRY_COMMAND([${CCAS} $CCASFLAGS $CPPFLAGS -Wa,--noexecstack -c -o conftest.o conftest.s >/dev/null]) then diff --git a/random/ChangeLog b/random/ChangeLog index 1b6c4688..c3bcb584 100644 --- a/random/ChangeLog +++ b/random/ChangeLog @@ -1,3 +1,8 @@ +2009-01-22 Werner Koch + + * random.c (_gcry_random_deinit_external_test): Do not return a + value. Reported Albert Chin. + 2008-09-16 Werner Koch * random-fips.c (x931_aes_driver): No re-seeding with test contexts. diff --git a/random/random.c b/random/random.c index 85d5fa97..8df87e2d 100644 --- a/random/random.c +++ b/random/random.c @@ -319,5 +319,5 @@ void _gcry_random_deinit_external_test (void *context) { if (fips_mode ()) - return _gcry_rngfips_deinit_external_test (context); + _gcry_rngfips_deinit_external_test (context); } 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 + + * 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 * 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", -- cgit v1.2.1