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

first step of v2 final release

Browse Source
This commit is contained in:
Zhi Guan
2017-11-05 21:00:36 +08:00
parent 480b9e8d88
commit 27bde477a5
395 changed files with 26341 additions and 31364 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
crypto/kdf/hkdf.c
View File

@@ -17,18 +17,18 @@
#define HKDF_MAXBUF 1024
static unsigned char *HKDF(const EVP_MD *evp_md,
/*static*/ unsigned char *HKDF(const EVP_MD *evp_md,
const unsigned char *salt, size_t salt_len,
const unsigned char *key, size_t key_len,
const unsigned char *info, size_t info_len,
unsigned char *okm, size_t okm_len);
static unsigned char *HKDF_Extract(const EVP_MD *evp_md,
/*static*/ unsigned char *HKDF_Extract(const EVP_MD *evp_md,
const unsigned char *salt, size_t salt_len,
const unsigned char *key, size_t key_len,
unsigned char *prk, size_t *prk_len);
static unsigned char *HKDF_Expand(const EVP_MD *evp_md,
/*static*/ unsigned char *HKDF_Expand(const EVP_MD *evp_md,
const unsigned char *prk, size_t prk_len,
const unsigned char *info, size_t info_len,
unsigned char *okm, size_t okm_len);
@@ -199,7 +199,7 @@ const EVP_PKEY_METHOD hkdf_pkey_meth = {
pkey_hkdf_ctrl_str
};
static unsigned char *HKDF(const EVP_MD *evp_md,
/*static*/ unsigned char *HKDF(const EVP_MD *evp_md,
const unsigned char *salt, size_t salt_len,
const unsigned char *key, size_t key_len,
const unsigned char *info, size_t info_len,
@@ -214,7 +214,7 @@ static unsigned char *HKDF(const EVP_MD *evp_md,
return HKDF_Expand(evp_md, prk, prk_len, info, info_len, okm, okm_len);
}
static unsigned char *HKDF_Extract(const EVP_MD *evp_md,
/*static*/ unsigned char *HKDF_Extract(const EVP_MD *evp_md,
const unsigned char *salt, size_t salt_len,
const unsigned char *key, size_t key_len,
unsigned char *prk, size_t *prk_len)
@@ -228,7 +228,7 @@ static unsigned char *HKDF_Extract(const EVP_MD *evp_md,
return prk;
}
static unsigned char *HKDF_Expand(const EVP_MD *evp_md,
/*static*/ unsigned char *HKDF_Expand(const EVP_MD *evp_md,
const unsigned char *prk, size_t prk_len,
const unsigned char *info, size_t info_len,
unsigned char *okm, size_t okm_len)

3
crypto/kdf/tls1_prf.c
View File

@@ -237,7 +237,7 @@ static int tls1_prf_alg(const EVP_MD *md,
const unsigned char *seed, size_t seed_len,
unsigned char *out, size_t olen)
{
#if !defined(OPENSSL_NO_MD5) && !defined(OPENSSL_NO_SHA)
if (EVP_MD_type(md) == NID_md5_sha1) {
size_t i;
unsigned char *tmp;
@@ -258,6 +258,7 @@ static int tls1_prf_alg(const EVP_MD *md,
OPENSSL_clear_free(tmp, olen);
return 1;
}
#endif
if (!tls1_prf_P_hash(md, sec, slen, seed, seed_len, out, olen))
return 0;