credits and license header for src/* and include/*

31 files changed, 384 insertions, 124 deletions

diff --git a/include/afl-as.h b/include/afl-as.h
index 55d8694d..f7e5c4dd 100644
--- a/include/afl-as.h
+++ b/include/afl-as.h
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - injectable parts
-   -------------------------------------
+   american fuzzy lop++ - injectable parts
+   ---------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/include/afl-fuzz.h b/include/afl-fuzz.h
index 3206ee72..17bdf95d 100644
--- a/include/afl-fuzz.h
+++ b/include/afl-fuzz.h
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - fuzzer header
+   ------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/include/alloc-inl.h b/include/alloc-inl.h
index 6e46ae19..de9ac1fc 100644
--- a/include/alloc-inl.h
+++ b/include/alloc-inl.h
@@ -1,10 +1,15 @@
 /*
-   american fuzzy lop - error-checking, memory-zeroing alloc routines
-   ------------------------------------------------------------------
+   american fuzzy lop++ - error-checking, memory-zeroing alloc routines
+   --------------------------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Copyright 2013, 2014, 2015 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/include/android-ashmem.h b/include/android-ashmem.h
index 02a84d11..bfe7166e 100644
--- a/include/android-ashmem.h
+++ b/include/android-ashmem.h
@@ -1,3 +1,27 @@
+/*
+   american fuzzy lop++ - android shared memory compatibility layer
+   ----------------------------------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
+
+   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
+
+   This header re-defines the shared memory routines used by AFL++
+   using the Andoid API.
+
+ */
+
 #ifndef _ANDROID_ASHMEM_H
 #define _ANDROID_ASHMEM_H
 
diff --git a/include/common.h b/include/common.h
index 9845c2af..443d1418 100644
--- a/include/common.h
+++ b/include/common.h
@@ -1,3 +1,28 @@
+/*
+   american fuzzy lop++ - common routines header
+   ---------------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
+
+   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
+
+   Gather some functions common to multiple executables
+
+   - detect_file_args
+
+ */
+
 #ifndef __AFLCOMMON_H
 #define __AFLCOMMON_H
 #include "types.h"
diff --git a/include/config.h b/include/config.h
index d85a503d..3ea75bb5 100644
--- a/include/config.h
+++ b/include/config.h
@@ -1,10 +1,15 @@
 /*
-   american fuzzy lop plus plus - vaguely configurable bits
-   ----------------------------------------------
+   american fuzzy lop++ - vaguely configurable bits
+   ------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Copyright 2013, 2014, 2015, 2016 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/include/debug.h b/include/debug.h
index 5ff2e23e..201ff943 100644
--- a/include/debug.h
+++ b/include/debug.h
@@ -1,10 +1,15 @@
 /*
-   american fuzzy lop - debug / error handling macros
-   --------------------------------------------------
+   american fuzzy lop++ - debug / error handling macros
+   ----------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Copyright 2013, 2014, 2015, 2016 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/include/forkserver.h b/include/forkserver.h
index bfc35800..d40af87c 100644
--- a/include/forkserver.h
+++ b/include/forkserver.h
@@ -1,3 +1,29 @@
+/*
+   american fuzzy lop++ - forkserver header
+   ----------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Forkserver design by Jann Horn <jannhorn@googlemail.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
+
+   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
+
+   Shared code that implements a forkserver. This is used by the fuzzer
+   as well the other components like afl-tmin.
+
+ */
+
 #ifndef __AFL_FORKSERVER_H
 #define __AFL_FORKSERVER_H
 
diff --git a/include/hash.h b/include/hash.h
index f60839ea..0ffaa410 100644
--- a/include/hash.h
+++ b/include/hash.h
@@ -1,6 +1,6 @@
 /*
-   american fuzzy lop - hashing function
-   -------------------------------------
+   american fuzzy lop++ - hashing function
+   ---------------------------------------
 
    The hash32() function is a variant of MurmurHash3, a good
    non-cryptosafe hashing function developed by Austin Appleby.
diff --git a/include/sharedmem.h b/include/sharedmem.h
index 7e13b13b..3fbfe664 100644
--- a/include/sharedmem.h
+++ b/include/sharedmem.h
@@ -1,3 +1,29 @@
+/*
+   american fuzzy lop++ - shared memory related header
+   ---------------------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Forkserver design by Jann Horn <jannhorn@googlemail.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
+
+   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
+
+   Shared code to handle the shared memory. This is used by the fuzzer
+   as well the other components like afl-tmin, afl-showmap, etc...
+
+ */
+
 #ifndef __AFL_SHAREDMEM_H
 #define __AFL_SHAREDMEM_H
 
