generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

pay attention to blocksize before attempting decryption

Browse Source
This commit is contained in:
Bodo Möller
2001-06-15 18:06:06 +00:00
parent 19352b794d
commit dab4c2824f
3 changed files with 30 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

15
ssl/s3_enc.c
View File

@@ -366,7 +366,6 @@ int ssl3_enc(SSL *s, int send)
/* COMPRESS */
/* This should be using (bs-1) and bs instead of 7 and 8 */
if ((bs != 1) && send)
{
i=bs-((int)l%bs);
@@ -376,12 +375,24 @@ int ssl3_enc(SSL *s, int send)
rec->length+=i;
rec->input[l-1]=(i-1);
}
if (!send)
{
if (l == 0 || l%bs != 0)
{
SSLerr(SSL_F_SSL3_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);
ssl3_send_alert(s,SSL3_AL_FATAL,SSL_AD_DECRYPT_ERROR);
return(0);
}
}
EVP_Cipher(ds,rec->data,rec->input,l);
if ((bs != 1) && !send)
{
i=rec->data[l-1]+1;
/* SSL 3.0 bounds the number of padding bytes by the block size;
* padding bytes (except that last) are arbitrary */
if (i > bs)
{
SSLerr(SSL_F_SSL3_ENC,SSL_R_BLOCK_CIPHER_PAD_IS_WRONG);