diff options
| author |  Marta Marczykowska-Górecka <marmarta@users.noreply.github.com> | 2019-06-27 02:29:48 +0200 |
|---|---|---|
| committer |  jonathanmetzman <31354670+jonathanmetzman@users.noreply.github.com> | 2019-06-26 17:29:47 -0700 |
| commit | 3c93f4ffc0171ce4cc166637765dc1d68db114c5 (patch) | |
| tree | 460b2783d9041fd1db2bb4be620a60f24fa85650 /projects | |
| parent | d5992e4ef57ef2493c160fb22de1ce8542041f35 (diff) | |
Added integration for qubes-core-qubesdb (#2540)
* Added integration for qubes-core-qubesdb
Integration for qubesdb daemon used for communication between VMs.
* Build qubes fuzzers only for the appropriate sanitizer
Diffstat (limited to 'projects')
| -rw-r--r-- | projects/qubes-os/Dockerfile | 4 | ||||
| -rw-r--r-- | projects/qubes-os/build.sh | 12 | ||||
| -rw-r--r-- | projects/qubes-os/project.yaml | 3 |
3 files changed, 13 insertions, 6 deletions
diff --git a/projects/qubes-os/Dockerfile b/projects/qubes-os/Dockerfile index e0edeeb7..b6cd045f 100644 --- a/projects/qubes-os/Dockerfile +++ b/projects/qubes-os/Dockerfile @@ -17,10 +17,12 @@ FROM gcr.io/oss-fuzz-base/base-builder MAINTAINER paras.chetal@gmail.com -RUN apt-get update && apt-get -y install build-essential automake libtool git python +RUN apt-get update && apt-get -y install build-essential automake libtool git python libsystemd-dev WORKDIR qubes-os RUN git clone --single-branch https://github.com/QubesOS/qubes-app-linux-input-proxy $SRC/qubes-os/app-linux-input-proxy +RUN git clone --single-branch https://github.com/QubesOS/qubes-core-qubesdb $SRC/qubes-os/qubes-core-qubesdb + COPY build.sh *.options $SRC/ diff --git a/projects/qubes-os/build.sh b/projects/qubes-os/build.sh index 6a8ae5f6..372a4784 100644 --- a/projects/qubes-os/build.sh +++ b/projects/qubes-os/build.sh @@ -15,10 +15,18 @@ # ################################################################################ -cd $SRC/qubes-os/app-linux-input-proxy +if [ "$SANITIZER" != 'undefined' ]; then + cd $SRC/qubes-os/app-linux-input-proxy + make -C fuzz + cp fuzz/*_fuzzer $OUT/ + cp fuzz/*_seed_corpus.zip $OUT/ + cp fuzz/*.options $OUT/ +fi + +cd $SRC/qubes-os/qubes-core-qubesdb + make -C fuzz cp fuzz/*_fuzzer $OUT/ cp fuzz/*_seed_corpus.zip $OUT/ cp fuzz/*.options $OUT/ - diff --git a/projects/qubes-os/project.yaml b/projects/qubes-os/project.yaml index d25295c8..80a316f6 100644 --- a/projects/qubes-os/project.yaml +++ b/projects/qubes-os/project.yaml @@ -4,6 +4,3 @@ auto_ccs: - "joanna@invisiblethingslab.com" - "marmarek@invisiblethingslab.com" - "paras.chetal@gmail.com" -sanitizers: - - address - - memory |