Ensure curl and curl-fuzzer are extracted to src (#875)

Fixes #874
This commit is contained in:
Max Dymond 2017-10-02 15:47:55 +01:00 committed by Abhishek Arya
parent e2c6a3ec10
commit 069d366abe
4 changed files with 6 additions and 77 deletions

View File

@ -18,8 +18,7 @@ FROM gcr.io/oss-fuzz-base/base-builder
MAINTAINER dvyukov@google.com
RUN apt-get update && apt-get install -y make autoconf automake libtool libssl-dev zlib1g-dev
RUN git clone --depth 1 https://github.com/curl/curl.git /tmp/curl
RUN git clone --depth 1 https://github.com/curl/curl-fuzzer.git /tmp/curl_fuzzer
WORKDIR /tmp/curl_fuzzer
COPY build.sh *.options *.dict $SRC/
RUN git clone --depth 1 https://github.com/curl/curl.git /src/curl
RUN git clone --depth 1 https://github.com/curl/curl-fuzzer.git /src/curl_fuzzer
WORKDIR /src/curl_fuzzer
COPY build.sh $SRC/

View File

@ -15,31 +15,5 @@
#
################################################################################
echo "CC: $CC"
echo "CXX: $CXX"
echo "LIB_FUZZING_ENGINE: $LIB_FUZZING_ENGINE"
echo "CFLAGS: $CFLAGS"
echo "CXXFLAGS: $CXXFLAGS"
# Make an install directory
export INSTALLDIR=/tmp/curl_install
# Compile curl
pushd /tmp/curl
./buildconf
./configure --prefix=${INSTALLDIR} --disable-shared --enable-debug --enable-maintainer-mode --disable-symbol-hiding --disable-threaded-resolver --enable-ipv6 --with-random=/dev/null --without-ssl
make -j$(nproc)
make install
popd
# Build the fuzzer.
./buildconf
./configure
make
make check
make zip
cp -v curl_fuzzer curl_fuzzer_seed_corpus.zip $OUT/
# Copy dictionary and options file to $OUT.
cp $SRC/*.dict $SRC/*.options $OUT/
# Run the OSS-Fuzz script in the curl-fuzzer project.
./ossfuzz.sh

View File

@ -1,3 +0,0 @@
[libfuzzer]
max_len = 10000
dict = http.dict

View File

@ -1,41 +0,0 @@
"\x0a\x0d"
"HTTP/1.0"
"HTTP/1.1"
"100"
"200"
"301"
"400"
"Server:"
"Last-Modified:"
"Content-Type:"
"text/html"
"charset=UTF-8"
"Accept-Ranges:"
"bytes"
"Content-Length:"
"Transfer-Encoding:"
"compress"
"exi"
"gzip"
"identity"
"pack200-gzip"
"br"
"deflate"
"bzip2"
"lzma"
"xz"
"Content-Encoding:"
"chunked"
"Connection:"
"close"
"Date:"
"Expires:"
"Fri, 31 Dec 1999 23:59:59 GMT"
"Cache-Control:"
"no-cache"
"no-store"
"must-revalidate"
"Pragma:"
"no-cache"
"Host:"