Generate stateless session ID just after the ticket is received instead

[openssl.git] / ssl / ssl_asn1.c

diff --git a/ssl/ssl_asn1.c b/ssl/ssl_asn1.c
index 789f6a339777d735f78a38462e5d0dd7777d0e0d..e484a2992ddf6cf682c4f4db3387979a1e9ddec6 100644 (file)
--- a/ssl/ssl_asn1.c
+++ b/ssl/ssl_asn1.c
@@ -94,6 +94,7 @@ 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;
@@ -124,6 +125,10 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
 #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;
 #endif
        long l;
        SSL_SESSION_ASN1 a;
@@ -168,6 +173,16 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                buf[1]=((unsigned char)(l    ))&0xff;
                }
 
+#ifndef OPENSSL_NO_COMP
+       if (in->compress_meth)
+               {
+               cbuf = (unsigned char)in->compress_meth;
+               a.comp_id.length = 1;
+               a.comp_id.type = V_ASN1_OCTET_STRING;
+               a.comp_id.data = &cbuf;
+               }
+#endif
+
        a.master_key.length=in->master_key_length;
        a.master_key.type=V_ASN1_OCTET_STRING;
        a.master_key.data=in->master_key;
@@ -229,13 +244,8 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                 a.tlsext_tick.length= in->tlsext_ticklen;
                 a.tlsext_tick.type=V_ASN1_OCTET_STRING;
                 a.tlsext_tick.data=(unsigned char *)in->tlsext_tick;
-               /* If we have a ticket set session ID to empty because
-                * it will be bogus. 
-                */
-               if (in->tlsext_ticklen)
-                       a.session_id.length=0;
                 }
-       if (in->tlsext_tick_lifetime_hint != 0)
+       if (in->tlsext_tick_lifetime_hint > 0)
                {
                a.tlsext_tick_lifetime.length=LSIZE2;
                a.tlsext_tick_lifetime.type=V_ASN1_INTEGER;
@@ -280,12 +290,16 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                M_ASN1_I2D_len_EXP_opt(&(a.verify_result),i2d_ASN1_INTEGER,5,v5);
 
 #ifndef OPENSSL_NO_TLSEXT
-       if (in->tlsext_tick_lifetime_hint)
+       if (in->tlsext_tick_lifetime_hint > 0)
                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)
@@ -328,16 +342,20 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
                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)
+       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;
        long id;
@@ -389,8 +407,8 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                }
        else
                {
-               SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_UNKNOWN_SSL_VERSION);
-               return(NULL);
+               c.error=SSL_R_UNKNOWN_SSL_VERSION;
+               goto err;
                }
        
        ret->cipher=NULL;
@@ -412,7 +430,7 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
        memcpy(ret->session_id,os.data,os.length);
 
        M_ASN1_D2I_get_x(ASN1_OCTET_STRING,osp,d2i_ASN1_OCTET_STRING);
-       if (ret->master_key_length > SSL_MAX_MASTER_KEY_LENGTH)
+       if (os.length > SSL_MAX_MASTER_KEY_LENGTH)
                ret->master_key_length=SSL_MAX_MASTER_KEY_LENGTH;
        else
                ret->master_key_length=os.length;
@@ -481,8 +499,8 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
            {
            if (os.length > SSL_MAX_SID_CTX_LENGTH)
                {
-               ret->sid_ctx_length=os.length;
-               SSLerr(SSL_F_D2I_SSL_SESSION,SSL_R_BAD_LENGTH);
+               c.error=SSL_R_BAD_LENGTH;
+               goto err;
                }
            else
                {
@@ -542,6 +560,8 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                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;
@@ -553,23 +573,21 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
                ret->tlsext_ticklen = os.length;
                os.data = NULL;
                os.length = 0;
-#if 0
-               /* There are two ways to detect a resumed ticket sesion.
-                * One is to set a random session ID and then the server
-                * must return a match in ServerHello. This allows the normal
-                * client session ID matching to work.
-                */ 
-               if (ret->session_id_length == 0)
-                       {
-                       ret->session_id_length=SSL3_MAX_SSL_SESSION_ID_LENGTH;
-                       RAND_pseudo_bytes(ret->session_id,
-                                               ret->session_id_length);
-                       }
-#endif
                }
        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);
        }