From a764b163966a4096063c6623a6773bb6eb3c5a3f Mon Sep 17 00:00:00 2001
From: Simon Josefsson <simon@josefsson.org>
Date: Sat, 1 Sep 2007 00:46:46 +0200
Subject: Use libtasn1 v1.1.

---
 lib/minitasn1/libtasn1.h   | 2 +-
 lib/minitasn1/parser_aux.c | 9 +++++++--
 2 files changed, 8 insertions(+), 3 deletions(-)

(limited to 'lib')

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)
-- 
cgit v1.2.1