diff options
| author | Bodo Möller <bodo@openssl.org> | 2002-08-02 11:48:15 +0000 |
|---|---|---|
| committer | Bodo Möller <bodo@openssl.org> | 2002-08-02 11:48:15 +0000 |
| commit | 5574e0ed417c9a09487a270fec3df34d3094f5c6 (patch) | |
| tree | ae3a9a39081ea1b5a01482dd15f6f8b259fa93e9 /ssl/s3_clnt.c | |
| parent | 042e57d5628244b121836881c433b6fa2b6f1697 (diff) | |
get rid of OpenSSLDie
Diffstat (limited to 'ssl/s3_clnt.c')
| -rw-r--r-- | ssl/s3_clnt.c | 12 |
1 files changed, 10 insertions, 2 deletions
diff --git a/ssl/s3_clnt.c b/ssl/s3_clnt.c index 2699b5863b..2b58482484 100644 --- a/ssl/s3_clnt.c +++ b/ssl/s3_clnt.c @@ -546,7 +546,11 @@ static int ssl3_client_hello(SSL *s) *(p++)=i; if (i != 0) { - die(i <= sizeof s->session->session_id); + if (i > sizeof s->session->session_id) + { + SSLerr(SSL_F_SSL3_CLIENT_HELLO, ERR_R_INTERNAL_ERROR); + goto err; + } memcpy(p,s->session->session_id,i); p+=i; } @@ -1598,7 +1602,11 @@ static int ssl3_send_client_key_exchange(SSL *s) SSL_MAX_MASTER_KEY_LENGTH); EVP_EncryptFinal_ex(&ciph_ctx,&(epms[outl]),&padl); outl += padl; - die(outl <= sizeof epms); + if (outl > sizeof epms) + { + SSLerr(SSL_F_SSL3_SEND_CLIENT_KEY_EXCHANGE, ERR_R_INTERNAL_ERROR); + goto err; + } EVP_CIPHER_CTX_cleanup(&ciph_ctx); /* KerberosWrapper.EncryptedPreMasterSecret */ |