Upgrade chrome's OpenSSL to same version Android ships with.

openssl/crypto/asn1/a_gentm.c

 /* crypto/asn1/a_gentm.c */
 /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
  * All rights reserved.
  *
  * This package is an SSL implementation written
  * by Eric Young (eay@cryptsoft.com).
  * The implementation was written so as to conform with Netscapes SSL.
  * 
  * This library is free for commercial and non-commercial use as long as
  * the following conditions are aheared to.  The following conditions
@@ skipping 99 matching lines @@
 err:
         if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                 M_ASN1_GENERALIZEDTIME_free(ret);
         return(NULL);
         }
 
 #endif
 
 int ASN1_GENERALIZEDTIME_check(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;
 
         if (d->type != V_ASN1_GENERALIZEDTIME) return(0);
         l=d->length;
         a=(char *)d->data;
         o=0;
         /* GENERALIZEDTIME is similar to UTCTIME except the year is
          * represented as YYYY. This stuff treats everything as a two digit
          * field so make first two fields 00 to 99
@@ skipping 37 matching lines @@
                         {
                         if ((a[o] < '0') || (a[o] > '9')) goto err;
                         n= a[o]-'0';
                         o++;
                         if ((a[o] < '0') || (a[o] > '9')) goto err;
                         n=(n*10)+ a[o]-'0';
                         if ((n < min[i]) || (n > max[i])) goto err;
                         o++;
                         }
                 }
+        else
+                {
+                /* Missing time zone information. */
+                goto err;
+                }
         return(o == l);
 err:
         return(0);
         }
 
 int ASN1_GENERALIZEDTIME_set_string(ASN1_GENERALIZEDTIME *s, const char *str)
         {
         ASN1_GENERALIZEDTIME t;
 
         t.type=V_ASN1_GENERALIZEDTIME;
@@ skipping 10 matching lines @@
                         }
                 return(1);
                 }
         else
                 return(0);
         }
 
 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;
         struct tm data;
         size_t len = 20; 
 
         if (s == NULL)
                 s=M_ASN1_GENERALIZEDTIME_new();
         if (s == NULL)
                 return(NULL);
 
         ts=OPENSSL_gmtime(&t, &data);
         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);
                         }
                 if (s->data != NULL)
                         OPENSSL_free(s->data);
                 s->data=(unsigned char *)p;
                 }
 
         BIO_snprintf(p,len,"%04d%02d%02d%02d%02d%02dZ",ts->tm_year + 1900,
                      ts->tm_mon+1,ts->tm_mday,ts->tm_hour,ts->tm_min,ts->tm_sec);
         s->length=strlen(p);
         s->type=V_ASN1_GENERALIZEDTIME;
 #ifdef CHARSET_EBCDIC_not
         ebcdic2ascii(s->data, s->data, s->length);
 #endif
         return(s);
         }