wolfSSL/wolfssl
1
0
Fork 1
mirror of https://github.com/wolfSSL/wolfssl.git synced 2025-08-02 12:14:38 +02:00
Code Issues Packages Projects Releases Wiki Activity

Merge pull request #1094 from JacobBarthelmeh/Testing

Browse Source 
Testing
This commit is contained in:
toddouska
2017-08-10 13:01:46 -07:00
committed by GitHub
parent 294a13f9a2 8b41fc841b
commit 963746fb3e
1 changed files with 1 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
src/tls13.c
View File

@@ -1642,7 +1642,6 @@ static int EncryptTls13(WOLFSSL* ssl, byte* output, const byte* input,
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
case wolfssl_chacha: case wolfssl_chacha:
nonceSz = CHACHA_IV_BYTES;
ret = ChaCha20Poly1305_Encrypt(ssl, output, input, dataSz, ret = ChaCha20Poly1305_Encrypt(ssl, output, input, dataSz,
ssl->encrypt.nonce, output + dataSz); ssl->encrypt.nonce, output + dataSz);
break; break;
@@ -1855,7 +1854,6 @@ int DecryptTls13(WOLFSSL* ssl, byte* output, const byte* input, word16 sz)
#if defined(HAVE_CHACHA) && defined(HAVE_POLY1305) #if defined(HAVE_CHACHA) && defined(HAVE_POLY1305)
case wolfssl_chacha: case wolfssl_chacha:
nonceSz = CHACHA_IV_BYTES;
ret = ChaCha20Poly1305_Decrypt(ssl, output, input, dataSz, ret = ChaCha20Poly1305_Decrypt(ssl, output, input, dataSz,
ssl->decrypt.nonce, input + dataSz); ssl->decrypt.nonce, input + dataSz);
break; break;
@@ -2618,7 +2616,7 @@ int DoTls13ServerHello(WOLFSSL* ssl, const byte* input, word32* inOutIdx,
#ifdef HAVE_SECRET_CALLBACK #ifdef HAVE_SECRET_CALLBACK
if (ssl->sessionSecretCb != NULL) { if (ssl->sessionSecretCb != NULL) {
int secretSz = SECRET_LEN, ret; int secretSz = SECRET_LEN;
ret = ssl->sessionSecretCb(ssl, ssl->session.masterSecret, ret = ssl->sessionSecretCb(ssl, ssl->session.masterSecret,
&secretSz, ssl->sessionSecretCtx); &secretSz, ssl->sessionSecretCtx);
if (ret != 0 || secretSz != SECRET_LEN) if (ret != 0 || secretSz != SECRET_LEN)