diff options
| author | Guido Vranken <guidovranken@users.noreply.github.com> | 2021-03-25 15:02:38 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-25 07:02:38 -0700 |
| commit | 2e183b053c59f5fa4c30422d6e8e38de9f3a37d2 (patch) | |
| tree | 2028da1303975776dcfd90c90e48f08c6e3c946c | |
| parent | 0282c8c4955e1811882caecf4861f1a5a32bd293 (diff) | |
| download | oss-fuzz-2e183b053c59f5fa4c30422d6e8e38de9f3a37d2.tar.gz | |
[relic] Various improvements (#5500)
- Enable i386 fuzzing
- Enable more operations (Digest, HMAC, KDF_X963, ECC_ValidatePubkey)
- Scope the calc operations in order to spend less time trying to run calculations not supported by relic
- Compile Botan module in oracle mode: makes it more likely to find discrepancies
| -rwxr-xr-x | projects/relic/build.sh | 15 | ||||
| -rw-r--r-- | projects/relic/project.yaml | 1 |
2 files changed, 12 insertions, 4 deletions
diff --git a/projects/relic/build.sh b/projects/relic/build.sh index feda5d7c8..552b14fc6 100755 --- a/projects/relic/build.sh +++ b/projects/relic/build.sh @@ -33,7 +33,13 @@ export CXXFLAGS="$CXXFLAGS -D_LIBCPP_ENABLE_CXX17_REMOVED_AUTO_PTR" cd $SRC/relic/ mkdir build/ cd build/ -cmake .. -DCOMP="$CFLAGS" -DQUIET=on -DRAND=CALL -DSHLIB=off -DSTBIN=off -DTESTS=0 -DBENCH=0 -DALLOC=DYNAMIC +if [[ $CFLAGS = *-m32* ]] +then + export RELIC_ARCH="X86" +else + export RELIC_ARCH="X64" +fi +cmake .. -DCOMP="$CFLAGS" -DQUIET=on -DRAND=CALL -DSHLIB=off -DSTBIN=off -DTESTS=0 -DBENCH=0 -DALLOC=DYNAMIC -DARCH=$RELIC_ARCH make -j$(nproc) cd ../.. export RELIC_PATH=$(realpath relic) @@ -49,7 +55,7 @@ else fi make -j$(nproc) -export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_BOTAN" +export CXXFLAGS="$CXXFLAGS -DCRYPTOFUZZ_BOTAN -DCRYPTOFUZZ_BOTAN_IS_ORACLE" export LIBBOTAN_A_PATH="$SRC/botan/libbotan-3.a" export BOTAN_INCLUDE_PATH="$SRC/botan/build/include" @@ -59,9 +65,10 @@ python gen_repository.py rm extra_options.h echo -n '"' >>extra_options.h echo -n '--force-module=relic ' >>extra_options.h -echo -n '--operations=BignumCalc,ECC_PrivateToPublic,ECDSA_Sign,ECDSA_Verify ' >>extra_options.h +echo -n '--operations=BignumCalc,ECC_PrivateToPublic,ECC_ValidatePubkey,ECDSA_Sign,ECDSA_Verify,Digest,HMAC,KDF_X963 ' >>extra_options.h echo -n '--curves=secp256k1,secp256r1 ' >>extra_options.h -echo -n '--digests=NULL ' >>extra_options.h +echo -n '--digests=NULL,SHA224,SHA256,SHA384,SHA512,BLAKE2S160,BLAKE2S256 ' >>extra_options.h +echo -n '--calcops=Abs,Add,Bit,ClearBit,Cmp,CmpAbs,Div,ExpMod,GCD,InvMod,IsEven,IsOdd,IsZero,Jacobi,LCM,LShift1,Mod,Mul,Neg,NumBits,RShift,SetBit,Sqr,Sqrt,Sub ' >>extra_options.h echo -n '"' >>extra_options.h cd modules/relic/ make -B -j$(nproc) diff --git a/projects/relic/project.yaml b/projects/relic/project.yaml index 823b4f934..98fb04fce 100644 --- a/projects/relic/project.yaml +++ b/projects/relic/project.yaml @@ -10,3 +10,4 @@ sanitizers: - memory architectures: - x86_64 + - i386 |