Delete #if 0'd time related functions which are totally expired.

No point even seeing these when we do the 2038 audit later on...

diff --git a/lib/libcrypto/asn1/a_utctm.c b/lib/libcrypto/asn1/a_utctm.c
index 0cd0382..e4db9f8 100644 (file)
--- a/lib/libcrypto/asn1/a_utctm.c
+++ b/lib/libcrypto/asn1/a_utctm.c
@@ -62,39 +62,6 @@
 #include "o_time.h"
 #include <openssl/asn1.h>
 
-#if 0
-int
-i2d_ASN1_UTCTIME(ASN1_UTCTIME *a, unsigned char **pp)
-{
-       return(i2d_ASN1_bytes((ASN1_STRING *)a, pp,
-           V_ASN1_UTCTIME, V_ASN1_UNIVERSAL));
-}
-
-ASN1_UTCTIME *
-d2i_ASN1_UTCTIME(ASN1_UTCTIME **a, unsigned char **pp, long length)
-{
-       ASN1_UTCTIME *ret = NULL;
-
-       ret = (ASN1_UTCTIME *)d2i_ASN1_bytes((ASN1_STRING **)a, pp, length,
-           V_ASN1_UTCTIME, V_ASN1_UNIVERSAL);
-       if (ret == NULL) {
-               ASN1err(ASN1_F_D2I_ASN1_UTCTIME, ERR_R_NESTED_ASN1_ERROR);
-               return (NULL);
-       }
-       if (!ASN1_UTCTIME_check(ret)) {
-               ASN1err(ASN1_F_D2I_ASN1_UTCTIME, ASN1_R_INVALID_TIME_FORMAT);
-               goto err;
-       }
-       return (ret);
-
-err:
-       if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-               M_ASN1_UTCTIME_free(ret);
-       return (NULL);
-}
-
-#endif
-
 int
 ASN1_UTCTIME_check(ASN1_UTCTIME *d)
 {
@@ -263,41 +230,3 @@ ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
 
        return 0;
 }
-
-#if 0
-time_t
-ASN1_UTCTIME_get(const ASN1_UTCTIME *s)
-{
-       struct tm tm;
-       int offset;
-
-       memset(&tm, '\0', sizeof tm);
-
-#define g2(p) (((p)[0]-'0')*10+(p)[1]-'0')
-       tm.tm_year = g2(s->data);
-       if (tm.tm_year < 50)
-               tm.tm_year += 100;
-       tm.tm_mon = g2(s->data + 2) - 1;
-       tm.tm_mday = g2(s->data + 4);
-       tm.tm_hour = g2(s->data + 6);
-       tm.tm_min = g2(s->data + 8);
-       tm.tm_sec = g2(s->data + 10);
-       if (s->data[12] == 'Z')
-               offset = 0;
-       else {
-               offset = g2(s->data + 13) * 60 + g2(s->data + 15);
-               if (s->data[12] == '-')
-                       offset = -offset;
-       }
-#undef g2
-
-       return mktime(&tm)-offset*60; /* FIXME: mktime assumes the current timezone
-                                      * instead of UTC, and unless we rewrite OpenSSL
-                                      * in Lisp we cannot locally change the timezone
-                                      * without possibly interfering with other parts
-                                      * of the program. timegm, which uses UTC, is
-                                      * non-standard.
-                                      * Also time_t is inappropriate for general
-                                      * UTC times because it may a 32 bit type. */
-}
-#endif

diff --git a/lib/libcrypto/asn1/asn1.h b/lib/libcrypto/asn1/asn1.h
index e6c93de..868f9c0 100644 (file)
--- a/lib/libcrypto/asn1/asn1.h
+++ b/lib/libcrypto/asn1/asn1.h
@@ -839,9 +839,6 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
                                int offset_day, long offset_sec);
 int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
 int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
-#if 0
-time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
-#endif
 
 int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);

