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

openssl/crypto/ocsp/ocsp_prn.c

 /* ocsp_prn.c */
 /* Written by Tom Titchener <Tom_Titchener@groove.net> for the OpenSSL
  * project. */
 
 /* History:
    This file was originally part of ocsp.c and was transfered to Richard
    Levitte from CertCo by Kathy Weinhold in mid-spring 2000 to be included
    in OpenSSL or released as a patch kit. */
 
 /* ====================================================================
@@ skipping 67 matching lines @@
         i2a_ASN1_STRING(bp, a->issuerKeyHash, V_ASN1_OCTET_STRING);
         BIO_printf(bp, "\n%*sSerial Number: ", indent, "");
         i2a_ASN1_INTEGER(bp, a->serialNumber);
         BIO_printf(bp, "\n");
         return 1;
         }
 
 typedef struct
         {
         long t;
-        char *m;
+        const char *m;
         } OCSP_TBLSTR;
 
-static char *table2string(long s, OCSP_TBLSTR *ts, int len)
+static const char *table2string(long s, const OCSP_TBLSTR *ts, int len)
 {
-        OCSP_TBLSTR *p;
+        const OCSP_TBLSTR *p;
         for (p=ts; p < ts + len; p++)
                 if (p->t == s)
                          return p->m;
         return "(UNKNOWN)";
 }
 
-char *OCSP_response_status_str(long s)
+const char *OCSP_response_status_str(long s)
         {
-        static OCSP_TBLSTR rstat_tbl[] = {
+        static const OCSP_TBLSTR rstat_tbl[] = {
                 { OCSP_RESPONSE_STATUS_SUCCESSFUL, "successful" },
                 { OCSP_RESPONSE_STATUS_MALFORMEDREQUEST, "malformedrequest" },
                 { OCSP_RESPONSE_STATUS_INTERNALERROR, "internalerror" },
                 { OCSP_RESPONSE_STATUS_TRYLATER, "trylater" },
                 { OCSP_RESPONSE_STATUS_SIGREQUIRED, "sigrequired" },
                 { OCSP_RESPONSE_STATUS_UNAUTHORIZED, "unauthorized" } };
         return table2string(s, rstat_tbl, 6);
         } 
 
-char *OCSP_cert_status_str(long s)
+const char *OCSP_cert_status_str(long s)
         {
-        static OCSP_TBLSTR cstat_tbl[] = {
+        static const OCSP_TBLSTR cstat_tbl[] = {
                 { V_OCSP_CERTSTATUS_GOOD, "good" },
                 { V_OCSP_CERTSTATUS_REVOKED, "revoked" },
                 { V_OCSP_CERTSTATUS_UNKNOWN, "unknown" } };
         return table2string(s, cstat_tbl, 3);
         } 
 
-char *OCSP_crl_reason_str(long s)
+const char *OCSP_crl_reason_str(long s)
         {
-        OCSP_TBLSTR reason_tbl[] = {
+        static const OCSP_TBLSTR reason_tbl[] = {
           { OCSP_REVOKED_STATUS_UNSPECIFIED, "unspecified" },
           { OCSP_REVOKED_STATUS_KEYCOMPROMISE, "keyCompromise" },
           { OCSP_REVOKED_STATUS_CACOMPROMISE, "cACompromise" },
           { OCSP_REVOKED_STATUS_AFFILIATIONCHANGED, "affiliationChanged" },
           { OCSP_REVOKED_STATUS_SUPERSEDED, "superseded" },
           { OCSP_REVOKED_STATUS_CESSATIONOFOPERATION, "cessationOfOperation" },
           { OCSP_REVOKED_STATUS_CERTIFICATEHOLD, "certificateHold" },
           { OCSP_REVOKED_STATUS_REMOVEFROMCRL, "removeFromCRL" } };
         return table2string(s, reason_tbl, 8);
         } 
@@ skipping 41 matching lines @@
                 }
         return 1;
 err:
         return 0;
         }
 
 int OCSP_RESPONSE_print(BIO *bp, OCSP_RESPONSE* o, unsigned long flags)
         {
         int i, ret = 0;
         long l;
-        unsigned char *p;
         OCSP_CERTID *cid = NULL;
         OCSP_BASICRESP *br = NULL;
         OCSP_RESPID *rid = NULL;
         OCSP_RESPDATA  *rd = NULL;
         OCSP_CERTSTATUS *cst = NULL;
         OCSP_REVOKEDINFO *rev = NULL;
         OCSP_SINGLERESP *single = NULL;
         OCSP_RESPBYTES *rb = o->responseBytes;
 
         if (BIO_puts(bp,"OCSP Response Data:\n") <= 0) goto err;
         l=ASN1_ENUMERATED_get(o->responseStatus);
         if (BIO_printf(bp,"    OCSP Response Status: %s (0x%lx)\n",
                        OCSP_response_status_str(l), l) <= 0) goto err;
         if (rb == NULL) return 1;
         if (BIO_puts(bp,"    Response Type: ") <= 0)
                 goto err;
         if(i2a_ASN1_OBJECT(bp, rb->responseType) <= 0)
                 goto err;
         if (OBJ_obj2nid(rb->responseType) != NID_id_pkix_OCSP_basic) 
                 {
                 BIO_puts(bp," (unknown response type)\n");
                 return 1;
                 }
 
-        p = ASN1_STRING_data(rb->response);
         i = ASN1_STRING_length(rb->response);
         if (!(br = OCSP_response_get1_basic(o))) goto err;
         rd = br->tbsResponseData;
         l=ASN1_INTEGER_get(rd->version);
         if (BIO_printf(bp,"\n    Version: %lu (0x%lx)\n",
                        l+1,l) <= 0) goto err;
         if (BIO_puts(bp,"    Responder Id: ") <= 0) goto err;
 
         rid =  rd->responderId;
         switch (rid->type)
@@ skipping 62 matching lines @@
                 {
                 X509_print(bp, sk_X509_value(br->certs,i));
                 PEM_write_bio_X509(bp,sk_X509_value(br->certs,i));
                 }
 
         ret = 1;
 err:
         OCSP_BASICRESP_free(br);
         return ret;
         }