diff options
| author |   markus <markus@openbsd.org> | 2002-07-30 11:08:05 +0000 |
|---|---|---|
| committer | markus <markus@openbsd.org> | 2002-07-30 11:08:05 +0000 |
| commit | 428837d1af6ee7883726f5a6f82d6bae10ac0025 (patch) | |
| tree | 6cad96e6d9a4f7e09d07030b70c21d9902cf5e9b /lib/libssl/src/ssl/s2_lib.c | |
| parent | strip_chroot here as well. (diff) | |
| download | wireguard-openbsd-428837d1af6ee7883726f5a6f82d6bae10ac0025.tar.xz wireguard-openbsd-428837d1af6ee7883726f5a6f82d6bae10ac0025.zip | |
apply patches from OpenSSL Security Advisory [30 July 2002],
http://marc.theaimsgroup.com/?l=openssl-dev&m=102802395104110&w=2
Diffstat (limited to 'lib/libssl/src/ssl/s2_lib.c')
| -rw-r--r-- | lib/libssl/src/ssl/s2_lib.c | 6 |
1 files changed, 6 insertions, 0 deletions
diff --git a/lib/libssl/src/ssl/s2_lib.c b/lib/libssl/src/ssl/s2_lib.c index eb315bcf07a..83d5730ff3b 100644 --- a/lib/libssl/src/ssl/s2_lib.c +++ b/lib/libssl/src/ssl/s2_lib.c @@ -63,6 +63,7 @@ #include <openssl/objects.h> #include <openssl/evp.h> #include <openssl/md5.h> +#include "ssl_locl.h" static long ssl2_default_timeout(void ); const char *ssl2_version_str="SSLv2" OPENSSL_VERSION_PTEXT; @@ -428,10 +429,14 @@ void ssl2_generate_key_material(SSL *s) #endif EVP_MD_CTX_init(&ctx); km=s->s2->key_material; + die(s->s2->key_material_length <= sizeof s->s2->key_material); for (i=0; i<s->s2->key_material_length; i+=MD5_DIGEST_LENGTH) { EVP_DigestInit_ex(&ctx,EVP_md5(), NULL); + die(s->session->master_key_length >= 0 + && s->session->master_key_length + < sizeof s->session->master_key); EVP_DigestUpdate(&ctx,s->session->master_key,s->session->master_key_length); EVP_DigestUpdate(&ctx,&c,1); c++; @@ -467,6 +472,7 @@ void ssl2_write_error(SSL *s) /* state=s->rwstate;*/ error=s->error; s->error=0; + die(error >= 0 && error <= 3); i=ssl2_write(s,&(buf[3-error]),error); /* if (i == error) s->rwstate=state; */ |