It seems that mktime does what is required here. Certainly timegm() can

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

diff --git a/crypto/asn1/a_utctm.c b/crypto/asn1/a_utctm.c
index 5c5d8a1cabbe498a468f52c74279de2963327761..b855867dc1d30693bff1e8aa925f95884d64eccc 100644 (file)
--- a/crypto/asn1/a_utctm.c
+++ b/crypto/asn1/a_utctm.c
@@ -58,17 +58,36 @@
 
 #include <stdio.h>
 #include <time.h>
+#ifdef VMS
+#include <descrip.h>
+#include <lnmdef.h>
+#include <starlet.h>
+#endif
 #include "cryptlib.h"
 #include <openssl/asn1.h>
 
-/* ASN1err(ASN1_F_ASN1_UTCTIME_NEW,ASN1_R_UTCTIME_TOO_LONG);
- * ASN1err(ASN1_F_D2I_ASN1_UTCTIME,ASN1_R_EXPECTING_A_UTCTIME);
- */
+ASN1_UTCTIME *ASN1_UTCTIME_new(void)
+{ return M_ASN1_UTCTIME_new(); }
+
+void ASN1_UTCTIME_free(ASN1_UTCTIME *x)
+{ M_ASN1_UTCTIME_free(x); }
 
 int i2d_ASN1_UTCTIME(ASN1_UTCTIME *a, unsigned char **pp)
        {
+#ifndef CHARSET_EBCDIC
        return(i2d_ASN1_bytes((ASN1_STRING *)a,pp,
                V_ASN1_UTCTIME,V_ASN1_UNIVERSAL));
+#else
+       /* KLUDGE! We convert to ascii before writing DER */
+       int len;
+       char tmp[24];
+       ASN1_STRING x = *(ASN1_STRING *)a;
+
+       len = x.length;
+       ebcdic2ascii(tmp, x.data, (len >= sizeof tmp) ? sizeof tmp : len);
+       x.data = tmp;
+       return i2d_ASN1_bytes(&x, pp, V_ASN1_UTCTIME,V_ASN1_UNIVERSAL);
+#endif
        }
 
 
@@ -84,6 +103,9 @@ ASN1_UTCTIME *d2i_ASN1_UTCTIME(ASN1_UTCTIME **a, unsigned char **pp,
                ASN1err(ASN1_F_D2I_ASN1_UTCTIME,ERR_R_NESTED_ASN1_ERROR);
                return(NULL);
                }
+#ifdef CHARSET_EBCDIC
+       ascii2ebcdic(ret->data, ret->data, ret->length);
+#endif
        if (!ASN1_UTCTIME_check(ret))
                {
                ASN1err(ASN1_F_D2I_ASN1_UTCTIME,ASN1_R_INVALID_TIME_FORMAT);
@@ -93,7 +115,7 @@ ASN1_UTCTIME *d2i_ASN1_UTCTIME(ASN1_UTCTIME **a, unsigned char **pp,
        return(ret);
 err:
        if ((ret != NULL) && ((a == NULL) || (*a != ret)))
-               ASN1_UTCTIME_free(ret);
+               M_ASN1_UTCTIME_free(ret);
        return(NULL);
        }
 
@@ -176,14 +198,52 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
 #endif
 
        if (s == NULL)
-               s=ASN1_UTCTIME_new();
+               s=M_ASN1_UTCTIME_new();
        if (s == NULL)
                return(NULL);
 
 #if defined(THREADS) && !defined(WIN32)
-       ts=(struct tm *)gmtime_r(&t,&data);
+       gmtime_r(&t,&data); /* should return &data, but doesn't on some systems, so we don't even look at the return value */
+       ts=&data;
 #else
-       ts=(struct tm *)gmtime(&t);
+       ts=gmtime(&t);
+#endif
+#ifdef VMS
+       if (ts == NULL)
+               {
+               static $DESCRIPTOR(tabnam,"LNM$DCL_LOGICAL");
+               static $DESCRIPTOR(lognam,"SYS$TIMEZONE_DIFFERENTIAL");
+               char result[256];
+               unsigned int reslen = 0;
+               struct {
+                       short buflen;
+                       short code;
+                       void *bufaddr;
+                       unsigned int *reslen;
+               } itemlist[] = {
+                       { 0, LNM$_STRING, 0, 0 },
+                       { 0, 0, 0, 0 },
+               };
+               int status;
+
+               /* Get the value for SYS$TIMEZONE_DIFFERENTIAL */
+               itemlist[0].buflen = sizeof(result);
+               itemlist[0].bufaddr = result;
+               itemlist[0].reslen = &reslen;
+               status = sys$trnlnm(0, &tabnam, &lognam, 0, itemlist);
+               if (!(status & 1))
+                       return NULL;
+               result[reslen] = '\0';
+
+               /* Get the numerical value of the equivalence string */
+               status = atoi(result);
+
+               /* and use it to move time to GMT */
+               t -= status;
+
+               /* then convert the result to the time structure */
+               ts=(struct tm *)localtime(&t);
+               }
 #endif
        p=(char *)s->data;
        if ((p == NULL) || (s->length < 14))
@@ -199,5 +259,37 @@ ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
                ts->tm_mon+1,ts->tm_mday,ts->tm_hour,ts->tm_min,ts->tm_sec);
        s->length=strlen(p);
        s->type=V_ASN1_UTCTIME;
+#ifdef CHARSET_EBCDIC_not
+       ebcdic2ascii(s->data, s->data, s->length);
+#endif
        return(s);
        }
+
+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;
+       }