[ossfuzz] catching up with upstream changes am: abb7a18cbd am: be4ffac51a am: 29b86236a6 am: 5e683e8a4c
am: 03d6eae321

Change-Id: Ic07b6cabbcff7f97fe771e0119e5a16e7f354b37
diff --git a/fuzz/README b/fuzz/README
index 0f7c2d2..4c0cc04 100644
--- a/fuzz/README
+++ b/fuzz/README
@@ -13,8 +13,8 @@
 
   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 @@
 
   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