diff --git a/lib/libssl/src/crypto/asn1/a_utctm.c b/lib/libssl/src/crypto/asn1/a_utctm.c
index 0cd0382..e4db9f8 100644 (file)
--- a/lib/libssl/src/crypto/asn1/a_utctm.c
+++ b/lib/libssl/src/crypto/asn1/a_utctm.c
@@ -62,39 +62,6 @@
 #include "o_time.h"
 #include <openssl/asn1.h>
 
-#if 0
-int
-i2d_ASN1_UTCTIME(ASN1_UTCTIME *a, unsigned char **pp)
-{
-       return(i2d_ASN1_bytes((ASN1_STRING *)a, pp,
-           V_ASN1_UTCTIME, V_ASN1_UNIVERSAL));
-}
-
-ASN1_UTCTIME *
-d2i_ASN1_UTCTIME(ASN1_UTCTIME **a, unsigned char **pp, long length)
-{
-       ASN1_UTCTIME *ret = NULL;
-
-       ret = (ASN1_UTCTIME *)d2i_ASN1_bytes((ASN1_STRING **)a, pp, length,
-           V_ASN1_UTCTIME, V_ASN1_UNIVERSAL);
-       if (ret == NULL) {
-               ASN1err(ASN1_F_D2I_ASN1_UTCTIME, ERR_R_NESTED_ASN1_ERROR);
-               return (NULL);
-       }
-       if (!ASN1_UTCTIME_check(ret)) {
-               ASN1err(ASN1_F_D2I_ASN1_UTCTIME, ASN1_R_INVALID_TIME_FORMAT);
-               goto err;
-       }
-       return (ret);
-
-err:
-       if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-               M_ASN1_UTCTIME_free(ret);
-       return (NULL);
-}
-
-#endif
-
 int
 ASN1_UTCTIME_check(ASN1_UTCTIME *d)
 {
@@ -263,41 +230,3 @@ ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t)
 
        return 0;
 }
-
-#if 0
-time_t
-ASN1_UTCTIME_get(const ASN1_UTCTIME *s)
-{
-       struct tm tm;
-       int offset;
-
-       memset(&tm, '\0', sizeof tm);
-
-#define g2(p) (((p)[0]-'0')*10+(p)[1]-'0')
-       tm.tm_year = g2(s->data);
-       if (tm.tm_year < 50)
-               tm.tm_year += 100;
-       tm.tm_mon = g2(s->data + 2) - 1;
-       tm.tm_mday = g2(s->data + 4);
-       tm.tm_hour = g2(s->data + 6);
-       tm.tm_min = g2(s->data + 8);
-       tm.tm_sec = g2(s->data + 10);
-       if (s->data[12] == 'Z')
-               offset = 0;
-       else {
-               offset = g2(s->data + 13) * 60 + g2(s->data + 15);
-               if (s->data[12] == '-')
-                       offset = -offset;
-       }
-#undef g2
-
-       return mktime(&tm)-offset*60; /* FIXME: mktime assumes the current timezone
-                                      * instead of UTC, and unless we rewrite OpenSSL
-                                      * in Lisp we cannot locally change the timezone
-                                      * without possibly interfering with other parts
-                                      * of the program. timegm, which uses UTC, is
-                                      * non-standard.
-                                      * Also time_t is inappropriate for general
-                                      * UTC times because it may a 32 bit type. */
-}
-#endif

diff --git a/lib/libssl/src/crypto/asn1/asn1.h b/lib/libssl/src/crypto/asn1/asn1.h
index e6c93de..868f9c0 100644 (file)
--- a/lib/libssl/src/crypto/asn1/asn1.h
+++ b/lib/libssl/src/crypto/asn1/asn1.h
@@ -839,9 +839,6 @@ ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *s, time_t t,
                                int offset_day, long offset_sec);
 int ASN1_UTCTIME_set_string(ASN1_UTCTIME *s, const char *str);
 int ASN1_UTCTIME_cmp_time_t(const ASN1_UTCTIME *s, time_t t);
-#if 0
-time_t ASN1_UTCTIME_get(const ASN1_UTCTIME *s);
-#endif
 
 int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *a);
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,time_t t);