Make sure the last character of the ASN.1 time string (the 'Z') is copied.

[openssl.git] / crypto / asn1 / a_time.c

diff --git a/crypto/asn1/a_time.c b/crypto/asn1/a_time.c
index 718992d0a574fd6663987345f9c4d63faa3d99c7..3a03c9e4e4863857588d6f2b862b0f456fcc7c59 100644 (file)
--- a/crypto/asn1/a_time.c
+++ b/crypto/asn1/a_time.c
@@ -64,45 +64,95 @@
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
-#include <openssl/asn1.h>
+#include "o_time.h"
+#include <openssl/asn1t.h>
 
+IMPLEMENT_ASN1_MSTRING(ASN1_TIME, B_ASN1_TIME)
+
+IMPLEMENT_ASN1_FUNCTIONS(ASN1_TIME)
+
+#if 0
 int i2d_ASN1_TIME(ASN1_TIME *a, unsigned char **pp)
        {
+#ifdef CHARSET_EBCDIC
+       /* KLUDGE! We convert to ascii before writing DER */
+       char tmp[24];
+       ASN1_STRING tmpstr;
+
+       if(a->type == V_ASN1_UTCTIME || a->type == V_ASN1_GENERALIZEDTIME) {
+           int len;
+
+           tmpstr = *(ASN1_STRING *)a;
+           len = tmpstr.length;
+           ebcdic2ascii(tmp, tmpstr.data, (len >= sizeof tmp) ? sizeof tmp : len);
+           tmpstr.data = tmp;
+           a = (ASN1_GENERALIZEDTIME *) &tmpstr;
+       }
+#endif
        if(a->type == V_ASN1_UTCTIME || a->type == V_ASN1_GENERALIZEDTIME)
                                return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
                                     a->type ,V_ASN1_UNIVERSAL));
        ASN1err(ASN1_F_I2D_ASN1_TIME,ASN1_R_EXPECTING_A_TIME);
        return -1;
        }
-
-
-ASN1_TIME *d2i_ASN1_TIME(ASN1_TIME **a, unsigned char **pp, long length)
-       {
-       unsigned char tag;
-       tag = **pp & ~V_ASN1_CONSTRUCTED;
-       if(tag == (V_ASN1_UTCTIME|V_ASN1_UNIVERSAL))
-                                        return d2i_ASN1_UTCTIME(a, pp, length);
-       if(tag == (V_ASN1_GENERALIZEDTIME|V_ASN1_UNIVERSAL))
-                               return d2i_ASN1_GENERALIZEDTIME(a, pp, length);
-       ASN1err(ASN1_F_D2I_ASN1_TIME,ASN1_R_EXPECTING_A_TIME);
-       return(NULL);
-       }
+#endif
 
 
 ASN1_TIME *ASN1_TIME_set(ASN1_TIME *s, time_t t)
        {
        struct tm *ts;
-#if defined(THREADS) && !defined(WIN32)
        struct tm data;
-#endif
 
-#if defined(THREADS) && !defined(WIN32)
-       gmtime_r(&t,&data);
-       ts=&data; /* should return &data, but doesn't on some systems, so we don't even look at the return value */
-#else
-       ts=gmtime(&t);
-#endif
+       ts=OPENSSL_gmtime(&t,&data);
+       if (ts == NULL)
+               return NULL;
        if((ts->tm_year >= 50) && (ts->tm_year < 150))
                                        return ASN1_UTCTIME_set(s, t);
        return ASN1_GENERALIZEDTIME_set(s,t);
        }
+
+int ASN1_TIME_check(ASN1_TIME *t)
+       {
+       if (t->type == V_ASN1_GENERALIZEDTIME)
+               return ASN1_GENERALIZEDTIME_check(t);
+       else if (t->type == V_ASN1_UTCTIME)
+               return ASN1_UTCTIME_check(t);
+       return 0;
+       }
+
+/* Convert an ASN1_TIME structure to GeneralizedTime */
+ASN1_GENERALIZEDTIME *ASN1_TIME_to_generalizedtime(ASN1_TIME *t, ASN1_GENERALIZEDTIME **out)
+       {
+       ASN1_GENERALIZEDTIME *ret;
+       char *str;
+
+       if (!ASN1_TIME_check(t)) return NULL;
+
+       if (!out || !*out)
+               {
+               if (!(ret = ASN1_GENERALIZEDTIME_new ()))
+                       return NULL;
+               if (out) *out = ret;
+               }
+       else 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;
+       str = (char *)ret->data;
+       /* Work out the century and prepend */
+       if (t->data[0] >= '5') strcpy(str, "19");
+       else strcpy(str, "20");
+
+       BUF_strlcat(str, (char *)t->data, t->length+3); /* Include space for a '\0' */
+
+       return ret;
+       }