diff --git a/include/types.h b/include/types.h
index dba666b6..baf68401 100644
--- a/include/types.h
+++ b/include/types.h
@@ -1,10 +1,15 @@
 /*
-   american fuzzy lop - type definitions and minor macros
-   ------------------------------------------------------
+   american fuzzy lop++ - type definitions and minor macros
+   --------------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Copyright 2013, 2014, 2015 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-analyze.c b/src/afl-analyze.c
index 4cfebe3b..7b647595 100644
--- a/src/afl-analyze.c
+++ b/src/afl-analyze.c
@@ -1,10 +1,15 @@
 /*
-   american fuzzy lop - file format analyzer
-   -----------------------------------------
+   american fuzzy lop++ - file format analyzer
+   -------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
    Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-as.c b/src/afl-as.c
index 96b00d37..fed1882b 100644
--- a/src/afl-as.c
+++ b/src/afl-as.c
@@ -1,10 +1,15 @@
 /*
-   american fuzzy lop - wrapper for GNU as
-   ---------------------------------------
+   american fuzzy lop++ - wrapper for GNU as
+   -----------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Copyright 2013, 2014, 2015 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-common.c b/src/afl-common.c
index 69c1a77d..7859a74f 100644
--- a/src/afl-common.c
+++ b/src/afl-common.c
@@ -1,7 +1,26 @@
 /*
- gather some functions common to multiple executables
+   american fuzzy lop++ - common routines
+   --------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
+
+   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
+
+   Gather some functions common to multiple executables
+
+   - detect_file_args
 
- detect_file_args
  */
 
 #include <stdlib.h>
diff --git a/src/afl-forkserver.c b/src/afl-forkserver.c
index 152ae802..2a4e0819 100644
--- a/src/afl-forkserver.c
+++ b/src/afl-forkserver.c
@@ -1,3 +1,29 @@
+/*
+   american fuzzy lop++ - forkserver code
+   --------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Forkserver design by Jann Horn <jannhorn@googlemail.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
+
+   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
+
+   Shared code that implements a forkserver. This is used by the fuzzer
+   as well the other components like afl-tmin.
+
+ */
+
 #include "config.h"
 #include "types.h"
 #include "debug.h"
diff --git a/src/afl-fuzz-bitmap.c b/src/afl-fuzz-bitmap.c
index be187fff..34e1dacb 100644
--- a/src/afl-fuzz-bitmap.c
+++ b/src/afl-fuzz-bitmap.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - bitmap related routines
+   ----------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-extras.c b/src/afl-fuzz-extras.c
index f43c86f4..97f3ac5c 100644
--- a/src/afl-fuzz-extras.c
+++ b/src/afl-fuzz-extras.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - extras relates routines
+   ----------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-globals.c b/src/afl-fuzz-globals.c
index 8fded173..0d073154 100644
--- a/src/afl-fuzz-globals.c
+++ b/src/afl-fuzz-globals.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - globals declarations
+   -------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-init.c b/src/afl-fuzz-init.c
index 8588dde7..b45d3783 100644
--- a/src/afl-fuzz-init.c
+++ b/src/afl-fuzz-init.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - initialization related routines
+   ------------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-misc.c b/src/afl-fuzz-misc.c
index eb0cc187..09b02345 100644
--- a/src/afl-fuzz-misc.c
+++ b/src/afl-fuzz-misc.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - misc stuffs from Mordor
+   ----------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-one.c b/src/afl-fuzz-one.c
index bc63c226..6dc7b658 100644
--- a/src/afl-fuzz-one.c
+++ b/src/afl-fuzz-one.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - fuzze_one routines in different flavours
+   ---------------------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-python.c b/src/afl-fuzz-python.c
index e22291b5..9a1309e0 100644
--- a/src/afl-fuzz-python.c
+++ b/src/afl-fuzz-python.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - python extension routines
+   ------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-queue.c b/src/afl-fuzz-queue.c
index 22a9ccb0..a77b5799 100644
--- a/src/afl-fuzz-queue.c
+++ b/src/afl-fuzz-queue.c
@@ -1,13 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - queue relates routines
+   ---------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
-
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
    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:
