diff options
| author | Mike Aizatsky <aizatsky@chromium.org> | 2016-12-07 21:59:56 +0000 |
|---|---|---|
| committer | android-build-merger <android-build-merger@google.com> | 2016-12-07 21:59:56 +0000 |
| commit | 5e683e8a4cae72e18b102e86776bbf7b4b3d00aa (patch) | |
| tree | 109c8b0b82b0229c14b035058fa630f11b403d49 | |
| parent | d936fce9817f83351bd878207319626528e18f2f (diff) | |
| parent | 29b86236a66d2fddaba7016d35e049a1763d3a54 (diff) | |
| download | tpm2-5e683e8a4cae72e18b102e86776bbf7b4b3d00aa.tar.gz | |
[ossfuzz] catching up with upstream changes am: abb7a18cbd am: be4ffac51a
am: 29b86236a6
Change-Id: I55a7459aa15d16a5fddb30a3608eb2fac1507d74
| -rw-r--r-- | fuzz/README | 8 | ||||
| -rwxr-xr-x | fuzz/build.sh | 18 |
2 files changed, 12 insertions, 14 deletions
diff --git a/fuzz/README b/fuzz/README index 0f7c2d2..4c0cc04 100644 --- a/fuzz/README +++ b/fuzz/README @@ -13,8 +13,8 @@ Quick start: Build fuzzers - $ docker run -i --rm -v $(pwd):/src/tpm2 -v /tmp/fuzzers:/out \ - -t ossfuzz/tpm2 + $ docker run -ti --rm -v $(pwd):/src/tpm2 -v /tmp/fuzzers:/out \ + ossfuzz/tpm2 Look in /tmp/fuzzers to see the executables. Run them like so: @@ -30,8 +30,8 @@ To reproduce a crash under gdb: Build fuzzers - $ docker run -i --rm -v $(pwd):/src/tpm2 -v /tmp/fuzzers:/out \ - -t ossfuzz/tpm2 + $ docker run -ti --rm -v $(pwd):/src/tpm2 -v /tmp/fuzzers:/out \ + ossfuzz/tpm2 Get a shell in the container diff --git a/fuzz/build.sh b/fuzz/build.sh index 5f4c168..9b93338 100755 --- a/fuzz/build.sh +++ b/fuzz/build.sh @@ -3,18 +3,16 @@ # Use of this source code is governed by a BSD-style license that can be # found in the LICENSE file. # -# Builds fuzzers from within a container into /out/ director. +# Builds fuzzers from within a container into /out/ directory. # Expects /src/tpm2 to contain tpm2 checkout. -mkdir /work/tpm2 -cd /src/tpm2 -make V=1 obj=/work/tpm2 /work/tpm2/libtpm2.a - -find /usr/lib -name "*.a" -grep -r BN_CTX_get /usr/lib/ +mkdir $WORK/tpm2 +cd $SRC/tpm2 +make V=1 obj=$WORK/tpm2 $WORK/tpm2/libtpm2.a $CXX $CXXFLAGS $FUZZER_LDFLAGS -std=c++11 \ - /src/tpm2/fuzz/execute-command.cc -o /out/tpm2_execute_command_fuzzer \ - -lfuzzer /work/tpm2/libtpm2.a \ + $SRC/tpm2/fuzz/execute-command.cc -o $OUT/tpm2_execute_command_fuzzer \ + -I $SRC/tpm2 \ + $WORK/tpm2/libtpm2.a \ /usr/lib/x86_64-linux-gnu/libcrypto.a /usr/lib/x86_64-linux-gnu/libssl.a \ - -I /src/tpm2 + -lFuzzingEngine |