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

openssl/ssl/ssl_txt.c

 /* ssl/ssl_txt.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 37 matching lines @@
  * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT, STRICT
  * LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  * 
  * The licence and distribution terms for any publically available version or
  * derivative of this code cannot be changed.  i.e. this code cannot simply be
  * copied and put under another distribution licence
  * [including the GNU Public Licence.]
  */
+/* ====================================================================
+ * Copyright 2005 Nokia. All rights reserved.
+ *
+ * The portions of the attached software ("Contribution") is developed by
+ * Nokia Corporation and is licensed pursuant to the OpenSSL open source
+ * license.
+ *
+ * The Contribution, originally written by Mika Kousa and Pasi Eronen of
+ * Nokia Corporation, consists of the "PSK" (Pre-Shared Key) ciphersuites
+ * support (see RFC 4279) to OpenSSL.
+ *
+ * No patent licenses or other rights except those expressly stated in
+ * the OpenSSL open source license shall be deemed granted or received
+ * expressly, by implication, estoppel, or otherwise.
+ *
+ * No assurances are provided by Nokia that the Contribution does not
+ * infringe the patent or other intellectual property rights of any third
+ * party or that the license provides you with all the necessary rights
+ * to make use of the Contribution.
+ *
+ * THE SOFTWARE IS PROVIDED "AS IS" WITHOUT WARRANTY OF ANY KIND. IN
+ * ADDITION TO THE DISCLAIMERS INCLUDED IN THE LICENSE, NOKIA
+ * SPECIFICALLY DISCLAIMS ANY LIABILITY FOR CLAIMS BROUGHT BY YOU OR ANY
+ * OTHER ENTITY BASED ON INFRINGEMENT OF INTELLECTUAL PROPERTY RIGHTS OR
+ * OTHERWISE.
+ */
 
 #include <stdio.h>
 #include <openssl/buffer.h>
 #include "ssl_locl.h"
 
 #ifndef OPENSSL_NO_FP_API
 int SSL_SESSION_print_fp(FILE *fp, const SSL_SESSION *x)
         {
         BIO *b;
         int ret;
@@ skipping 80 matching lines @@
             if (x->krb5_client_princ_len == 0)
             {
                 if (BIO_puts(bp,"None") <= 0) goto err;
                 }
         else
                 for (i=0; i<x->krb5_client_princ_len; i++)
                         {
                         if (BIO_printf(bp,"%02X",x->krb5_client_princ[i]) <= 0) goto err;
                         }
 #endif /* OPENSSL_NO_KRB5 */
+#ifndef OPENSSL_NO_PSK
+        if (BIO_puts(bp,"\n    PSK identity: ") <= 0) goto err;
+        if (BIO_printf(bp, "%s", x->psk_identity ? x->psk_identity : "None") <= 0) goto err;
+        if (BIO_puts(bp,"\n    PSK identity hint: ") <= 0) goto err;
+        if (BIO_printf(bp, "%s", x->psk_identity_hint ? x->psk_identity_hint : "None") <= 0) goto err;
+#endif
 #ifndef OPENSSL_NO_TLSEXT
         if (x->tlsext_tick_lifetime_hint)
                 {
                 if (BIO_printf(bp,
                         "\n    TLS session ticket lifetime hint: %ld (seconds)",
                         x->tlsext_tick_lifetime_hint) <=0)
                         goto err;
                 }
         if (x->tlsext_tick)
                 {
                 if (BIO_puts(bp, "\n    TLS session ticket:\n") <= 0) goto err;
                 if (BIO_dump_indent(bp, (char *)x->tlsext_tick, x->tlsext_ticklen, 4) <= 0)
                         goto err;
                 }
 #endif
+
 #ifndef OPENSSL_NO_COMP
         if (x->compress_meth != 0)
                 {
                 SSL_COMP *comp = NULL;
 
-                ssl_cipher_get_evp(x,NULL,NULL,&comp);
+                ssl_cipher_get_evp(x,NULL,NULL,NULL,NULL,&comp);
                 if (comp == NULL)
                         {
                         if (BIO_printf(bp,"\n    Compression: %d",x->compress_meth) <= 0) goto err;
                         }
                 else
                         {
                         if (BIO_printf(bp,"\n    Compression: %d (%s)", comp->id,comp->method->name) <= 0) goto err;
                         }
                 }       
 #endif
         if (x->time != 0L)
                 {
                 if (BIO_printf(bp, "\n    Start Time: %ld",x->time) <= 0) goto err;
                 }
         if (x->timeout != 0L)
                 {
                 if (BIO_printf(bp, "\n    Timeout   : %ld (sec)",x->timeout) <= 0) goto err;
                 }
         if (BIO_puts(bp,"\n") <= 0) goto err;
 
         if (BIO_puts(bp, "    Verify return code: ") <= 0) goto err;
         if (BIO_printf(bp, "%ld (%s)\n", x->verify_result,
                 X509_verify_cert_error_string(x->verify_result)) <= 0) goto err;
                 
         return(1);
 err:
         return(0);
         }