summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorbeck <>2014-04-21 00:52:00 +0000
committerbeck <>2014-04-21 00:52:00 +0000
commitc8770e4709b2995721b867e907bbcb0dd2bb7e9f (patch)
treecd22db0cbc1dc9f223275e2f4f2e4eab16a87cf2
parentbc525229ef681d7e80fb71a2257c6741bbf31ca6 (diff)
downloadopenbsd-c8770e4709b2995721b867e907bbcb0dd2bb7e9f.tar.gz
openbsd-c8770e4709b2995721b867e907bbcb0dd2bb7e9f.tar.bz2
openbsd-c8770e4709b2995721b867e907bbcb0dd2bb7e9f.zip
fix accidentally deleted deref.
-rw-r--r--src/lib/libcrypto/asn1/a_time.c2
-rw-r--r--src/lib/libssl/src/crypto/asn1/a_time.c2
2 files changed, 2 insertions, 2 deletions
diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
index 080c3dfddb..8db2163622 100644
--- a/src/lib/libcrypto/asn1/a_time.c
+++ b/src/lib/libcrypto/asn1/a_time.c
@@ -152,7 +152,7 @@ ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out)
152 /* ASN1_STRING_set() allocated 'len + 1' bytes. */ 152 /* ASN1_STRING_set() allocated 'len + 1' bytes. */
153 newlen = t->length + 2 + 1; 153 newlen = t->length + 2 + 1;
154 str = (char *)ret->data; 154 str = (char *)ret->data;
155 i = snprintf(str, newlen, "%s%s", (t->data >= '5') ? "19" : "20", 155 i = snprintf(str, newlen, "%s%s", (t->data[0] >= '5') ? "19" : "20",
156 (char *) t->data); 156 (char *) t->data);
157 if (i == -1 || i >= newlen) { 157 if (i == -1 || i >= newlen) {
158 ASN1_STRING_free(ret); 158 ASN1_STRING_free(ret);
diff --git a/src/lib/libssl/src/crypto/asn1/a_time.c b/src/lib/libssl/src/crypto/asn1/a_time.c
index 080c3dfddb..8db2163622 100644
--- a/src/lib/libssl/src/crypto/asn1/a_time.c
+++ b/src/lib/libssl/src/crypto/asn1/a_time.c
@@ -152,7 +152,7 @@ ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out)
152 /* ASN1_STRING_set() allocated 'len + 1' bytes. */ 152 /* ASN1_STRING_set() allocated 'len + 1' bytes. */
153 newlen = t->length + 2 + 1; 153 newlen = t->length + 2 + 1;
154 str = (char *)ret->data; 154 str = (char *)ret->data;
155 i = snprintf(str, newlen, "%s%s", (t->data >= '5') ? "19" : "20", 155 i = snprintf(str, newlen, "%s%s", (t->data[0] >= '5') ? "19" : "20",
156 (char *) t->data); 156 (char *) t->data);
157 if (i == -1 || i >= newlen) { 157 if (i == -1 || i >= newlen) {
158 ASN1_STRING_free(ret); 158 ASN1_STRING_free(ret);