Hakase/openssl-custom
1
0 Fork 0
Code Issues Pull Requests Releases Wiki Activity

Latest update (add quic)

Browse Source
This commit is contained in:
Hakase
2020-07-12 19:52:18 +09:00
parent 3a6d64bb68
commit e85ee33eee
501 changed files with 19166 additions and 10232 deletions
Download Patch File Download Diff File Expand all files Collapse all files
ssl/s3_enc.c
+5 -3
View File
@@ -17,7 +17,7 @@
static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
{
EVP_MD *md5;
EVP_MD *md5, *sha1;
EVP_MD_CTX *m5;
EVP_MD_CTX *s1;
unsigned char buf[16], smd[SHA_DIGEST_LENGTH];
@@ -30,9 +30,10 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
#endif
k = 0;
md5 = EVP_MD_fetch(NULL, OSSL_DIGEST_NAME_MD5, "-fips");
sha1 = EVP_MD_fetch(NULL, OSSL_DIGEST_NAME_SHA1, "-fips");
m5 = EVP_MD_CTX_new();
s1 = EVP_MD_CTX_new();
if (md5 == NULL || m5 == NULL || s1 == NULL) {
if (md5 == NULL || sha1 == NULL || m5 == NULL || s1 == NULL) {
SSLfatal(s, SSL_AD_INTERNAL_ERROR, SSL_F_SSL3_GENERATE_KEY_BLOCK,
ERR_R_MALLOC_FAILURE);
goto err;
@@ -49,7 +50,7 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
for (j = 0; j < k; j++)
buf[j] = c;
c++;
if (!EVP_DigestInit_ex(s1, EVP_sha1(), NULL)
if (!EVP_DigestInit_ex(s1, sha1, NULL)
|| !EVP_DigestUpdate(s1, buf, k)
|| !EVP_DigestUpdate(s1, s->session->master_key,
s->session->master_key_length)
@@ -87,6 +88,7 @@ static int ssl3_generate_key_block(SSL *s, unsigned char *km, int num)
EVP_MD_CTX_free(m5);
EVP_MD_CTX_free(s1);
EVP_MD_free(md5);
EVP_MD_free(sha1);
return ret;
}