Make sure dot is not set after tz - fixes incorrect handling, which allows

20151005171301+1.09Z to be treated as a valid time.

ok beck@

2 files changed, 4 insertions, 4 deletions

diff --git a/src/lib/libcrypto/asn1/a_time_tm.c b/src/lib/libcrypto/asn1/a_time_tm.c
index 7b25e439c4..81a92ad6d8 100644
--- a/src/lib/libcrypto/asn1/a_time_tm.c
+++ b/src/lib/libcrypto/asn1/a_time_tm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_time_tm.c,v 1.2 2015/10/04 15:15:11 jsing Exp $ */
+/* $OpenBSD: a_time_tm.c,v 1.3 2015/10/05 06:13:58 jsing Exp $ */
 /*
  * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
  *
@@ -120,7 +120,7 @@ asn1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode)
                 char *t = buf + i;
                 if (isdigit((unsigned char)*t))
                         continue;
-                if (*t == '.' && dot == NULL) {
+                if (*t == '.' && dot == NULL && tz == NULL) {
                         dot = t;
                         continue;
                 }
diff --git a/src/lib/libssl/src/crypto/asn1/a_time_tm.c b/src/lib/libssl/src/crypto/asn1/a_time_tm.c
index 7b25e439c4..81a92ad6d8 100644
--- a/src/lib/libssl/src/crypto/asn1/a_time_tm.c
+++ b/src/lib/libssl/src/crypto/asn1/a_time_tm.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_time_tm.c,v 1.2 2015/10/04 15:15:11 jsing Exp $ */
+/* $OpenBSD: a_time_tm.c,v 1.3 2015/10/05 06:13:58 jsing Exp $ */
 /*
  * Copyright (c) 2015 Bob Beck <beck@openbsd.org>
  *
@@ -120,7 +120,7 @@ asn1_time_parse(const char *bytes, size_t len, struct tm *tm, int mode)
                 char *t = buf + i;
                 if (isdigit((unsigned char)*t))
                         continue;
-                if (*t == '.' && dot == NULL) {
+                if (*t == '.' && dot == NULL && tz == NULL) {
                         dot = t;
                         continue;
                 }