[git] GCRYPT - branch, master, updated. post-nuke-of-trailing-ws-14-g2442ca2
by Werner Koch
cvs at cvs.gnupg.org
Mon Feb 21 17:40:07 CET 2011
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "The GNU crypto library".
The branch, master has been updated
via 2442ca23030c8900c907166ca3f5d31d1907ead8 (commit)
from 61a521277c6347e99fec8b6575271f705360d802 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 2442ca23030c8900c907166ca3f5d31d1907ead8
Author: Werner Koch <wk at gnupg.org>
Date: Mon Feb 21 17:04:46 2011 +0100
Final changes for 1.5.0-beta1
diff --git a/ChangeLog b/ChangeLog
index 01c1213..e487942 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -1,3 +1,7 @@
+2011-02-21 Werner Koch <wk at g10code.com>
+
+ Release 1.5.0-beta1.
+
2011-02-18 Werner Koch <wk at g10code.com>
* configure.ac [GCC]: Remove the use of -fno-strict-aliasing.
diff --git a/NEWS b/NEWS
index 3a92ad5..ffbdc84 100644
--- a/NEWS
+++ b/NEWS
@@ -1,21 +1,6 @@
Noteworthy changes in version 1.5.x (unreleased)
------------------------------------------------
- * New variants of the TIGER algorithm.
-
- * New cipher algorithm mode for AES-WRAP.
-
- * Fixed minor memory leak in DSA key generation.
-
- * No more switching to FIPS mode if /proc/version is not readable.
-
- * Fixed sigill during Padlock detection on old CPUs.
-
- * Fixed a hang on some W2000 machines.
-
- * Boosted SHA-512 performance by 30% on ia32 boxes and gcc 4.3;
- SHA-256 went up by 25%.
-
* Support for WindowsCE.
* Support ECDH.
@@ -39,15 +24,31 @@ Noteworthy changes in version 1.5.x (unreleased)
whether you really need this feature or how it can be replaced by
an internal plugin mechanism.
+ * New variants of the TIGER algorithm. [also in 1.4.6]
+
+ * New cipher algorithm mode for AES-WRAP. [also in 1.4.6]
+
+ * Fixed minor memory leak in DSA key generation. [also in 1.4.5]
+
+ * No more switching to FIPS mode if /proc/version is not
+ readable. [also in 1.4.5]
+
+ * Fixed sigill during Padlock detection on old CPUs. [also in 1.4.5]
+
+ * Fixed a hang on some W2000 machines. [also in 1.4.5]
+
+ * Boosted SHA-512 performance by 30% on ia32 boxes and gcc 4.3;
+ SHA-256 went up by 25%. [also in 1.4.5]
+
* Interface changes relative to the 1.4.2 release:
~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~~
- GCRY_CIPHER_MODE_AESWRAP NEW.
GCRY_PK_ECDH NEW.
- GCRY_MD_TIGER1 NEW.
- GCRY_MD_TIGER2 NEW.
gcry_pk_get_curve NEW.
gcry_pk_get_param NEW.
GCRYCTL_DISABLE_HWF NEW.
+ GCRY_CIPHER_MODE_AESWRAP NEW. [also in 1.4.6]
+ GCRY_MD_TIGER1 NEW. [also in 1.4.6]
+ GCRY_MD_TIGER2 NEW. [also in 1.4.6]
Noteworthy changes in version 1.4.4 (2009-01-22)
diff --git a/README b/README
index 6fe1cfb..0b4e882 100644
--- a/README
+++ b/README
@@ -6,7 +6,7 @@
THE STABLE VERSION IS THE 1.4.
Copyright 2000, 2002, 2003, 2004, 2007, 2008,
- 2009 Free Software Foundation, Inc.
+ 2009, 2011 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/configure.ac b/configure.ac
index 013ff3a..a28ea83 100644
--- a/configure.ac
+++ b/configure.ac
@@ -26,8 +26,8 @@ min_automake_version="1.10"
# Remember to change the version number immediately *after* a release.
# 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.5.0])
-m4_define([my_issvn], [yes])
+m4_define([my_version], [1.5.0-beta1])
+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)]))
diff --git a/src/ChangeLog b/src/ChangeLog
index 750c8da..a9523cc 100644
--- a/src/ChangeLog
+++ b/src/ChangeLog
@@ -1,3 +1,8 @@
+2011-02-21 Werner Koch <wk at g10code.com>
+
+ * global.c (gcry_check_version): Do not take the patchlevel in
+ account; it is not well defined.
+
2011-02-17 Werner Koch <wk at g10code.com>
* gcrypt-module.h (gcry_cipher_register, gcry_cipher_unregister)
@@ -2259,7 +2264,7 @@ Tue Dec 8 13:15:16 CET 1998 Werner Koch <wk at isil.d.shuttle.de>
Copyright (C) 1998,1999,2000,2001,2002,2003
- 2004, 2005, 2008, 2009, 2011 Free Software Foundation, Inc.
+ 2004,2005,2008,2009,2011 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/src/dumpsexp.c b/src/dumpsexp.c
index a397b24..6ea05e8 100644
--- a/src/dumpsexp.c
+++ b/src/dumpsexp.c
@@ -273,11 +273,11 @@ printchr (int c)
putchar (c);
}
-static void
-printhex (int c)
-{
- printf ("\\x%02x", c);
-}
+/* static void */
+/* printhex (int c) */
+/* { */
+/* printf ("\\x%02x", c); */
+/* } */
#if 0
diff --git a/src/global.c b/src/global.c
index 6336fea..51d7f39 100644
--- a/src/global.c
+++ b/src/global.c
@@ -234,7 +234,7 @@ gcry_check_version( const char *req_version )
const char *ver = VERSION;
int my_major, my_minor, my_micro;
int rq_major, rq_minor, rq_micro;
- const char *my_plvl, *rq_plvl;
+ const char *my_plvl;
/* Initialize library. */
global_init ();
@@ -250,23 +250,19 @@ gcry_check_version( const char *req_version )
assert() here and bail out in case this happens? -mo. */
return NULL;
- /* Parse requested version number. */
- rq_plvl = parse_version_string( req_version, &rq_major, &rq_minor,
- &rq_micro );
- if ( !rq_plvl )
- /* req version string is invalid, this can happen. */
- return NULL;
+ /* Parse requested version number. */
+ if (!parse_version_string (req_version, &rq_major, &rq_minor, &rq_micro))
+ return NULL; /* req version string is invalid, this can happen. */
/* Compare version numbers. */
if ( my_major > rq_major
|| (my_major == rq_major && my_minor > rq_minor)
+ || (my_major == rq_major && my_minor == rq_minor && my_micro > rq_micro)
|| (my_major == rq_major && my_minor == rq_minor
- && my_micro > rq_micro)
- || (my_major == rq_major && my_minor == rq_minor
- && my_micro == rq_micro
- && strcmp( my_plvl, rq_plvl ) >= 0) ) {
+ && my_micro == rq_micro))
+ {
return ver;
- }
+ }
return NULL;
}
diff --git a/src/versioninfo.rc.in b/src/versioninfo.rc.in
index 2e9402d..401851e 100644
--- a/src/versioninfo.rc.in
+++ b/src/versioninfo.rc.in
@@ -39,7 +39,7 @@ BEGIN
VALUE "FileDescription", "Libgcrypt - The GNU Crypto Library\0"
VALUE "FileVersion", "@LIBGCRYPT_LT_CURRENT at .@LIBGCRYPT_LT_AGE at .@LIBGCRYPT_LT_REVISION at .@BUILD_REVISION@\0"
VALUE "InternalName", "libgcrypt\0"
- VALUE "LegalCopyright", "Copyright © 2008 Free Software Foundation, Inc.\0"
+ VALUE "LegalCopyright", "Copyright © 2011 Free Software Foundation, Inc.\0"
VALUE "LegalTrademarks", "\0"
VALUE "OriginalFilename", "libgcrypt.dll\0"
VALUE "PrivateBuild", "\0"
diff --git a/tests/ChangeLog b/tests/ChangeLog
index 281f9fa..8ef49fc 100644
--- a/tests/ChangeLog
+++ b/tests/ChangeLog
@@ -1,6 +1,9 @@
2011-02-21 Werner Koch <wk at g10code.com>
- * benchmark.c (md_bench): Allow for rthe --alignment option.
+ * version.c (main): Do a verbatim check of the version string.
+ * basic.c (main): Ditto. But die on mismatch.
+
+ * benchmark.c (md_bench): Allow for the --alignment option.
(main): Allow alignments between 1 and 16.
2011-02-16 Werner Koch <wk at g10code.com>
diff --git a/tests/basic.c b/tests/basic.c
index bcc39cc..185091e 100644
--- a/tests/basic.c
+++ b/tests/basic.c
@@ -2509,8 +2509,10 @@ main (int argc, char **argv)
if (use_fips)
gcry_control (GCRYCTL_FORCE_FIPS_MODE, 0);
- if (!gcry_check_version (GCRYPT_VERSION))
- die ("version mismatch\n");
+ /* Check that we test exactly our version - including the patchlevel. */
+ if (strcmp (GCRYPT_VERSION, gcry_check_version (NULL)))
+ die ("version mismatch; pgm=%s, library=%s\n",
+ GCRYPT_VERSION,gcry_check_version (NULL));
if ( gcry_fips_mode_active () )
in_fips_mode = 1;
diff --git a/tests/benchmark.c b/tests/benchmark.c
index 2eca86f..106e01b 100644
--- a/tests/benchmark.c
+++ b/tests/benchmark.c
@@ -472,7 +472,7 @@ md_bench ( const char *algoname )
start_timer ();
for (repcount=0; repcount < hash_repetitions; repcount++)
for (i=0; i < 1000000; i++)
- gcry_md_write (hd, buf[0], 1);
+ gcry_md_write (hd, buf, 1);
gcry_md_final (hd);
stop_timer ();
printf (" %s", elapsed_time ());
@@ -1224,7 +1224,8 @@ main( int argc, char **argv )
if (!gcry_check_version (GCRYPT_VERSION))
{
- fprintf (stderr, PGM ": version mismatch\n");
+ fprintf (stderr, PGM ": version mismatch; pgm=%s, library=%s\n",
+ GCRYPT_VERSION, gcry_check_version (NULL));
exit (1);
}
diff --git a/tests/version.c b/tests/version.c
index 3cbecbc..af3c4c3 100644
--- a/tests/version.c
+++ b/tests/version.c
@@ -45,10 +45,13 @@ main (int argc, char **argv)
(void)argv;
gcry_control (GCRYCTL_DISABLE_SECMEM, 0);
- if (!gcry_check_version (GCRYPT_VERSION))
+ if (strcmp (GCRYPT_VERSION, gcry_check_version (NULL)))
{
- fprintf (stderr, PGM ": version mismatch\n");
- exit (1);
+ int oops = !gcry_check_version (GCRYPT_VERSION);
+ fprintf (stderr, PGM ": %sversion mismatch; pgm=%s, library=%s\n",
+ oops? "":"warning: ", GCRYPT_VERSION, gcry_check_version (NULL));
+ if (oops)
+ exit (1);
}
gcry_control (GCRYCTL_PRINT_CONFIG, NULL);
-----------------------------------------------------------------------
Summary of changes:
ChangeLog | 4 ++++
NEWS | 37 +++++++++++++++++++------------------
README | 2 +-
configure.ac | 4 ++--
src/ChangeLog | 7 ++++++-
src/dumpsexp.c | 10 +++++-----
src/global.c | 20 ++++++++------------
src/versioninfo.rc.in | 2 +-
tests/ChangeLog | 5 ++++-
tests/basic.c | 6 ++++--
tests/benchmark.c | 5 +++--
tests/version.c | 9 ++++++---
12 files changed, 63 insertions(+), 48 deletions(-)
hooks/post-receive
--
The GNU crypto library
http://git.gnupg.org
More information about the Gnupg-commits
mailing list