abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-08 23:13:38 +08:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #761 from yuanzh78/patch-2

Browse Source 
Update s3_lib.c ssl_get_algorithm2()
This commit is contained in:
Zhi Guan
2019-09-03 18:45:16 +08:00
committed by GitHub
parent 5c7f6af399 b101236292
commit 8e4e4ea7f2
1 changed files with 6 additions and 0 deletions
Download Patch File Download Diff File Expand all files Collapse all files

6
ssl/s3_lib.c
View File

@@ -4219,6 +4219,12 @@ long ssl_get_algorithm2(SSL *s)
} else if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_PSK) { } else if (s->s3->tmp.new_cipher->algorithm_mkey & SSL_PSK) {
if (alg2 == (SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384)) if (alg2 == (SSL_HANDSHAKE_MAC_SHA384 | TLS1_PRF_SHA384))
return SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF; return SSL_HANDSHAKE_MAC_DEFAULT | TLS1_PRF;
} else{
// in the end of finish msg of gmssl handshake, to get the correct hash algo
printf("ssl_get_algorithm2=0x08x\n", ssl_get_algorithm2);
if (alg2 == 0x909){
return SSL_HANDSHAKE_MAC_SM3 | TLS1_PRF_SM3;
}
} }
return alg2; return alg2;
} }