mirrors/wolfssl
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

add external wrappers for TLS Master Secret generation and Key Expansion

Browse Source
This commit is contained in:
toddouska 2014-11-03 09:56:40 -08:00
parent 02f7c71222
commit d9f5ada772
3 changed files with 62 additions and 36 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
cyassl/internal.h
View File

@ -1500,7 +1500,7 @@ enum MACAlgorithm {
md5_mac,
sha_mac,
sha224_mac,
sha256_mac,
sha256_mac, /* needs to match external KDF_MacAlgorithm */
sha384_mac,
sha512_mac,
rmd_mac,

22
cyassl/ssl.h
View File

@ -1098,6 +1098,14 @@ enum BulkCipherAlgorithm {
};
/* for KDF TLS 1.2 mac types */
enum KDF_MacAlgorithm {
cyassl_sha256 = 4, /* needs to match internal MACAlgorithm */
cyassl_sha384,
cyassl_sha512
};
/* Public Key Callback support */
typedef int (*CallbackEccSign)(CYASSL* ssl,
const unsigned char* in, unsigned int inSz,
@ -1342,6 +1350,20 @@ CYASSL_API int CyaSSL_set_SessionTicket_cb(CYASSL*,
#define CYASSL_CRL_MONITOR 0x01 /* monitor this dir flag */
#define CYASSL_CRL_START_MON 0x02 /* start monitoring flag */
/* External facing KDF */
CYASSL_API
int CyaSSL_MakeTlsMasterSecret(unsigned char* ms, unsigned int msLen,
const unsigned char* pms, unsigned int pmsLen,
const unsigned char* cr, const unsigned char* sr,
int tls1_2, int hash_type);
CYASSL_API
int CyaSSL_DeriveTlsKeys(unsigned char* key_data, unsigned int keyLen,
const unsigned char* ms, unsigned int msLen,
const unsigned char* sr, const unsigned char* cr,
int tls1_2, int hash_type);
#ifdef CYASSL_CALLBACKS
/* used internally by CyaSSL while OpenSSL types aren't */

74
src/tls.c
View File

@ -404,6 +404,22 @@ static const byte master_label[MASTER_LABEL_SZ + 1] = "master secret";
static const byte key_label [KEY_LABEL_SZ + 1] = "key expansion";
/* External facing wrapper so user can call as well, 0 on success */
int CyaSSL_DeriveTlsKeys(byte* key_data, word32 keyLen,
const byte* ms, word32 msLen,
const byte* sr, const byte* cr,
int tls1_2, int hash_type)
{
byte seed[SEED_LEN];
XMEMCPY(seed, sr, RAN_LEN);
XMEMCPY(seed + RAN_LEN, cr, RAN_LEN);
return PRF(key_data, keyLen, ms, msLen, key_label, KEY_LABEL_SZ,
seed, SEED_LEN, tls1_2, hash_type);
}
int DeriveTlsKeys(CYASSL* ssl)
{
int ret;
@ -411,18 +427,12 @@ int DeriveTlsKeys(CYASSL* ssl)
2 * ssl->specs.key_size +
2 * ssl->specs.iv_size;
#ifdef CYASSL_SMALL_STACK
byte* seed;
byte* key_data;
#else
byte seed[SEED_LEN];
byte key_data[MAX_PRF_DIG];
#endif
#ifdef CYASSL_SMALL_STACK
seed = (byte*)XMALLOC(SEED_LEN, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (seed == NULL)
return MEMORY_E;
key_data = (byte*)XMALLOC(MAX_PRF_DIG, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (key_data == NULL) {
XFREE(seed, NULL, DYNAMIC_TYPE_TMP_BUFFER);
@ -430,18 +440,14 @@ int DeriveTlsKeys(CYASSL* ssl)
}
#endif
XMEMCPY(seed, ssl->arrays->serverRandom, RAN_LEN);
XMEMCPY(seed + RAN_LEN, ssl->arrays->clientRandom, RAN_LEN);
ret = PRF(key_data, length, ssl->arrays->masterSecret, SECRET_LEN,
key_label, KEY_LABEL_SZ, seed, SEED_LEN, IsAtLeastTLSv1_2(ssl),
ssl->specs.mac_algorithm);
ret = CyaSSL_DeriveTlsKeys(key_data, length,
ssl->arrays->masterSecret, SECRET_LEN,
ssl->arrays->serverRandom, ssl->arrays->clientRandom,
IsAtLeastTLSv1_2(ssl), ssl->specs.mac_algorithm);
if (ret == 0)
ret = StoreKeys(ssl, key_data);
#ifdef CYASSL_SMALL_STACK
XFREE(seed, NULL, DYNAMIC_TYPE_TMP_BUFFER);
XFREE(key_data, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
@ -449,28 +455,30 @@ int DeriveTlsKeys(CYASSL* ssl)
}
/* External facing wrapper so user can call as well, 0 on success */
int CyaSSL_MakeTlsMasterSecret(byte* ms, word32 msLen,
const byte* pms, word32 pmsLen,
const byte* cr, const byte* sr,
int tls1_2, int hash_type)
{
byte seed[SEED_LEN];
XMEMCPY(seed, cr, RAN_LEN);
XMEMCPY(seed + RAN_LEN, sr, RAN_LEN);
return PRF(ms, msLen, pms, pmsLen, master_label, MASTER_LABEL_SZ,
seed, SEED_LEN, tls1_2, hash_type);
}
int MakeTlsMasterSecret(CYASSL* ssl)
{
int ret;
#ifdef CYASSL_SMALL_STACK
byte* seed;
#else
byte seed[SEED_LEN];
#endif
#ifdef CYASSL_SMALL_STACK
seed = (byte*)XMALLOC(SEED_LEN, NULL, DYNAMIC_TYPE_TMP_BUFFER);
if (seed == NULL)
return MEMORY_E;
#endif
XMEMCPY(seed, ssl->arrays->clientRandom, RAN_LEN);
XMEMCPY(seed + RAN_LEN, ssl->arrays->serverRandom, RAN_LEN);
ret = PRF(ssl->arrays->masterSecret, SECRET_LEN,
ret = CyaSSL_MakeTlsMasterSecret(ssl->arrays->masterSecret, SECRET_LEN,
ssl->arrays->preMasterSecret, ssl->arrays->preMasterSz,
master_label, MASTER_LABEL_SZ,
seed, SEED_LEN, IsAtLeastTLSv1_2(ssl), ssl->specs.mac_algorithm);
ssl->arrays->clientRandom, ssl->arrays->serverRandom,
IsAtLeastTLSv1_2(ssl), ssl->specs.mac_algorithm);
if (ret == 0) {
#ifdef SHOW_SECRETS
@ -485,10 +493,6 @@ int MakeTlsMasterSecret(CYASSL* ssl)
ret = DeriveTlsKeys(ssl);
}
#ifdef CYASSL_SMALL_STACK
XFREE(seed, NULL, DYNAMIC_TYPE_TMP_BUFFER);
#endif
return ret;
}