diff options
| author | Ludvig Michaelsson <ludvig.michaelsson@gmail.com> | 2021-03-09 17:12:08 +0100 |
|---|---|---|
| committer | GitHub <noreply@github.com> | 2021-03-09 08:12:08 -0800 |
| commit | fb720ead0e6730a587419e932ea2fdab497fa77c (patch) | |
| tree | 464344b238025d7b21df42a75bb363ae29efd0b3 /projects | |
| parent | 3831700b4d13172d46a0dd7334a8541b9b90409c (diff) | |
| download | oss-fuzz-fb720ead0e6730a587419e932ea2fdab497fa77c.tar.gz | |
libfido2: update dependencies (#5340)
* libfido2: update libcbor to v0.8.0
* libfido2: add new zlib dependency
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/libfido2/Dockerfile | 3 | ||||
| -rwxr-xr-x | projects/libfido2/build.sh | 9 |
2 files changed, 10 insertions, 2 deletions
diff --git a/projects/libfido2/Dockerfile b/projects/libfido2/Dockerfile index b288499e1..58d9c0f47 100644 --- a/projects/libfido2/Dockerfile +++ b/projects/libfido2/Dockerfile @@ -17,8 +17,9 @@ FROM gcr.io/oss-fuzz-base/base-builder RUN apt-get update && apt-get install -y make autoconf automake libtool RUN apt-get install -y cmake libudev-dev pkg-config chrpath -RUN git clone --branch v0.7.0 https://github.com/PJK/libcbor +RUN git clone --branch v0.8.0 https://github.com/PJK/libcbor RUN git clone --branch OpenSSL_1_1_1-stable https://github.com/openssl/openssl +RUN git clone --branch v1.2.11 https://github.com/madler/zlib RUN git clone https://github.com/Yubico/libfido2 # CIFuzz will replace the libfido directory so put the corpus outside ADD https://ambientworks.net/libfido2/corpus.tgz corpus.tgz diff --git a/projects/libfido2/build.sh b/projects/libfido2/build.sh index 8e0793220..f779913db 100755 --- a/projects/libfido2/build.sh +++ b/projects/libfido2/build.sh @@ -20,7 +20,8 @@ cd ${SRC}/libcbor patch -l -p0 < ${SRC}/libfido2/fuzz/README mkdir build && cd build -cmake -DCMAKE_BUILD_TYPE=Debug -DCMAKE_INSTALL_PREFIX=${WORK} -DSANITIZE=OFF .. +cmake -DBUILD_SHARED_LIBS=ON -DCMAKE_BUILD_TYPE=Debug \ + -DCMAKE_INSTALL_PREFIX=${WORK} -DSANITIZE=OFF .. make -j$(nproc) VERBOSE=1 make install @@ -36,6 +37,12 @@ fi make -j$(nproc) LDCMD="${CXX} ${CXXFLAGS}" make install_sw +# Build zlib, taken from oss-fuzz/projects/zlib.sh +cd ${SRC}/zlib +./configure --prefix=${WORK} +make -j$(nproc) all +make install + # Building libfido2 with ${LIB_FUZZING_ENGINE} and chosen sanitizer cd ${SRC}/libfido2 mkdir build && cd build |