Deleted Added
sdiff udiff text old ( 100936 ) new ( 101615 )
full compact
1/* ssl/ssl_asn1.c */
2/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
3 * All rights reserved.
4 *
5 * This package is an SSL implementation written
6 * by Eric Young (eay@cryptsoft.com).
7 * The implementation was written so as to conform with Netscapes SSL.
8 *

--- 259 unchanged lines hidden (view full) ---

268
269 M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
270 if ((ssl_version>>8) == SSL3_VERSION)
271 i=SSL3_MAX_SSL_SESSION_ID_LENGTH;
272 else /* if (ssl_version == SSL2_VERSION) */
273 i=SSL2_MAX_SSL_SESSION_ID_LENGTH;
274
275 if (os.length > i)
276 os.length = i;
277 if (os.length > sizeof ret->session_id) /* can't happen */
278 os.length = sizeof ret->session_id;
279
280 ret->session_id_length=os.length;
281 memcpy(ret->session_id,os.data,os.length);
282
283 M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING);
284 if (ret->master_key_length > SSL_MAX_MASTER_KEY_LENGTH)
285 ret->master_key_length=SSL_MAX_MASTER_KEY_LENGTH;
286 else
287 ret->master_key_length=os.length;
288 memcpy(ret->master_key,os.data,ret->master_key_length);

--- 64 unchanged lines hidden ---