diff options
| author | nectar <nectar@FreeBSD.org> | 2002-08-10 01:46:10 +0000 |
|---|---|---|
| committer | nectar <nectar@FreeBSD.org> | 2002-08-10 01:46:10 +0000 |
| commit | c99c2264cb2cf6c4f161218c15b8e9a3072526e5 (patch) | |
| tree | 3c9559c80a7fe01c85e2dfbadcb9f84770a7e8e6 /crypto/openssl/ssl/ssl_asn1.c | |
| parent | c48e8e3d25b5b1f6a1783f1e469b5aff8e6c8e29 (diff) | |
| download | FreeBSD-src-c99c2264cb2cf6c4f161218c15b8e9a3072526e5.zip FreeBSD-src-c99c2264cb2cf6c4f161218c15b8e9a3072526e5.tar.gz | |
Import of OpenSSL 0.9.6f.
Diffstat (limited to 'crypto/openssl/ssl/ssl_asn1.c')
| -rw-r--r-- | crypto/openssl/ssl/ssl_asn1.c | 5 |
1 files changed, 3 insertions, 2 deletions
diff --git a/crypto/openssl/ssl/ssl_asn1.c b/crypto/openssl/ssl/ssl_asn1.c index 3de1dbc..00f9fda 100644 --- a/crypto/openssl/ssl/ssl_asn1.c +++ b/crypto/openssl/ssl/ssl_asn1.c @@ -273,10 +273,11 @@ SSL_SESSION *d2i_SSL_SESSION(SSL_SESSION **a, unsigned char **pp, i=SSL2_MAX_SSL_SESSION_ID_LENGTH; if (os.length > i) - os.length=i; + os.length = i; + if (os.length > sizeof ret->session_id) /* can't happen */ + os.length = sizeof ret->session_id; ret->session_id_length=os.length; - die(os.length <= sizeof ret->session_id); memcpy(ret->session_id,os.data,os.length); M_ASN1_D2I_get(osp,d2i_ASN1_OCTET_STRING); |
