wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2026-07-08 18:20:50 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #2160 from dgarske/fix_async

Browse Source 
Fixes for asynchronous crypto and TLS
This commit is contained in:
John Safranek
2019-03-14 11:56:46 -07:00
committed by GitHub
parent 4b56af67a2 6361ec2f10
commit 8a1ad3fcff
6 changed files with 28 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files
examples/client/client.c
+2 -1
View File
@@ -1506,7 +1506,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
while ((ch = mygetopt(argc, argv, "?:"
"ab:c:defgh:ijk:l:mnop:q:rstuv:wxyz"
"A:B:CDE:F:GH:IJKL:M:NO:PQRS:TUVW:XYZ:"
"01:23:5")) != -1) {
"01:23:45")) != -1) {
switch (ch) {
case '?' :
if(myoptarg!=NULL) {
@@ -1930,6 +1930,7 @@ THREAD_RETURN WOLFSSL_THREAD client_test(void* args)
forceScr = 1;
resumeScr = 1;
#endif
break;
case '5' :
#ifdef HAVE_TRUSTED_CA
src/internal.c
+8 -17
View File
@@ -19839,7 +19839,6 @@ int SendClientKeyExchange(WOLFSSL* ssl)
#ifndef NO_DH
case diffie_hellman_kea:
{
word32 sigLen;
ssl->buffers.sig.length = ENCRYPT_LEN;
ssl->buffers.sig.buffer = (byte*)XMALLOC(ENCRYPT_LEN,
ssl->heap, DYNAMIC_TYPE_SIGNATURE);
@@ -19883,13 +19882,11 @@ int SendClientKeyExchange(WOLFSSL* ssl)
}
/* for DH, encSecret is Yc, agree is pre-master */
sigLen = ssl->buffers.sig.length;
ret = DhGenKeyPair(ssl, ssl->buffers.serverDH_Key,
ssl->buffers.sig.buffer, &sigLen,
ssl->buffers.sig.buffer, (word32*)&ssl->buffers.sig.length,
args->encSecret, &args->encSz);
/* set the max agree result size */
ssl->buffers.sig.length = (unsigned int)sigLen;
ssl->arrays->preMasterSz = ENCRYPT_LEN;
break;
}
@@ -20001,7 +19998,7 @@ int SendClientKeyExchange(WOLFSSL* ssl)
/* for DH, encSecret is Yc, agree is pre-master */
ret = DhGenKeyPair(ssl, ssl->buffers.serverDH_Key,
ssl->buffers.sig.buffer, &ssl->buffers.sig.length,
ssl->buffers.sig.buffer, (word32*)&ssl->buffers.sig.length,
args->output + OPAQUE16_LEN, &args->length);
break;
}
@@ -20907,11 +20904,10 @@ int SendCertificateVerify(WOLFSSL* ssl)
#ifdef HAVE_ECC
if (ssl->hsType == DYNAMIC_TYPE_ECC) {
ecc_key* key = (ecc_key*)ssl->hsKey;
word32 sigLen = ssl->buffers.sig.length;
ret = EccSign(ssl,
ssl->buffers.digest.buffer, ssl->buffers.digest.length,
ssl->buffers.sig.buffer, &sigLen,
ssl->buffers.sig.buffer, (word32*)&ssl->buffers.sig.length,
key,
#ifdef HAVE_PK_CALLBACKS
ssl->buffers.key
@@ -20919,7 +20915,6 @@ int SendCertificateVerify(WOLFSSL* ssl)
NULL
#endif
);
ssl->buffers.sig.length = (unsigned int)sigLen;
}
#endif /* HAVE_ECC */
#if defined(HAVE_ED25519) && !defined(NO_ED25519_CLIENT_AUTH)
@@ -20928,7 +20923,7 @@ int SendCertificateVerify(WOLFSSL* ssl)
ret = Ed25519Sign(ssl,
ssl->hsHashes->messages, ssl->hsHashes->length,
ssl->buffers.sig.buffer, &ssl->buffers.sig.length,
ssl->buffers.sig.buffer, (word32*)&ssl->buffers.sig.length,
key,
#ifdef HAVE_PK_CALLBACKS
ssl->buffers.key
@@ -21715,8 +21710,6 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
case diffie_hellman_kea:
#endif
{
word32 dhPrivLen, dhPubLen;
/* Allocate DH key buffers and generate key */
if (ssl->buffers.serverDH_P.buffer == NULL ||
ssl->buffers.serverDH_G.buffer == NULL) {
@@ -21783,13 +21776,11 @@ static int DoSessionTicket(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
}
}
dhPrivLen = ssl->buffers.serverDH_Priv.length;
dhPubLen = ssl->buffers.serverDH_Pub.length;
ret = DhGenKeyPair(ssl, ssl->buffers.serverDH_Key,
ssl->buffers.serverDH_Priv.buffer, &dhPrivLen,
ssl->buffers.serverDH_Pub.buffer, &dhPubLen);
ssl->buffers.serverDH_Priv.length = (unsigned int)dhPrivLen;
ssl->buffers.serverDH_Pub.length = (unsigned int)dhPubLen;
ssl->buffers.serverDH_Priv.buffer,
(word32*)&ssl->buffers.serverDH_Priv.length,
ssl->buffers.serverDH_Pub.buffer,
(word32*)&ssl->buffers.serverDH_Pub.length);
break;
}
#endif /* !NO_DH && (!NO_PSK || !NO_RSA) */
src/tls13.c
+4 -5
View File
@@ -5395,17 +5395,16 @@ static int SendTls13CertificateVerify(WOLFSSL* ssl)
{
#ifdef HAVE_ECC
if (ssl->hsType == DYNAMIC_TYPE_ECC) {
word32 sigLen = sig->length;
ret = EccSign(ssl, args->sigData, args->sigDataSz,
args->verify + HASH_SIG_SIZE + VERIFY_HEADER,
&sigLen, (ecc_key*)ssl->hsKey,
(word32*)&sig->length, (ecc_key*)ssl->hsKey,
#ifdef HAVE_PK_CALLBACKS
ssl->buffers.key
#else
NULL
#endif
);
sig->length = (unsigned int)sigLen;
args->length = (word16)sig->length;
}
#endif /* HAVE_ECC */
@@ -5413,14 +5412,14 @@ static int SendTls13CertificateVerify(WOLFSSL* ssl)
if (ssl->hsType == DYNAMIC_TYPE_ED25519) {
ret = Ed25519Sign(ssl, args->sigData, args->sigDataSz,
args->verify + HASH_SIG_SIZE + VERIFY_HEADER,
&sig->length, (ed25519_key*)ssl->hsKey,
(word32*)&sig->length, (ed25519_key*)ssl->hsKey,
#ifdef HAVE_PK_CALLBACKS
ssl->buffers.key
#else
NULL
#endif
);
args->length = sig->length;
args->length = (word16)sig->length;
}
#endif
#ifndef NO_RSA
wolfcrypt/src/aes.c
+6 -3
View File
@@ -6061,7 +6061,8 @@ int wc_AesGcmEncrypt_ex(Aes* aes, byte* out, const byte* in, word32 sz,
(byte*)aes->reg, ivOutSz,
authTag, authTagSz,
authIn, authInSz);
IncCtr((byte*)aes->reg, ivOutSz);
if (ret == 0)
IncCtr((byte*)aes->reg, ivOutSz);
}
return ret;
@@ -6534,8 +6535,10 @@ int wc_AesCcmEncrypt_ex(Aes* aes, byte* out, const byte* in, word32 sz,
(byte*)aes->reg, aes->nonceSz,
authTag, authTagSz,
authIn, authInSz);
XMEMCPY(ivOut, aes->reg, aes->nonceSz);
IncCtr((byte*)aes->reg, aes->nonceSz);
if (ret == 0) {
XMEMCPY(ivOut, aes->reg, aes->nonceSz);
IncCtr((byte*)aes->reg, aes->nonceSz);
}
}
return ret;
wolfcrypt/src/asn.c
+2 -2
View File
@@ -12990,6 +12990,8 @@ static void SetNameFromDcert(CertName* cn, DecodedCert* decoded)
}
}
#ifndef NO_FILESYSTEM
/* Set cn name from der buffer, return 0 on success */
static int SetNameFromCert(CertName* cn, const byte* der, int derSz)
{
@@ -13029,8 +13031,6 @@ static int SetNameFromCert(CertName* cn, const byte* der, int derSz)
return ret < 0 ? ret : 0;
}
#ifndef NO_FILESYSTEM
/* Set cert issuer from issuerFile in PEM */
int wc_SetIssuer(Cert* cert, const char* issuerFile)
{
wolfssl/wolfcrypt/types.h
+6 -3
View File
@@ -317,8 +317,11 @@
XFREE(VAR_NAME[idx##VAR_NAME], (HEAP), DYNAMIC_TYPE_WOLF_BIGINT); \
}
#define DECLARE_ARRAY_DYNAMIC DECLARE_ARRAY
#define FREE_ARRAY_DYNAMIC FREE_ARRAY
#define DECLARE_ARRAY_DYNAMIC_DEC(VAR_NAME, VAR_TYPE, VAR_ITEMS, VAR_SIZE, HEAP) \
DECLARE_ARRAY(VAR_NAME, VAR_TYPE, VAR_ITEMS, VAR_SIZE, HEAP)
#define DECLARE_ARRAY_DYNAMIC_EXE(VAR_NAME, VAR_TYPE, VAR_ITEMS, VAR_SIZE, HEAP)
#define FREE_ARRAY_DYNAMIC(VAR_NAME, VAR_ITEMS, HEAP) \
FREE_ARRAY(VAR_NAME, VAR_ITEMS, HEAP)
#else
#define DECLARE_VAR(VAR_NAME, VAR_TYPE, VAR_SIZE, HEAP) \
VAR_TYPE VAR_NAME[VAR_SIZE]
@@ -331,7 +334,7 @@
#define DECLARE_ARRAY_DYNAMIC_DEC(VAR_NAME, VAR_TYPE, VAR_ITEMS, VAR_SIZE, HEAP) \
VAR_TYPE* VAR_NAME[VAR_ITEMS]; \
int idx##VAR_NAME;
int idx##VAR_NAME;
#define DECLARE_ARRAY_DYNAMIC_EXE(VAR_NAME, VAR_TYPE, VAR_ITEMS, VAR_SIZE, HEAP) \
for (idx##VAR_NAME=0; idx##VAR_NAME<VAR_ITEMS; idx##VAR_NAME++) { \
VAR_NAME[idx##VAR_NAME] = (VAR_TYPE*)XMALLOC(VAR_SIZE, (HEAP), DYNAMIC_TYPE_TMP_BUFFER); \