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

ssl/*: revert "remove SSL_RECORD->orig_len" and merge "fix IV".

Browse Source 
Revert is appropriate because binary compatibility is not an issue
in 1.1.
This commit is contained in:
Andy Polyakov
2013-02-08 10:20:48 +01:00
parent 32620fe9d1
commit dd7e60bd70
7 changed files with 43 additions and 59 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
ssl/s3_enc.c
View File

@@ -730,7 +730,7 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
EVP_MD_CTX md_ctx;
const EVP_MD_CTX *hash;
unsigned char *p,rec_char;
size_t md_size, orig_len;
size_t md_size;
int npad;
int t;
@@ -755,10 +755,6 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
md_size=t;
npad=(48/md_size)*md_size;
/* kludge: ssl3_cbc_remove_padding passes padding length in rec->type */
orig_len = rec->length+md_size+((unsigned int)rec->type>>8);
rec->type &= 0xff;
if (!send &&
EVP_CIPHER_CTX_mode(ssl->enc_read_ctx) == EVP_CIPH_CBC_MODE &&
ssl3_cbc_record_digest_supported(hash))
@@ -790,7 +786,7 @@ int n_ssl3_mac(SSL *ssl, unsigned char *md, int send)
hash,
md, &md_size,
header, rec->input,
rec->length + md_size, orig_len,
rec->length + md_size, rec->orig_len,
mac_sec, md_size,
1 /* is SSLv3 */);
}