From eb6be0506e798b796fb3772b1c8e3554741b07cd Mon Sep 17 00:00:00 2001
From: John Andersen <john.s.andersen@intel.com>
Date: Mon, 3 Jun 2019 17:15:59 -0700
Subject: [PATCH] [tpm2-tss] Add Andreas to CC list and sync Dockerfile (#2482)

Signed-off-by: John Andersen <john.s.andersen@intel.com>
---
 projects/tpm2-tss/Dockerfile   | 85 +++++++++++++++++++++-------------
 projects/tpm2-tss/project.yaml |  1 +
 2 files changed, 55 insertions(+), 31 deletions(-)

diff --git a/projects/tpm2-tss/Dockerfile b/projects/tpm2-tss/Dockerfile
index c4ec77fab..47c6c44fd 100644
--- a/projects/tpm2-tss/Dockerfile
+++ b/projects/tpm2-tss/Dockerfile
@@ -16,42 +16,57 @@
 FROM gcr.io/oss-fuzz-base/base-builder
 
 RUN apt-get update && \
-  apt-get install -y \
-    autoconf \
+    apt-get install -y \
     autoconf-archive \
-    automake \
-    build-essential \
-    doxygen \
-    g++ \
-    gcc \
-    git \
-    gnulib \
-    libssl-dev \
-    libtool \
-    m4 \
-    net-tools \
-    pkg-config \
-    wget \
+    curl \
     libcmocka0 \
     libcmocka-dev \
-    libgcrypt20-dev \
+    net-tools \
+    build-essential \
+    git \
+    pkg-config \
+    gcc \
+    g++ \
+    m4 \
     libtool \
-    liburiparser-dev \
-    uthash-dev
+    automake \
+    libgcrypt20-dev \
+    libssl-dev \
+    autoconf \
+    gnulib \
+    wget \
+    doxygen \
+    libdbus-1-dev \
+    libglib2.0-dev \
+    clang-6.0 \
+    clang-tools-6.0 \
+    pandoc \
+    lcov \
+    libcurl4-openssl-dev \
+    dbus-x11 \
+    python-yaml \
+    python3-yaml \
+    vim-common \
+    python3-pip \
+    libsqlite3-dev \
+    python-cryptography \
+    python3-cryptography
 
-# OpenSSL
-ARG openssl_name=openssl-1.1.0h
-WORKDIR /tmp
-RUN wget --quiet --show-progress --progress=dot:giga https://www.openssl.org/source/$openssl_name.tar.gz \
-	&& tar xvf $openssl_name.tar.gz \
-	&& rm /tmp/$openssl_name.tar.gz
-WORKDIR $openssl_name
-RUN ./config --prefix=/usr/local/openssl --openssldir=/usr/local/openssl \
-	&& make -j$(nproc) \
-	&& make install \
-	&& openssl version
+RUN pip3 install cpp-coveralls
+
+RUN update-alternatives --install /usr/bin/clang clang /usr/bin/clang-6.0 100
+RUN update-alternatives --install /usr/bin/scan-build scan-build /usr/bin/scan-build-6.0 100
+
+ARG autoconf_archive=autoconf-archive-2018.03.13
+WORKDIR /tmp 
+RUN wget --quiet --show-progress --progress=dot:giga "http://mirror.kumi.systems/gnu/autoconf-archive/$autoconf_archive.tar.xz" \
+		&& tar -xf $autoconf_archive.tar.xz \
+        && rm $autoconf_archive.tar.xz \
+        && cd $autoconf_archive \
+        && ./configure --prefix=/usr \
+        && make -j $(nproc) && make install
+RUN rm -fr $autoconf_archive.tar.xz
 
-# IBM's Software TPM 2.0
 ARG ibmtpm_name=ibmtpm1119
 WORKDIR /tmp
 RUN wget --quiet --show-progress --progress=dot:giga "https://downloads.sourceforge.net/project/ibmswtpm2/$ibmtpm_name.tar.gz" \
@@ -61,7 +76,15 @@ RUN wget --quiet --show-progress --progress=dot:giga "https://downloads.sourcefo
 	&& rm $ibmtpm_name.tar.gz
 WORKDIR $ibmtpm_name/src
 RUN CFLAGS="-I/usr/local/openssl/include" make -j$(nproc) \
-	&& cp tpm_server /usr/local/bin
+&& cp tpm_server /usr/local/bin
+RUN rm -fr $ibmtpm_name/src $ibmtpm_name.tar.gz
+
+ARG uthash="2.1.0"
+WORKDIR /tmp
+RUN wget --quiet --show-progress --progress=dot:giga "https://github.com/troydhanson/uthash/archive/v${uthash}.tar.gz" \
+	&& tar -xf v${uthash}.tar.gz \
+        && cp uthash-${uthash}/src/*.h /usr/include/
+RUN rm -rf uthash-${uthash}/ v${uthash}.tar.gz
 
 RUN git clone --depth 1 \
   https://github.com/tpm2-software/tpm2-tss $SRC/tpm2-tss/
diff --git a/projects/tpm2-tss/project.yaml b/projects/tpm2-tss/project.yaml
index 20cd03167..4009a719a 100644
--- a/projects/tpm2-tss/project.yaml
+++ b/projects/tpm2-tss/project.yaml
@@ -1,6 +1,7 @@
 homepage: "https://github.com/tpm2-software/tpm2-tss"
 primary_contact: "tadeusz.struk@intel.com"
 auto_ccs:
+  - "andreas.fuchs@sit.fraunhofer.de"
   - "john.s.andersen@intel.com"
 sanitizers:
   - address