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

openssl/ssl/ssl_asn1.c

 /* ssl/ssl_asn1.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 <stdlib.h>
 #include "ssl_locl.h"
 #include <openssl/asn1_mac.h>
 #include <openssl/objects.h>
 #include <openssl/x509.h>
 
 typedef struct ssl_session_asn1_st
         {
         ASN1_INTEGER version;
         ASN1_INTEGER ssl_version;
         ASN1_OCTET_STRING cipher;
         ASN1_OCTET_STRING comp_id;
         ASN1_OCTET_STRING master_key;
         ASN1_OCTET_STRING session_id;
         ASN1_OCTET_STRING session_id_context;
         ASN1_OCTET_STRING key_arg;
 #ifndef OPENSSL_NO_KRB5
         ASN1_OCTET_STRING krb5_princ;
 #endif /* OPENSSL_NO_KRB5 */
         ASN1_INTEGER time;
         ASN1_INTEGER timeout;
         ASN1_INTEGER verify_result;
 #ifndef OPENSSL_NO_TLSEXT
         ASN1_OCTET_STRING tlsext_hostname;
         ASN1_INTEGER tlsext_tick_lifetime;
         ASN1_OCTET_STRING tlsext_tick;
 #endif /* OPENSSL_NO_TLSEXT */
+#ifndef OPENSSL_NO_PSK
+        ASN1_OCTET_STRING psk_identity_hint;
+        ASN1_OCTET_STRING psk_identity;
+#endif /* OPENSSL_NO_PSK */
         } SSL_SESSION_ASN1;
 
 int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
         {
 #define LSIZE2 (sizeof(long)*2)
-        int v1=0,v2=0,v3=0,v4=0,v5=0;
+        int v1=0,v2=0,v3=0,v4=0,v5=0,v7=0,v8=0;
         unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2];
         unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2],ibuf5[LSIZE2];
 #ifndef OPENSSL_NO_TLSEXT
         int v6=0,v9=0,v10=0;
         unsigned char ibuf6[LSIZE2];
 #endif
 #ifndef OPENSSL_NO_COMP
+        unsigned char cbuf;
         int v11=0;
-        unsigned char cbuf;
 #endif
         long l;
         SSL_SESSION_ASN1 a;
         M_ASN1_I2D_vars(in);
 
         if ((in == NULL) || ((in->cipher == NULL) && (in->cipher_id == 0)))
                 return(0);
 
         /* Note that I cheat in the following 2 assignments.  I know
          * that if the ASN1_INTEGER passed to ASN1_INTEGER_set
@@ skipping 58 matching lines @@
         a.key_arg.data=in->key_arg;
 
 #ifndef OPENSSL_NO_KRB5
         if (in->krb5_client_princ_len)
                 {
                 a.krb5_princ.length=in->krb5_client_princ_len;
                 a.krb5_princ.type=V_ASN1_OCTET_STRING;
                 a.krb5_princ.data=in->krb5_client_princ;
                 }
 #endif /* OPENSSL_NO_KRB5 */
- 
+
         if (in->time != 0L)
                 {
                 a.time.length=LSIZE2;
                 a.time.type=V_ASN1_INTEGER;
                 a.time.data=ibuf3;
                 ASN1_INTEGER_set(&(a.time),in->time);
                 }
 
         if (in->timeout != 0L)
                 {
@@ skipping 25 matching lines @@
                 a.tlsext_tick.data=(unsigned char *)in->tlsext_tick;
                 }
         if (in->tlsext_tick_lifetime_hint > 0)
                 {
                 a.tlsext_tick_lifetime.length=LSIZE2;
                 a.tlsext_tick_lifetime.type=V_ASN1_INTEGER;
                 a.tlsext_tick_lifetime.data=ibuf6;
                 ASN1_INTEGER_set(&a.tlsext_tick_lifetime,in->tlsext_tick_lifetime_hint);
                 }
 #endif /* OPENSSL_NO_TLSEXT */
