diff options
| author | Simon Josefsson <simon@josefsson.org> | 2007-09-01 00:46:46 +0200 |
|---|---|---|
| committer | Simon Josefsson <simon@josefsson.org> | 2007-09-01 00:46:46 +0200 |
| commit | a764b163966a4096063c6623a6773bb6eb3c5a3f (patch) | |
| tree | 1781f2cce18c82cc42ce923692642287114bd246 /lib | |
| parent | 991706feccfe77cd0b41c16155bdd16ebf8b6406 (diff) | |
| download | gnutls-a764b163966a4096063c6623a6773bb6eb3c5a3f.tar.gz | |
Use libtasn1 v1.1.
Diffstat (limited to 'lib')
| -rw-r--r-- | lib/minitasn1/libtasn1.h | 2 | ||||
| -rw-r--r-- | lib/minitasn1/parser_aux.c | 9 |
2 files changed, 8 insertions, 3 deletions
diff --git a/lib/minitasn1/libtasn1.h b/lib/minitasn1/libtasn1.h index 4f80eff5c1..eb6508b601 100644 --- a/lib/minitasn1/libtasn1.h +++ b/lib/minitasn1/libtasn1.h @@ -31,7 +31,7 @@ extern "C" { #endif -#define LIBTASN1_VERSION "1.0" +#define LIBTASN1_VERSION "1.1" #include <sys/types.h> #include <time.h> diff --git a/lib/minitasn1/parser_aux.c b/lib/minitasn1/parser_aux.c index fbb6a8005b..51169b14b4 100644 --- a/lib/minitasn1/parser_aux.c +++ b/lib/minitasn1/parser_aux.c @@ -1,5 +1,5 @@ /* - * Copyright (C) 2004, 2006 Free Software Foundation + * Copyright (C) 2004, 2006, 2007 Free Software Foundation * Copyright (C) 2000,2001 Fabio Fiorina * * This file is part of LIBTASN1. @@ -1012,8 +1012,13 @@ parse_version_string (const char *s, int *major, int *minor, int *micro) return NULL; s++; s = parse_version_number (s, minor); - if (!s || *s != '.') + if (!s) return NULL; + if (*s != '.') + { + *micro = 0; + return s; + } s++; s = parse_version_number (s, micro); if (!s) |