diff options
author | David Benjamin <davidben@chromium.org> | 2014-08-19 07:15:29 +0400 |
---|---|---|
committer | Adam Langley <agl@google.com> | 2014-08-19 22:18:36 +0400 |
commit | e712778a7bfa65b971e9bbdc675f5abece108afd (patch) | |
tree | f4accd9443c165031379cf81d694217af5c162de /ssl/s3_enc.c | |
parent | b7725cf3ecfcb5f31834a8fb30f2522fc5c76f8c (diff) |
Remove rsa_md5, md5, and sha1 fields from SSL_CTX.
Just use the normal API for them.
Change-Id: Ibb5988611a86e8d39abda1e02087523d98defb51
Reviewed-on: https://boringssl-review.googlesource.com/1555
Reviewed-by: Adam Langley <agl@google.com>
Diffstat (limited to 'ssl/s3_enc.c')
-rw-r--r-- | ssl/s3_enc.c | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/ssl/s3_enc.c b/ssl/s3_enc.c index ee85c176..2f029b8e 100644 --- a/ssl/s3_enc.c +++ b/ssl/s3_enc.c @@ -767,7 +767,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, EVP_MD_CTX_init(&ctx); for (i=0; i<3; i++) { - EVP_DigestInit_ex(&ctx,s->ctx->sha1, NULL); + EVP_DigestInit_ex(&ctx, EVP_sha1(), NULL); EVP_DigestUpdate(&ctx,salt[i],strlen((const char *)salt[i])); EVP_DigestUpdate(&ctx,p,len); EVP_DigestUpdate(&ctx,&(s->s3->client_random[0]), @@ -776,7 +776,7 @@ int ssl3_generate_master_secret(SSL *s, unsigned char *out, unsigned char *p, SSL3_RANDOM_SIZE); EVP_DigestFinal_ex(&ctx,buf,&n); - EVP_DigestInit_ex(&ctx,s->ctx->md5, NULL); + EVP_DigestInit_ex(&ctx, EVP_md5(), NULL); EVP_DigestUpdate(&ctx,p,len); EVP_DigestUpdate(&ctx,buf,n); EVP_DigestFinal_ex(&ctx,out,&n); |