generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

PR: 1960

Browse Source 
Approved by: steve@openssl.org

Encode compression id in {i2d,d2i}_SSL_SESSION().
This commit is contained in:
Dr. Stephen Henson 2009-06-30 22:20:46 +00:00
parent 3dfa7416cd
commit e7e7f5de4b
3 changed files with 39 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
CHANGES
View File

@ -4,6 +4,10 @@
Changes between 0.9.8k and 0.9.8l [xx XXX xxxx] Changes between 0.9.8k and 0.9.8l [xx XXX xxxx]
*) Add compression id to {d2i,i2d}_SSL_SESSION so it is correctly saved
and restored.
[Steve Henson]
*) Rename uni2asc and asc2uni functions to OPENSSL_uni2asc and *) Rename uni2asc and asc2uni functions to OPENSSL_uni2asc and
OPENSSL_asc2uni conditionally on Netware platforms to avoid a name OPENSSL_asc2uni conditionally on Netware platforms to avoid a name
clash. clash.

35
ssl/ssl_asn1.c
View File

@ -68,6 +68,7 @@ typedef struct ssl_session_asn1_st
ASN1_INTEGER version; ASN1_INTEGER version;
ASN1_INTEGER ssl_version; ASN1_INTEGER ssl_version;
ASN1_OCTET_STRING cipher; ASN1_OCTET_STRING cipher;
ASN1_OCTET_STRING comp_id;
ASN1_OCTET_STRING master_key; ASN1_OCTET_STRING master_key;
ASN1_OCTET_STRING session_id; ASN1_OCTET_STRING session_id;
ASN1_OCTET_STRING session_id_context; ASN1_OCTET_STRING session_id_context;
@ -89,11 +90,14 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
{ {
#define LSIZE2 (sizeof(long)*2) #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;
unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2]; unsigned char buf[4],ibuf1[LSIZE2],ibuf2[LSIZE2], cbuf;
unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2],ibuf5[LSIZE2]; unsigned char ibuf3[LSIZE2],ibuf4[LSIZE2],ibuf5[LSIZE2];
#ifndef OPENSSL_NO_TLSEXT #ifndef OPENSSL_NO_TLSEXT
int v6=0,v9=0,v10=0; int v6=0,v9=0,v10=0;
unsigned char ibuf6[LSIZE2]; unsigned char ibuf6[LSIZE2];
#endif
#ifndef OPENSSL_NO_COMP
int v11=0;
#endif #endif
long l; long l;
SSL_SESSION_ASN1 a; SSL_SESSION_ASN1 a;
@ -138,6 +142,16 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
buf[1]=((unsigned char)(l ))&0xff; 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.length=in->master_key_length;
a.master_key.type=V_ASN1_OCTET_STRING; a.master_key.type=V_ASN1_OCTET_STRING;
a.master_key.data=in->master_key; a.master_key.data=in->master_key;
@ -242,6 +256,10 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
M_ASN1_I2D_len_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10); M_ASN1_I2D_len_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10);
if (in->tlsext_hostname) if (in->tlsext_hostname)
M_ASN1_I2D_len_EXP_opt(&(a.tlsext_hostname), i2d_ASN1_OCTET_STRING,6,v6); 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 */ #endif /* OPENSSL_NO_TLSEXT */
M_ASN1_I2D_seq_total(); M_ASN1_I2D_seq_total();
@ -274,6 +292,10 @@ int i2d_SSL_SESSION(SSL_SESSION *in, unsigned char **pp)
if (in->tlsext_tick) if (in->tlsext_tick)
M_ASN1_I2D_put_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10); M_ASN1_I2D_put_EXP_opt(&(a.tlsext_tick), i2d_ASN1_OCTET_STRING,10,v10);
#endif /* OPENSSL_NO_TLSEXT */ #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(); M_ASN1_I2D_finish();
} }
@ -495,6 +517,17 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, const unsigned char **pp,
else else
ret->tlsext_tick=NULL; ret->tlsext_tick=NULL;
#endif /* OPENSSL_NO_TLSEXT */ #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); M_ASN1_D2I_Finish(a,SSL_SESSION_free,SSL_F_D2I_SSL_SESSION);
} }

2
ssl/ssl_txt.c
View File

@ -174,7 +174,7 @@ int SSL_SESSION_print(BIO *bp, const SSL_SESSION *x)
ssl_cipher_get_evp(x,NULL,NULL,&comp); ssl_cipher_get_evp(x,NULL,NULL,&comp);
if (comp == NULL) if (comp == NULL)
{ {
if (BIO_printf(bp,"\n Compression: %d",x->compress_meth) <= 0) goto err; if (BIO_printf(bp,"\n Compression: %d",x->compress_meth) <= 0) goto err;
} }
else else
{ {