Fixes for build with distro for BuildTls13HandshakeHmac arg change.

This commit is contained in:
David Garske
2017-05-09 10:09:43 -07:00
parent c47826cc8f
commit 8d4f8c6d80
2 changed files with 3 additions and 3 deletions

View File

@@ -1784,7 +1784,7 @@ static int WritePSKBinders(WOLFSSL* ssl, byte* output, word32 idx)
/* Build the HMAC of the handshake message data = binder. */ /* Build the HMAC of the handshake message data = binder. */
ret = BuildTls13HandshakeHmac(ssl, ssl->keys.client_write_MAC_secret, ret = BuildTls13HandshakeHmac(ssl, ssl->keys.client_write_MAC_secret,
current->binder, current->binderLen); current->binder, &current->binderLen);
if (ret != 0) if (ret != 0)
return ret; return ret;
@@ -2247,7 +2247,7 @@ static int DoPreSharedKeys(WOLFSSL *ssl, const byte* input, word32 helloSz,
PreSharedKey* current; PreSharedKey* current;
byte binderKey[MAX_DIGEST_SIZE]; byte binderKey[MAX_DIGEST_SIZE];
byte binder[MAX_DIGEST_SIZE]; byte binder[MAX_DIGEST_SIZE];
word16 binderLen; word32 binderLen;
word16 modes; word16 modes;
ext = TLSX_Find(ssl->extensions, TLSX_PRE_SHARED_KEY); ext = TLSX_Find(ssl->extensions, TLSX_PRE_SHARED_KEY);

View File

@@ -2051,7 +2051,7 @@ typedef struct PreSharedKey {
word16 identityLen; /* Length of identity */ word16 identityLen; /* Length of identity */
byte* identity; /* PSK identity */ byte* identity; /* PSK identity */
word32 ticketAge; /* Age of the ticket */ word32 ticketAge; /* Age of the ticket */
byte binderLen; /* Length of HMAC */ word32 binderLen; /* Length of HMAC */
byte binder[MAX_DIGEST_SIZE]; /* HMAC of hanshake */ byte binder[MAX_DIGEST_SIZE]; /* HMAC of hanshake */
byte hmac; /* HMAC algorithm */ byte hmac; /* HMAC algorithm */
byte resumption:1; /* Resumption PSK */ byte resumption:1; /* Resumption PSK */