diff --git a/src/afl-fuzz-run.c b/src/afl-fuzz-run.c
index 4093d991..9f4fafe4 100644
--- a/src/afl-fuzz-run.c
+++ b/src/afl-fuzz-run.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - target execution related routines
+   --------------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz-stats.c b/src/afl-fuzz-stats.c
index 3614599d..e68dc980 100644
--- a/src/afl-fuzz-stats.c
+++ b/src/afl-fuzz-stats.c
@@ -1,12 +1,15 @@
 /*
-   american fuzzy lop - fuzzer code
-   --------------------------------
+   american fuzzy lop++ - stats related routines
+   ---------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-fuzz.c b/src/afl-fuzz.c
index d04058ca..398d1b80 100644
--- a/src/afl-fuzz.c
+++ b/src/afl-fuzz.c
@@ -2,11 +2,14 @@
    american fuzzy lop - fuzzer code
    --------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
-
-   Forkserver design by Jann Horn <jannhorn@googlemail.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-gcc.c b/src/afl-gcc.c
index 750f9b72..08705a36 100644
--- a/src/afl-gcc.c
+++ b/src/afl-gcc.c
@@ -1,10 +1,15 @@
 /*
-   american fuzzy lop - wrapper for GCC and clang
-   ----------------------------------------------
+   american fuzzy lop++ - wrapper for GCC and clang
+   ------------------------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
 
-   Copyright 2013, 2014, 2015 Google Inc. All rights reserved.
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-gotcpu.c b/src/afl-gotcpu.c
index fd96d25d..6ca129c2 100644
--- a/src/afl-gotcpu.c
+++ b/src/afl-gotcpu.c
@@ -2,9 +2,14 @@
    american fuzzy lop - free CPU gizmo
    -----------------------------------
 
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
-
-   Copyright 2015, 2016 Google Inc. All rights reserved.
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-sharedmem.c b/src/afl-sharedmem.c
index 60764779..9fd5fb01 100644
--- a/src/afl-sharedmem.c
+++ b/src/afl-sharedmem.c
@@ -1,4 +1,26 @@
 /*
+   american fuzzy lop++ - shared memory related code
+   -------------------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Forkserver design by Jann Horn <jannhorn@googlemail.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
+
+   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
+
+   Shared code to handle the shared memory. This is used by the fuzzer
+   as well the other components like afl-tmin, afl-showmap, etc...
 
  */
 
diff --git a/src/afl-showmap.c b/src/afl-showmap.c
index 5c367339..649684d3 100644
--- a/src/afl-showmap.c
+++ b/src/afl-showmap.c
@@ -1,10 +1,17 @@
 /*
-   american fuzzy lop - map display utility
-   ----------------------------------------
-
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
-
-   Copyright 2013, 2014, 2015, 2016, 2017 Google Inc. All rights reserved.
+   american fuzzy lop++ - map display utility
+   ------------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Forkserver design by Jann Horn <jannhorn@googlemail.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.
diff --git a/src/afl-tmin.c b/src/afl-tmin.c
index ce4a3d76..a33966a0 100644
--- a/src/afl-tmin.c
+++ b/src/afl-tmin.c
@@ -1,10 +1,17 @@
 /*
-   american fuzzy lop - test case minimizer
-   ----------------------------------------
-
-   Written and maintained by Michal Zalewski <lcamtuf@google.com>
-
-   Copyright 2015, 2016, 2017 Google Inc. All rights reserved.
+   american fuzzy lop++ - test case minimizer
+   ------------------------------------------
+
+   Originally written by Michal Zalewski <lcamtuf@google.com>
+   
+   Forkserver design by Jann Horn <jannhorn@googlemail.com>
+   
+   Now maintained by by Marc Heuse <mh@mh-sec.de>,
+                        Heiko Eißfeldt <heiko.eissfeldt@hexco.de> and
+                        Andrea Fioraldi <andreafioraldi@gmail.com>
+
+   Copyright 2016, 2017 Google Inc. All rights reserved.
+   Copyright 2019 AFLplusplus Project. All rights reserved.
 
    Licensed under the Apache License, Version 2.0 (the "License");
    you may not use this file except in compliance with the License.