+#ifndef OPENSSL_NO_PSK
+        if (in->psk_identity_hint)
+                {
+                a.psk_identity_hint.length=strlen(in->psk_identity_hint);
+                a.psk_identity_hint.type=V_ASN1_OCTET_STRING;
+                a.psk_identity_hint.data=(unsigned char *)(in->psk_identity_hint);
+                }
+        if (in->psk_identity)
+                {
+                a.psk_identity.length=strlen(in->psk_identity);
+                a.psk_identity.type=V_ASN1_OCTET_STRING;
+                a.psk_identity.data=(unsigned char *)(in->psk_identity);
+                }
+#endif /* OPENSSL_NO_PSK */
+
         M_ASN1_I2D_len(&(a.version),            i2d_ASN1_INTEGER);
         M_ASN1_I2D_len(&(a.ssl_version),        i2d_ASN1_INTEGER);
         M_ASN1_I2D_len(&(a.cipher),             i2d_ASN1_OCTET_STRING);
         M_ASN1_I2D_len(&(a.session_id),         i2d_ASN1_OCTET_STRING);
         M_ASN1_I2D_len(&(a.master_key),         i2d_ASN1_OCTET_STRING);
 #ifndef OPENSSL_NO_KRB5
         if (in->krb5_client_princ_len)
                 M_ASN1_I2D_len(&(a.krb5_princ), i2d_ASN1_OCTET_STRING);
 #endif /* OPENSSL_NO_KRB5 */
         if (in->key_arg_length > 0)
@@ skipping 13 matching lines @@
                 M_ASN1_I2D_len_EXP_opt(&a.tlsext_tick_lifetime, i2d_ASN1_INTEGER,9,v9);
         if (in->tlsext_tick)
                 M_ASN1_I2D_len_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10);
         if (in->tlsext_hostname)
                 M_ASN1_I2D_len_EXP_opt(&(a.tlsext_hostname), i2d_ASN1_OCTET_STRING,6,v6);
 #ifndef OPENSSL_NO_COMP
         if (in->compress_meth)
                 M_ASN1_I2D_len_EXP_opt(&(a.comp_id), i2d_ASN1_OCTET_STRING,11,v11);
 #endif
 #endif /* OPENSSL_NO_TLSEXT */
+#ifndef OPENSSL_NO_PSK
+        if (in->psk_identity_hint)
+                M_ASN1_I2D_len_EXP_opt(&(a.psk_identity_hint), i2d_ASN1_OCTET_STRING,7,v7);
+        if (in->psk_identity)
+                M_ASN1_I2D_len_EXP_opt(&(a.psk_identity), i2d_ASN1_OCTET_STRING,8,v8);
+#endif /* OPENSSL_NO_PSK */
+
         M_ASN1_I2D_seq_total();
 
         M_ASN1_I2D_put(&(a.version),            i2d_ASN1_INTEGER);
         M_ASN1_I2D_put(&(a.ssl_version),        i2d_ASN1_INTEGER);
         M_ASN1_I2D_put(&(a.cipher),             i2d_ASN1_OCTET_STRING);
         M_ASN1_I2D_put(&(a.session_id),         i2d_ASN1_OCTET_STRING);
         M_ASN1_I2D_put(&(a.master_key),         i2d_ASN1_OCTET_STRING);
 #ifndef OPENSSL_NO_KRB5
         if (in->krb5_client_princ_len)
                 M_ASN1_I2D_put(&(a.krb5_princ), i2d_ASN1_OCTET_STRING);
 #endif /* OPENSSL_NO_KRB5 */
         if (in->key_arg_length > 0)
                 M_ASN1_I2D_put_IMP_opt(&(a.key_arg),i2d_ASN1_OCTET_STRING,0);
         if (in->time != 0L)
                 M_ASN1_I2D_put_EXP_opt(&(a.time),i2d_ASN1_INTEGER,1,v1);
         if (in->timeout != 0L)
                 M_ASN1_I2D_put_EXP_opt(&(a.timeout),i2d_ASN1_INTEGER,2,v2);
         if (in->peer != NULL)
                 M_ASN1_I2D_put_EXP_opt(in->peer,i2d_X509,3,v3);
         M_ASN1_I2D_put_EXP_opt(&a.session_id_context,i2d_ASN1_OCTET_STRING,4,
                                v4);
         if (in->verify_result != X509_V_OK)
                 M_ASN1_I2D_put_EXP_opt(&a.verify_result,i2d_ASN1_INTEGER,5,v5);
 #ifndef OPENSSL_NO_TLSEXT
         if (in->tlsext_hostname)
                 M_ASN1_I2D_put_EXP_opt(&(a.tlsext_hostname), i2d_ASN1_OCTET_STRING,6,v6);
