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

Merge pull request #4566 from ejohnstown/fips-check

Browse Source 
fips-check script update
This commit is contained in:
Daniel Pouzzner 2021-11-15 13:23:54 -06:00 committed by GitHub
commit c80e63a822
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 18 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
fips-check.sh
View File

@ -39,6 +39,7 @@ Platform is one of:
linuxv5-RC8 (old FIPS 140-3)
linuxv5 (current FIPS 140-3)
linuxv5-ready (ready FIPS 140-3)
linuxv5-RC10
Keep (default off) retains the XXX-fips-test temp dir for inspection.
Example:
@ -308,6 +309,21 @@ linuxv5|linuxv5-RC9)
COPY_DIRECT=( wolfcrypt/src/aes_asm.S wolfcrypt/src/aes_asm.asm
wolfcrypt/src/sha256_asm.S wolfcrypt/src/sha512_asm.S )
;;
linuxv5-RC10)
FIPS_REPO="git@github.com:wolfSSL/fips.git"
FIPS_VERSION="WCv5.0-RC10"
CRYPT_REPO="git@github.com:wolfSSL/wolfssl.git"
CRYPT_VERSION="WCv5.0-RC10"
CRYPT_INC_PATH="wolfssl/wolfcrypt"
CRYPT_SRC_PATH="wolfcrypt/src"
WC_MODS=( aes sha sha256 sha512 rsa hmac random cmac dh ecc sha3 kdf )
RNG_VERSION="WCv5.0-RC10"
FIPS_SRCS=( fips.c fips_test.c wolfcrypt_first.c wolfcrypt_last.c )
FIPS_INCS=( fips.h )
FIPS_OPTION="v5-RC10"
COPY_DIRECT=( wolfcrypt/src/aes_asm.S wolfcrypt/src/aes_asm.asm
wolfcrypt/src/sha256_asm.S wolfcrypt/src/sha512_asm.S )
;;
*)
Usage

4
src/sniffer.c
View File

@ -5031,7 +5031,7 @@ static int AdjustSequence(TcpInfo* tcpInfo, SnifferSession* session,
/* remove bytes already on reassembly list */
covered_data_len = newEnd - reassemblyList->begin;
*sslFrame += covered_data_len;
*sslBytes = (*sslBytes > covered_data_len) ?
*sslBytes = (*sslBytes > covered_data_len) ?
*sslBytes - covered_data_len : 0;
}
if ((*sslBytes > 0) && (newEnd > reassemblyList->end)) {
@ -5105,7 +5105,7 @@ static int AdjustSequence(TcpInfo* tcpInfo, SnifferSession* session,
/* remove bytes already on reassembly list */
covered_data_len = newEnd - reassemblyList->begin;
*sslFrame += covered_data_len;
*sslBytes = (*sslBytes > covered_data_len) ?
*sslBytes = (*sslBytes > covered_data_len) ?
*sslBytes - covered_data_len : 0;
}
if ((*sslBytes > 0) && (newEnd > reassemblyList->end)) {