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

openssl/crypto/asn1/a_strex.c

 /* a_strex.c */
 /* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2000.
  */
 /* ====================================================================
  * Copyright (c) 2000 The OpenSSL Project.  All rights reserved.
  *
  * Redistribution and use in source and binary forms, with or without
  * modification, are permitted provided that the following conditions
  * are met:
@@ skipping 56 matching lines @@
 
 /* ASN1_STRING_print_ex() and X509_NAME_print_ex().
  * Enhanced string and name printing routines handling
  * multibyte characters, RFC2253 and a host of other
  * options.
  */
 
 
 #define CHARTYPE_BS_ESC         (ASN1_STRFLGS_ESC_2253 | CHARTYPE_FIRST_ESC_2253 | CHARTYPE_LAST_ESC_2253)
 
+#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
+                  ASN1_STRFLGS_ESC_QUOTE | \
+                  ASN1_STRFLGS_ESC_CTRL | \
+                  ASN1_STRFLGS_ESC_MSB)
+
 
 /* Three IO functions for sending data to memory, a BIO and
  * and a FILE pointer.
  */
 #if 0                           /* never used */
 static int send_mem_chars(void *arg, const void *buf, int len)
 {
         unsigned char **out = arg;
         if(!out) return 1;
         memcpy(*out, buf, len);
@@ skipping 54 matching lines @@
                 }
                 if(!io_ch(arg, "\\", 1)) return -1;
                 if(!io_ch(arg, &chtmp, 1)) return -1;
                 return 2;
         }
         if(chflgs & (ASN1_STRFLGS_ESC_CTRL|ASN1_STRFLGS_ESC_MSB)) {
                 BIO_snprintf(tmphex, 11, "\\%02X", chtmp);
                 if(!io_ch(arg, tmphex, 3)) return -1;
                 return 3;
         }
+        /* If we get this far and do any escaping at all must escape 
+         * the escape character itself: backslash.
+         */
+        if (chtmp == '\\' && flags & ESC_FLAGS) {
+                if(!io_ch(arg, "\\\\", 2)) return -1;
+                return 2;
+        }
         if(!io_ch(arg, &chtmp, 1)) return -1;
         return 1;
 }
 
 #define BUF_TYPE_WIDTH_MASK     0x7
 #define BUF_TYPE_CONVUTF8       0x8
 
 /* This function sends each character in a buffer to
  * do_esc_char(). It interprets the content formats
  * and converts to or from UTF8 as appropriate.
@@ skipping 124 matching lines @@
         -1, -1, -1, -1, -1,     /* 0-4 */
         -1, -1, -1, -1, -1,     /* 5-9 */
         -1, -1, 0, -1,          /* 10-13 */
         -1, -1, -1, -1,         /* 15-17 */
         -1, 1, 1,               /* 18-20 */
         -1, 1, 1, 1,            /* 21-24 */
         -1, 1, -1,              /* 25-27 */
         4, -1, 2                /* 28-30 */
 };
 
-#define ESC_FLAGS (ASN1_STRFLGS_ESC_2253 | \
-                  ASN1_STRFLGS_ESC_QUOTE | \
-                  ASN1_STRFLGS_ESC_CTRL | \
-                  ASN1_STRFLGS_ESC_MSB)
-
 /* This is the main function, print out an
  * ASN1_STRING taking note of various escape
  * and display options. Returns number of
  * characters written or -1 if an error
  * occurred.
  */
 
 static int do_print_ex(char_io *io_ch, void *arg, unsigned long lflags, ASN1_STRING *str)
 {
         int outlen, len;
@@ skipping 248 matching lines @@
         if((type < 0) || (type > 30)) return -1;
         mbflag = tag2nbyte[type];
         if(mbflag == -1) return -1;
         mbflag |= MBSTRING_FLAG;
         stmp.data = NULL;
         ret = ASN1_mbstring_copy(&str, in->data, in->length, mbflag, B_ASN1_UTF8STRING);
         if(ret < 0) return ret;
         *out = stmp.data;
         return stmp.length;
 }