Merge pull request #4838 from SparkiDev/g++_fix_4

Rework functions to avoid warning with g++
This commit is contained in:
Daniel Pouzzner 2022-02-08 10:20:58 -06:00 committed by GitHub
commit 3ee6e93590
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23

View File

@ -4057,14 +4057,22 @@ int wolfSSL_GetHmacSize(WOLFSSL* ssl)
#ifdef WORD64_AVAILABLE
int wolfSSL_GetPeerSequenceNumber(WOLFSSL* ssl, word64 *seq)
{
return ssl ? !(*seq = (word64)ssl->keys.peer_sequence_number_hi << 32 |
ssl->keys.peer_sequence_number_lo) : BAD_FUNC_ARG;
if ((ssl == NULL) || (seq == NULL))
return BAD_FUNC_ARG;
*seq = ((word64)ssl->keys.peer_sequence_number_hi << 32) |
ssl->keys.peer_sequence_number_lo;
return !(*seq);
}
int wolfSSL_GetSequenceNumber(WOLFSSL* ssl, word64 *seq)
{
return ssl ? !(*seq = (word64)ssl->keys.sequence_number_hi << 32 |
ssl->keys.sequence_number_lo) : BAD_FUNC_ARG;
if ((ssl == NULL) || (seq == NULL))
return BAD_FUNC_ARG;
*seq = ((word64)ssl->keys.sequence_number_hi << 32) |
ssl->keys.sequence_number_lo;
return !(*seq);
}
#endif