RT1815: More const'ness improvements

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

diff --git a/crypto/asn1/a_gentm.c b/crypto/asn1/a_gentm.c
index def79062a57de3d0397eb0732a3fe2879eda7932..1c66fcfee6b4c2643f89bd16565e632e8733d276 100644 (file)
--- a/crypto/asn1/a_gentm.c
+++ b/crypto/asn1/a_gentm.c
@@ -61,8 +61,8 @@
 #include <stdio.h>
 #include <time.h>
 #include "cryptlib.h"
-#include "o_time.h"
 #include <openssl/asn1.h>
+#include "asn1_locl.h"
 
 #if 0
 
@@ -115,10 +115,10 @@ err:
 
 #endif
 
-int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *d)
+int asn1_generalizedtime_to_tm(struct tm *tm, const ASN1_GENERALIZEDTIME *d)
        {
-       static int min[9]={ 0, 0, 1, 1, 0, 0, 0, 0, 0};
-       static int max[9]={99, 99,12,31,23,59,59,12,59};
+       static const int min[9]={ 0, 0, 1, 1, 0, 0, 0, 0, 0};
+       static const int max[9]={99, 99,12,31,23,59,59,12,59};
        char *a;
        int n,i,l,o;
 
@@ -135,7 +135,12 @@ int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *d)
                {
                if ((i == 6) && ((a[o] == 'Z') ||
                        (a[o] == '+') || (a[o] == '-')))
-                       { i++; break; }
+                       {
+                       i++;
+                       if (tm)
+                               tm->tm_sec = 0;
+                       break;
+                       }
                if ((a[o] < '0') || (a[o] > '9')) goto err;
                n= a[o]-'0';
                if (++o > l) goto err;
@@ -145,6 +150,33 @@ int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *d)
                if (++o > l) goto err;
 
                if ((n < min[i]) || (n > max[i])) goto err;
+               if (tm)
+                       {
+                       switch(i)
+                               {
+                       case 0:
+                               tm->tm_year = n * 100 - 1900;
+                               break;
+                       case 1:
+                               tm->tm_year += n;
+                               break;
+                       case 2:
+                               tm->tm_mon = n - 1;
+                               break;
+                       case 3:
+                               tm->tm_mday = n;
+                               break;
+                       case 4:
+                               tm->tm_hour = n;
+                               break;
+                       case 5:
+                               tm->tm_min = n;
+                               break;
+                       case 6:
+                               tm->tm_sec = n;
+                               break;
+                               }
+                       }
                }
        /* Optional fractional seconds: decimal point followed by one
         * or more digits.
@@ -163,6 +195,7 @@ int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *d)
                o++;
        else if ((a[o] == '+') || (a[o] == '-'))
                {
+               int offsign = a[o] == '-' ? -1 : 1, offset = 0;
                o++;
                if (o+4 > l) goto err;
                for (i=7; i<9; i++)
@@ -173,14 +206,33 @@ int ASN1_GENERALIZEDTIME_check(ASN1_GENERALIZEDTIME *d)
                        if ((a[o] < '0') || (a[o] > '9')) goto err;
                        n=(n*10)+ a[o]-'0';
                        if ((n < min[i]) || (n > max[i])) goto err;
+                       if (tm)
+                               {
+                               if (i == 7)
+                                       offset = n * 3600;
+                               else if (i == 8)
+                                       offset += n * 60;
+                               }
                        o++;
                        }
+               if (offset && !OPENSSL_gmtime_adj(tm, 0, offset * offsign))
+                       return 0;
+               }
+       else if (a[o])
+               {
+               /* Missing time zone information. */
+               goto err;
                }
        return(o == l);
 err:
        return(0);
        }
 
+int ASN1_GENERALIZEDTIME_check(const ASN1_GENERALIZEDTIME *d)
+       {
+       return asn1_generalizedtime_to_tm(NULL, d);
+       }
+
 int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str)
        {
        ASN1_GENERALIZEDTIME t;
@@ -205,6 +257,12 @@ int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str)
 
 ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
             time_t t)
+       {
+               return ASN1_GENERALIZEDTIME_adj(s, t, 0, 0);
+       }
+
+ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_adj(ASN1_GENERALIZEDTIME *s,
+            time_t t, int offset_day, long offset_sec)
        {
        char *p;
        struct tm *ts;
@@ -220,13 +278,19 @@ ASN1_GENERALIZEDTIME *ASN1_GENERALIZEDTIME_set(ASN1_GENERALIZEDTIME *s,
        if (ts == NULL)
                return(NULL);
 
+       if (offset_day || offset_sec)
+               { 
+               if (!OPENSSL_gmtime_adj(ts, offset_day, offset_sec))
+                       return NULL;
+               }
+
        p=(char *)s->data;
        if ((p == NULL) || ((size_t)s->length < len))
                {
                p=OPENSSL_malloc(len);
                if (p == NULL)
                        {
-                       ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_SET,
+                       ASN1err(ASN1_F_ASN1_GENERALIZEDTIME_ADJ,
                                ERR_R_MALLOC_FAILURE);
                        return(NULL);
                        }