1 files changed, 1 insertions, 116 deletions

diff --git a/src/lib/libcrypto/asn1/a_time.c b/src/lib/libcrypto/asn1/a_time.c
index a6c7c8e736..7a3742fd70 100644
--- a/src/lib/libcrypto/asn1/a_time.c
+++ b/src/lib/libcrypto/asn1/a_time.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: a_time.c,v 1.26 2015/10/02 15:04:45 beck Exp $ */
+/* $OpenBSD: a_time.c,v 1.27 2015/10/19 16:32:37 beck Exp $ */
 /* ====================================================================
  * Copyright (c) 1999 The OpenSSL Project.  All rights reserved.
  *
@@ -105,118 +105,3 @@ ASN1_TIME_free(ASN1_TIME *a)
 {
         ASN1_item_free((ASN1_VALUE *)a, &ASN1_TIME_it);
 }
-
-ASN1_TIME *
-ASN1_TIME_set(ASN1_TIME *s, time_t t)
-{
-        return ASN1_TIME_adj(s, t, 0, 0);
-}
-
-ASN1_TIME *
-ASN1_TIME_adj(ASN1_TIME *s, time_t t, int offset_day, long offset_sec)
-{
-        struct tm *ts;
-        struct tm data;
-
-        ts = gmtime_r(&t, &data);
-        if (ts == NULL) {
-                ASN1err(ASN1_F_ASN1_TIME_ADJ, ASN1_R_ERROR_GETTING_TIME);
-                return NULL;
-        }
-        if (offset_day || offset_sec) {
-                if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
-                        return NULL;
-        }
-        if ((ts->tm_year >= 50) && (ts->tm_year < 150))
-                return ASN1_UTCTIME_adj(s, t, offset_day, offset_sec);
-        return ASN1_GENERALIZEDTIME_adj(s, t, offset_day, offset_sec);
-}
-
-int
-ASN1_TIME_check(ASN1_TIME *t)
-{
-        if (t->type != V_ASN1_GENERALIZEDTIME && t->type != V_ASN1_UTCTIME)
-                return 0;
-        return (t->type == asn1_time_parse(t->data, t->length, NULL, t->type));
-}
-
-/* Convert an ASN1_TIME structure to GeneralizedTime */
-static ASN1_GENERALIZEDTIME *
-ASN1_TIME_to_generalizedtime_internal(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out)
-{
-        ASN1_GENERALIZEDTIME *ret;
-        char *str;
-        int newlen;
-        int i;
-
-        if (!ASN1_TIME_check(t))
-                return NULL;
-
-        ret = *out;
-
-        /* If already GeneralizedTime just copy across */
-        if (t->type == V_ASN1_GENERALIZEDTIME) {
-                if (!ASN1_STRING_set(ret, t->data, t->length))
-                        return NULL;
-                return ret;
-        }
-
-        /* grow the string */
-        if (!ASN1_STRING_set(ret, NULL, t->length + 2))
-                return NULL;
-        /* ASN1_STRING_set() allocated 'len + 1' bytes. */
-        newlen = t->length + 2 + 1;
-        str = (char *)ret->data;
-        /* XXX ASN1_TIME is not Y2050 compatible */
-        i = snprintf(str, newlen, "%s%s", (t->data[0] >= '5') ? "19" : "20",
-            (char *) t->data);
-        if (i == -1 || i >= newlen) {
-                ASN1_GENERALIZEDTIME_free(ret);
-                *out = NULL;
-                return NULL;
-        }
-        return ret;
-}
-
-ASN1_GENERALIZEDTIME *
-ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out)
-{
-        ASN1_GENERALIZEDTIME *tmp = NULL, *ret;
-
-        if (!out || !*out) {
-                if (!(tmp = ASN1_GENERALIZEDTIME_new()))
-                        return NULL;
-                if (out != NULL)
-                        *out = tmp;
-                else
-                        out = &tmp;
-        }
-
-        ret = ASN1_TIME_to_generalizedtime_internal(t, out);
-        if (ret == NULL && tmp != NULL)
-                ASN1_GENERALIZEDTIME_free(tmp);
-
-        return ret;
-}
-
-int
-ASN1_TIME_set_string(ASN1_TIME *s, const char *str)
-{
-        ASN1_TIME t;
-
-        t.length = strlen(str);
-        t.data = (unsigned char *)str;
-        t.flags = 0;
-
-        t.type = asn1_time_parse(t.data, t.length, NULL, V_ASN1_UTCTIME);
-        if (t.type == -1)
-                t.type = asn1_time_parse(t.data, t.length, NULL,
-                    V_ASN1_GENERALIZEDTIME);
-        if (t.type == -1)
-                return 0;
-
-        if (s && !ASN1_STRING_copy((ASN1_STRING *)s, (ASN1_STRING *)&t))
-                return 0;
-
-        return 1;
-}