+#endif /* OPENSSL_NO_TLSEXT */
+#ifndef OPENSSL_NO_PSK
+        if (in->psk_identity_hint)
+                M_ASN1_I2D_put_EXP_opt(&(a.psk_identity_hint), i2d_ASN1_OCTET_STRING,7,v7);
+        if (in->psk_identity)
+                M_ASN1_I2D_put_EXP_opt(&(a.psk_identity), i2d_ASN1_OCTET_STRING,8,v8);
+#endif /* OPENSSL_NO_PSK */
+#ifndef OPENSSL_NO_TLSEXT
         if (in->tlsext_tick_lifetime_hint > 0)
                 M_ASN1_I2D_put_EXP_opt(&a.tlsext_tick_lifetime, i2d_ASN1_INTEGER,9,v9);
         if (in->tlsext_tick)
                 M_ASN1_I2D_put_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10);
 #endif /* OPENSSL_NO_TLSEXT */
 #ifndef OPENSSL_NO_COMP
         if (in->compress_meth)
                 M_ASN1_I2D_put_EXP_opt(&(a.comp_id), i2d_ASN1_OCTET_STRING,11,v11);
 #endif
         M_ASN1_I2D_finish();
         }
 
 SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
-             long length)
+                             long length)
         {
-        int version,ssl_version=0,i;
+        int ssl_version=0,i;
         long id;
         ASN1_INTEGER ai,*aip;
         ASN1_OCTET_STRING os,*osp;
         M_ASN1_D2I_vars(a,SSL_SESSION *,SSL_SESSION_new);
 
         aip= &ai;
         osp= &os;
 
         M_ASN1_D2I_Init();
         M_ASN1_D2I_start_sequence();
 
         ai.data=NULL; ai.length=0;
         M_ASN1_D2I_get_x(ASN1_INTEGER,aip,d2i_ASN1_INTEGER);
-        version=(int)ASN1_INTEGER_get(aip);
         if (ai.data != NULL) { OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; }
 
         /* we don't care about the version right now :-) */
         M_ASN1_D2I_get_x(ASN1_INTEGER,aip,d2i_ASN1_INTEGER);
         ssl_version=(int)ASN1_INTEGER_get(aip);
         ret->ssl_version=ssl_version;
         if (ai.data != NULL) { OPENSSL_free(ai.data); ai.data=NULL; ai.length=0; }
 
         os.data=NULL; os.length=0;
         M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING);
@@ skipping 143 matching lines @@
         M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,6);
         if (os.data)
                 {
                 ret->tlsext_hostname = BUF_strndup((char *)os.data, os.length);
                 OPENSSL_free(os.data);
                 os.data = NULL;
                 os.length = 0;
                 }
         else
                 ret->tlsext_hostname=NULL;
+#endif /* OPENSSL_NO_TLSEXT */
+
+#ifndef OPENSSL_NO_PSK
+        os.length=0;
+        os.data=NULL;
+        M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,7);
+        if (os.data)
+                {
+                ret->psk_identity_hint = BUF_strndup((char *)os.data, os.length);
+                OPENSSL_free(os.data);
+                os.data = NULL;
+                os.length = 0;
+                }
+        else
+                ret->psk_identity_hint=NULL;
+#endif /* OPENSSL_NO_PSK */
+
+#ifndef OPENSSL_NO_TLSEXT
         ai.length=0;
         M_ASN1_D2I_get_EXP_opt(aip,d2i_ASN1_INTEGER,9);
         if (ai.data != NULL)
                 {
                 ret->tlsext_tick_lifetime_hint=ASN1_INTEGER_get(aip);
                 OPENSSL_free(ai.data); ai.data=NULL; ai.length=0;
                 }
         else if (ret->tlsext_ticklen && ret->session_id_length)
                 ret->tlsext_tick_lifetime_hint = -1;
         else
-                ret->tlsext_tick_lifetime_hint = 0;
-        os.length=0;
-        os.data=NULL;
-        M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,10);
-        if (os.data)
-                {
+                ret->tlsext_tick_lifetime_hint=0;
+        os.length=0;
+        os.data=NULL;
+        M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,10);
+        if (os.data)
+                {
                 ret->tlsext_tick = os.data;
                 ret->tlsext_ticklen = os.length;
-                os.data = NULL;
-                os.length = 0;
-                }
+                os.data = NULL;
+                os.length = 0;
+                }
         else
                 ret->tlsext_tick=NULL;
 #endif /* OPENSSL_NO_TLSEXT */
 #ifndef OPENSSL_NO_COMP
         os.length=0;
         os.data=NULL;
         M_ASN1_D2I_get_EXP_opt(osp,d2i_ASN1_OCTET_STRING,11);
         if (os.data)
                 {
                 ret->compress_meth = os.data[0];
                 OPENSSL_free(os.data);
                 os.data = NULL;
                 }
 #endif
 
         M_ASN1_D2I_Finish(a,SSL_SESSION_free,SSL_F_D2I_SSL_SESSION);
         }