This commit is contained in:
Zhi Guan
2016-06-06 22:04:44 +02:00
parent 2bf25bd29f
commit 2cb43b7f80
142 changed files with 7768 additions and 1678 deletions

View File

@@ -164,7 +164,7 @@
#define SSL_ENC_SEED_IDX 11
#define SSL_ENC_AES128GCM_IDX 12
#define SSL_ENC_AES256GCM_IDX 13
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
#define SSL_ENC_SM4_IDX 14
#define SSL_ENC_NUM_IDX 15
#else
@@ -174,7 +174,7 @@
static const EVP_CIPHER *ssl_cipher_methods[SSL_ENC_NUM_IDX] = {
NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL, NULL,
NULL, NULL,
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
NULL
#endif
};
@@ -191,7 +191,7 @@ static STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
#define SSL_MD_GOST89MAC_IDX 3
#define SSL_MD_SHA256_IDX 4
#define SSL_MD_SHA384_IDX 5
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
#define SSL_MD_SM3_IDX 6
#endif
@@ -202,7 +202,7 @@ static STACK_OF(SSL_COMP) *ssl_comp_methods = NULL;
#define SSL_MD_NUM_IDX SSL_MAX_DIGEST
static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = {
NULL, NULL, NULL, NULL, NULL, NULL,
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
NULL
#endif
};
@@ -215,14 +215,14 @@ static const EVP_MD *ssl_digest_methods[SSL_MD_NUM_IDX] = {
static int ssl_mac_pkey_id[SSL_MD_NUM_IDX] = {
EVP_PKEY_HMAC, EVP_PKEY_HMAC, EVP_PKEY_HMAC, NID_undef,
EVP_PKEY_HMAC, EVP_PKEY_HMAC,
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
EVP_PKEY_HMAC
#endif
};
static int ssl_mac_secret_size[SSL_MD_NUM_IDX] = {
0, 0, 0, 0, 0, 0,
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
0
#endif
};
@@ -231,7 +231,7 @@ static int ssl_handshake_digest_flag[SSL_MD_NUM_IDX] = {
SSL_HANDSHAKE_MAC_MD5, SSL_HANDSHAKE_MAC_SHA,
SSL_HANDSHAKE_MAC_GOST94, 0, SSL_HANDSHAKE_MAC_SHA256,
SSL_HANDSHAKE_MAC_SHA384,
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
SSL_HANDSHAKE_MAC_SM3,
#endif
};
@@ -482,7 +482,7 @@ void ssl_load_ciphers(void)
ssl_mac_secret_size[SSL_MD_SHA384_IDX] =
EVP_MD_size(ssl_digest_methods[SSL_MD_SHA384_IDX]);
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
ssl_cipher_methods[SSL_ENC_SM4_IDX] = EVP_get_cipherbyname(SN_sms4_cbc);
ssl_digest_methods[SSL_MD_SM3_IDX] = EVP_get_digestbyname(SN_sm3);
ssl_mac_secret_size[SSL_MD_SM3_IDX] = EVP_MD_size(ssl_digest_methods[SSL_MD_SM3_IDX]);
@@ -609,7 +609,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
case SSL_AES256GCM:
i = SSL_ENC_AES256GCM_IDX;
break;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
case SSL_SM4:
i = SSL_ENC_SM4_IDX;
break;
@@ -647,7 +647,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
case SSL_GOST89MAC:
i = SSL_MD_GOST89MAC_IDX;
break;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
case SSL_SM3:
i = SSL_MD_SM3_IDX;
break;
@@ -706,7 +706,7 @@ int ssl_cipher_get_evp(const SSL_SESSION *s, const EVP_CIPHER **enc,
c->algorithm_mac == SSL_SHA256 &&
(evp = EVP_get_cipherbyname("AES-256-CBC-HMAC-SHA256")))
*enc = evp, *md = NULL;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
else if (c->algorithm_enc == SSL_SM4 &&
c->algorithm_mac == SSL_SM3 &&
(evp = EVP_get_cipherbyname("SM4-CBC-HMAC-SM3")))
@@ -859,7 +859,7 @@ static void ssl_cipher_get_disabled(unsigned long *mkey, unsigned long *auth,
|| ssl_mac_pkey_id[SSL_MD_GOST89MAC_IDX] ==
NID_undef) ? SSL_GOST89MAC : 0;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
/* what we should do? */
#endif
}
@@ -1745,7 +1745,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
ver = "SSLv3";
else if (alg_ssl & SSL_TLSV1_2)
ver = "TLSv1.2";
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
else if (alg_ssl & SSL_GMV1)
ver = "GMSSLv1.1";
#endif
@@ -1786,7 +1786,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_kGOST:
kx = "GOST";
break;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
case SSL_kECDHE2:
kx = "ECDHE2";
break;
@@ -1841,7 +1841,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_aGOST01:
au = "GOST01";
break;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
case SSL_aSM2:
au = "SM2";
break;
@@ -1895,7 +1895,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_eGOST2814789CNT:
enc = "GOST89(256)";
break;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
case SSL_SM4:
enc = "SM4(128)";
break;
@@ -1927,7 +1927,7 @@ char *SSL_CIPHER_description(const SSL_CIPHER *cipher, char *buf, int len)
case SSL_GOST94:
mac = "GOST94";
break;
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
case SSL_SM3:
mac = "SM3";
break;
@@ -1966,7 +1966,7 @@ char *SSL_CIPHER_get_version(const SSL_CIPHER *c)
return ("TLSv1/SSLv3");
else if (i == 2)
return ("SSLv2");
#ifndef OPENSSL_NO_GMSSL
#ifndef NO_GMSSL
else if (i == 1)
return ("GMSSLv1");
#endif