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

openssl/crypto/asn1/a_utctm.c

 /* crypto/asn1/a_utctm.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 96 matching lines @@
 err:
         if ((ret != NULL) && ((a == NULL) || (*a != ret)))
                 M_ASN1_UTCTIME_free(ret);
         return(NULL);
         }
 
 #endif
 
 int ASN1_UTCTIME_check(ASN1_UTCTIME *d)
         {
-        static int min[8]={ 0, 1, 1, 0, 0, 0, 0, 0};
-        static int max[8]={99,12,31,23,59,59,12,59};
+        static const int min[8]={ 0, 1, 1, 0, 0, 0, 0, 0};
+        static const int max[8]={99,12,31,23,59,59,12,59};
         char *a;
         int n,i,l,o;
 
         if (d->type != V_ASN1_UTCTIME) return(0);
         l=d->length;
         a=(char *)d->data;
         o=0;
 
         if (l < 11) goto err;
         for (i=0; i<6; i++)
@@ skipping 50 matching lines @@
                         s->type = V_ASN1_UTCTIME;
                         }
                 return(1);
                 }
         else
                 return(0);
         }
 
 ASN1_UTCTIME *ASN1_UTCTIME_set(ASN1_UTCTIME *s, time_t t)
         {
+        return ASN1_UTCTIME_adj(s, t, 0, 0);
+        }
+
+ASN1_UTCTIME *ASN1_UTCTIME_adj(ASN1_UTCTIME *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_UTCTIME_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;
+                }
+
+        if((ts->tm_year < 50) || (ts->tm_year >= 150))
+                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_UTCTIME_SET,ERR_R_MALLOC_FAILURE);
+                        ASN1err(ASN1_F_ASN1_UTCTIME_ADJ,ERR_R_MALLOC_FAILURE);
                         return(NULL);
                         }
                 if (s->data != NULL)
                         OPENSSL_free(s->data);
                 s->data=(unsigned char *)p;
                 }
 
         BIO_snprintf(p,len,"%02d%02d%02d%02d%02d%02dZ",ts->tm_year%100,
                      ts->tm_mon+1,ts->tm_mday,ts->tm_hour,ts->tm_min,ts->tm_sec);
         s->length=strlen(p);
@@ skipping 74 matching lines @@
         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