7 files changed, 68 insertions, 11 deletions
diff --git a/projects/gnupg/Dockerfile b/projects/gnupg/Dockerfile
index 02bc37ee5..57dc9050d 100644
--- a/projects/gnupg/Dockerfile
+++ b/projects/gnupg/Dockerfile
@@ -15,7 +15,6 @@
 ################################################################################
 
 FROM gcr.io/oss-fuzz-base/base-builder
-MAINTAINER p.antoine@catenacyber.fr
 RUN apt-get update && apt-get install -y make autoconf automake libtool gettext bzip2 gnupg bison flex
 
 RUN git clone --depth 1 git://git.gnupg.org/libgpg-error.git libgpg-error
diff --git a/projects/gnupg/build.sh b/projects/gnupg/build.sh
index a346c13e7..846bc8ddf 100755
--- a/projects/gnupg/build.sh
+++ b/projects/gnupg/build.sh
@@ -60,13 +60,5 @@ make -j$(nproc) all
 
 # build fuzzers
 cd tests/fuzz
-#export other associated stuff
-cp *.options $OUT/
-cp fuzz_*_seed_corpus.zip $OUT/
-
-ls fuzz_*.c | cut -d_ -f2 | cut -d. -f1 | while read target
-do
-    $CC $CFLAGS -DHAVE_CONFIG_H -I. -I../..  -I../../common -I../../g10 -c fuzz_$target.c -o fuzz_$target.o
-
-    $CXX $CXXFLAGS -std=c++11 -DHAVE_CONFIG_H fuzz_$target.o -o $OUT/fuzz_$target ../../g10/libgpg.a ../../kbx/libkeybox.a ../../common/libcommon.a ../../common/libgpgrl.a $LIB_FUZZING_ENGINE -lgcrypt -lgpg-error -lassuan -lnpth
-done
+# export fuzzers and other associated stuff
+cp fuzz_* $OUT/
diff --git a/projects/gnupg/fuzz_decrypt.c b/projects/gnupg/fuzz_decrypt.c
index ebc7d7d40..f92c15dcf 100644
--- a/projects/gnupg/fuzz_decrypt.c
+++ b/projects/gnupg/fuzz_decrypt.c
@@ -1,3 +1,18 @@
+/* Copyright 2020 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -5,6 +20,7 @@
 #include <stdbool.h>
 #include <ftw.h>
 
+#define INCLUDED_BY_MAIN_MODULE 1
 #include "config.h"
 #include "gpg.h"
 #include "../common/types.h"
diff --git a/projects/gnupg/fuzz_import.c b/projects/gnupg/fuzz_import.c
index e410fff5b..a05f54a5f 100644
--- a/projects/gnupg/fuzz_import.c
+++ b/projects/gnupg/fuzz_import.c
@@ -1,3 +1,18 @@
+/* Copyright 2020 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -5,6 +20,7 @@
 #include <stdbool.h>
 #include <ftw.h>
 
+#define INCLUDED_BY_MAIN_MODULE 1
 #include "config.h"
 #include "gpg.h"
 #include "../common/types.h"
diff --git a/projects/gnupg/fuzz_list.c b/projects/gnupg/fuzz_list.c
index 048eec184..d5a44ceba 100644
--- a/projects/gnupg/fuzz_list.c
+++ b/projects/gnupg/fuzz_list.c
@@ -1,3 +1,18 @@
+/* Copyright 2020 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -5,6 +20,7 @@
 #include <stdbool.h>
 #include <ftw.h>
 
+#define INCLUDED_BY_MAIN_MODULE 1
 #include "config.h"
 #include "gpg.h"
 #include "../common/types.h"
diff --git a/projects/gnupg/fuzz_verify.c b/projects/gnupg/fuzz_verify.c
index f08ef0f96..c32c1b70d 100644
--- a/projects/gnupg/fuzz_verify.c
+++ b/projects/gnupg/fuzz_verify.c
@@ -1,3 +1,18 @@
+/* Copyright 2020 Google Inc.
+
+Licensed under the Apache License, Version 2.0 (the "License");
+you may not use this file except in compliance with the License.
+You may obtain a copy of the License at
+
+      http://www.apache.org/licenses/LICENSE-2.0
+
+Unless required by applicable law or agreed to in writing, software
+distributed under the License is distributed on an "AS IS" BASIS,
+WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+See the License for the specific language governing permissions and
+limitations under the License.
+*/
+
 #include <stdint.h>
 #include <stddef.h>
 #include <stdlib.h>
@@ -5,6 +20,7 @@
 #include <stdbool.h>
 #include <ftw.h>
 
+#define INCLUDED_BY_MAIN_MODULE 1
 #include "config.h"
 #include "gpg.h"
 #include "../common/types.h"
diff --git a/projects/gnupg/project.yaml b/projects/gnupg/project.yaml
index 48e8e088a..c2c6ab2ca 100644
--- a/projects/gnupg/project.yaml
+++ b/projects/gnupg/project.yaml
@@ -1,2 +1,4 @@
 homepage: "https://www.gnupg.org"
+language: c++
 primary_contact: "p.antoine@catenacyber.fr"
+main_repo: 'git://git.gnupg.org/gnupg.git'