diff options
| author | Werner Koch <wk@gnupg.org> | 2011-02-21 17:04:46 +0100 |
|---|---|---|
| committer | Werner Koch <wk@gnupg.org> | 2011-02-21 17:04:46 +0100 |
| commit | 2442ca23030c8900c907166ca3f5d31d1907ead8 (patch) | |
| tree | 345ea4d6ecda4b39616fae2e93ccac8939bdbd71 /src | |
| parent | 61a521277c6347e99fec8b6575271f705360d802 (diff) | |
| download | libgcrypt-2442ca23030c8900c907166ca3f5d31d1907ead8.tar.gz | |
Final changes for 1.5.0-beta1
Diffstat (limited to 'src')
| -rw-r--r-- | src/ChangeLog | 7 | ||||
| -rw-r--r-- | src/dumpsexp.c | 10 | ||||
| -rw-r--r-- | src/global.c | 20 | ||||
| -rw-r--r-- | src/versioninfo.rc.in | 2 |
4 files changed, 20 insertions, 19 deletions
diff --git a/src/ChangeLog b/src/ChangeLog index 750c8dad..a9523ccb 100644 --- a/src/ChangeLog +++ b/src/ChangeLog @@ -1,3 +1,8 @@ +2011-02-21 Werner Koch <wk@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@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@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 a397b241..6ea05e83 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 6336fea2..51d7f396 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 2e9402d1..401851e8 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@.@LIBGCRYPT_LT_AGE@.@LIBGCRYPT_LT_REVISION@.@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" |