diff options
| author | Ben Laurie <ben@links.org> | 2013-01-30 16:56:30 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2013-02-05 16:50:33 +0000 |
| commit | 2928cb4c82d6516d9e65ede4901a5957d8c39c32 (patch) | |
| tree | ed17442f124163ffa87c516bdbd0ed1d293d7c36 /ssl/s3_enc.c | |
| parent | a33e6702a0db1b9f4648d247b8b28a5c0e42ca13 (diff) | |
Fixups.
Diffstat (limited to 'ssl/s3_enc.c')
| -rw-r--r-- | ssl/s3_enc.c | 8 |
1 files changed, 4 insertions, 4 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index 845557bb75..6471ac4901 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -501,8 +501,8 @@ int ssl3_enc(SSL *s, int send) rec->orig_len = rec->length; - if (EVP_MD_CTX_md(s->read_hash) != NULL) - mac_size = EVP_MD_CTX_size(s->read_hash); + if (s->read_hash != NULL) + mac_size = EVP_MD_size(s->read_hash); if ((bs != 1) && !send) return ssl3_cbc_remove_padding(s, rec, bs, mac_size); } @@ -643,7 +643,7 @@ int ssl3_mac(SSL *ssl, unsigned char *md, int send) /* Chop the digest off the end :-) */ EVP_MD_CTX_init(&md_ctx); - EVP_MD_CTX_copy_ex( &md_ctx,hash); + EVP_DigestInit_ex( &md_ctx,hash, NULL); EVP_DigestUpdate(&md_ctx,mac_sec,md_size); EVP_DigestUpdate(&md_ctx,ssl3_pad_1,npad); EVP_DigestUpdate(&md_ctx,seq,8); @@ -655,7 +655,7 @@ int ssl3_mac(SSL *ssl, unsigned char *md, int send) EVP_DigestUpdate(&md_ctx,rec->input,rec->length); EVP_DigestFinal_ex( &md_ctx,md,NULL); - EVP_MD_CTX_copy_ex( &md_ctx,hash); + EVP_DigestInit_ex( &md_ctx,hash, NULL); EVP_DigestUpdate(&md_ctx,mac_sec,md_size); EVP_DigestUpdate(&md_ctx,ssl3_pad_2,npad); EVP_DigestUpdate(&md_ctx,md,md_size); |