diff options
| author |   markus <markus@openbsd.org> | 2002-09-14 11:18:01 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-09-14 11:18:01 +0000 |
| commit | cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2 (patch) | |
| tree | 2658bb71397039b6e8ea6265a0bfe5a109de2a64 /lib/libssl/src/ssl/ssl_asn1.c | |
| parent | spaces (diff) | |
| download | wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.tar.xz wireguard-openbsd-cf5de1f602bfe31a1de0d5bcba280f0bf0a50ae2.zip | |
merge with openssl-0.9.7-stable-SNAP-20020911,
new minor for libcrypto (_X509_REQ_print_ex)
tested by miod@, pb@
Diffstat (limited to 'lib/libssl/src/ssl/ssl_asn1.c')
| -rw-r--r-- | lib/libssl/src/ssl/ssl_asn1.c | 7 |
1 files changed, 4 insertions, 3 deletions
diff --git a/lib/libssl/src/ssl/ssl_asn1.c b/lib/libssl/src/ssl/ssl_asn1.c index c5507479473..23bfe44e218 100644 --- a/lib/libssl/src/ssl/ssl_asn1.c +++ b/lib/libssl/src/ssl/ssl_asn1.c @@ -57,8 +57,8 @@ */ #include <stdio.h> -#include "ssl_locl.h" #include <stdlib.h> +#include "ssl_locl.h" #include <openssl/asn1_mac.h> #include <openssl/objects.h> #include <openssl/x509.h> @@ -293,10 +293,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); |