aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorMichal Rokos <m.rokos@sh.cvut.cz>2002-01-16 14:49:39 +0000
committerMichal Rokos <m.rokos@sh.cvut.cz>2002-01-16 14:49:39 +0000
commite781373eab3282c392e3f5dbd990a59378843bc6 (patch)
treebfd8de7da1465bce6a045b3e382f250244f8bc63
parent8717a87985a8b5fa3443ed9f5691f758d16d153a (diff)
downloadruby-openssl-history-e781373eab3282c392e3f5dbd990a59378843bc6.tar.gz
* really fixed strptime.c (silly me, thanks Hynek)
-rw-r--r--ChangeLog3
-rw-r--r--README2
-rw-r--r--missing/strptime.c2
-rw-r--r--ossl.c1
4 files changed, 5 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index b9892c2..861aece 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -4,6 +4,9 @@ Copyright (C) 2001 Michal Rokos <m.rokos@sh.cvut.cz>
All rights reserved.
$Log$
+Revision 1.27 2002/01/16 14:49:52 majkl
+ * really fixed strptime.c (silly me, thanks Hynek)
+
Revision 1.26 2002/01/16 13:52:24 majkl
* fixed missing/strptime.c (Hynek)
* more strict format for UTC time (ossl.c - 'Z' in the end)
diff --git a/README b/README
index 09e0e6d..0e76e87 100644
--- a/README
+++ b/README
@@ -11,7 +11,7 @@ Michal Rokos <m.rokos@sh.cvut.cz> - The rest (too long to enumerate)
[Contributors]
UNKNOWN <oss-ruby@technorama.net>oss-ruby@technorama.net - BN implementation core
-Hynek Rostinsky <Hynek.Rostinsky@foresta.cz> - Windows platform fixes
+Hynek Rostinsky <Hynek.Rostinsky@foresta.cz> - Windows platform fixes (strptime mainly)
[Done] (but not fully tested)
= PKey:: RSA,DSA keys - new, load, export
diff --git a/missing/strptime.c b/missing/strptime.c
index 2ae4cbf..9178ec6 100644
--- a/missing/strptime.c
+++ b/missing/strptime.c
@@ -350,7 +350,7 @@ strptime(char *buf, char *fmt, struct tm *tm)
if (c == 'Y')
i -= 1900;
- else if (c < 69) /*c=='y', 00-68 is for 20xx, the rest is for 19xx*/
+ else if (i < 69) /*c=='y', 00-68 is for 20xx, the rest is for 19xx*/
i += 100;
if (i < 0)
diff --git a/ossl.c b/ossl.c
index 0e96277..c2385b2 100644
--- a/ossl.c
+++ b/ossl.c
@@ -57,7 +57,6 @@ asn1time_to_time(ASN1_UTCTIME *time)
switch(time->type) {
case V_ASN1_UTCTIME:
- rb_warn("UTCTIME: %s", time->data);
if (!strptime(time->data, "%y%m%d%H%M%SZ", &tm)) {
rb_raise(rb_eTypeError, "bad UTCTIME format");
}