Remove the public domain notices from the self-test/benchmark code,

because it turns out to be something of a legal minefield.

12 files changed, 2 insertions, 19 deletions

diff --git a/checks/algos.cpp b/checks/algos.cpp
index 13a8982f8..be9e2e358 100644
--- a/checks/algos.cpp
+++ b/checks/algos.cpp
@@ -1,4 +1,3 @@
-// this file is public domain
 
 #include <botan/botan.h>
 #include <string>
diff --git a/checks/bench.cpp b/checks/bench.cpp
index acb86b0b5..377aa6d5a 100644
--- a/checks/bench.cpp
+++ b/checks/bench.cpp
@@ -1,4 +1,3 @@
-/* This file is in the public domain */
 
 #include <iostream>
 #include <iomanip>
diff --git a/checks/block.cpp b/checks/block.cpp
index ee89a97aa..ac003dc25 100644
--- a/checks/block.cpp
+++ b/checks/block.cpp
@@ -1,4 +1,3 @@
-/* This file is in the public domain */
 
 /*
   We don't use the standard issue ECB filter, because we also want to check
diff --git a/checks/check.cpp b/checks/check.cpp
index 1eedfb3b4..5b0bcbfe6 100644
--- a/checks/check.cpp
+++ b/checks/check.cpp
@@ -1,7 +1,5 @@
 /*
  * Test Driver for Botan
- *
- * This file is in the public domain
  */
 
 #include <vector>
@@ -20,7 +18,6 @@ using namespace Botan_types;
 
 #include "getopt.h"
 
-
 const std::string VALIDATION_FILE = "checks/validate.dat";
 const std::string BIGINT_VALIDATION_FILE = "checks/mp_valid.dat";
 const std::string PK_VALIDATION_FILE = "checks/pk_valid.dat";
diff --git a/checks/common.h b/checks/common.h
index f887997fd..32b1699f2 100644
--- a/checks/common.h
+++ b/checks/common.h
@@ -1,8 +1,7 @@
 // common code for the validation and benchmark code
-// this file is in the public domain
 
-#ifndef BOTANCHECK_COMMON_H__
-#define BOTANCHECK_COMMON_H__
+#ifndef BOTAN_CHECK_COMMON_H__
+#define BOTAN_CHECK_COMMON_H__
 
 #include <vector>
 #include <string>
diff --git a/checks/dolook.cpp b/checks/dolook.cpp
index 40891599a..d72ab59b9 100644
--- a/checks/dolook.cpp
+++ b/checks/dolook.cpp
@@ -1,5 +1,3 @@
-/* This file is in the public domain */
-
 #include <vector>
 #include <string>
 
diff --git a/checks/dolook2.cpp b/checks/dolook2.cpp
index cfa7bb466..53e71dc26 100644
--- a/checks/dolook2.cpp
+++ b/checks/dolook2.cpp
@@ -1,5 +1,3 @@
-/* This file is in the public domain */
-
 #include <vector>
 #include <string>
 #include <cstdlib>
diff --git a/checks/misc.cpp b/checks/misc.cpp
index daf51beb8..53da2a77e 100644
--- a/checks/misc.cpp
+++ b/checks/misc.cpp
@@ -1,4 +1,3 @@
-/* public domain */
 #include <iostream>
 #include <vector>
 #include <string>
diff --git a/checks/pk.cpp b/checks/pk.cpp
index b6406b4f2..be6891dbb 100644
--- a/checks/pk.cpp
+++ b/checks/pk.cpp
@@ -1,4 +1,3 @@
-/* This file is in the public domain */
 #include <iostream>
 #include <fstream>
 #include <string>
diff --git a/checks/validate.cpp b/checks/validate.cpp
index 4945a5e29..2bdd6181b 100644
--- a/checks/validate.cpp
+++ b/checks/validate.cpp
@@ -1,6 +1,5 @@
 /*
   Validation routines
-  This file is in the public domain
 */
 
 #include <iostream>
diff --git a/checks/validate.dat b/checks/validate.dat
index 51130328d..56a8e3e26 100644
--- a/checks/validate.dat
+++ b/checks/validate.dat
@@ -4,8 +4,6 @@
 # functions, MACs, KDFs, S2K algorithms, encoders/decoders, and block cipher
 # modes (CBC, CTS, CFB, OFB, CTR, and EAX)
 
-# All of the validation files (checks/*.dat) are public domain
-
 # MARKER: Block Ciphers
 
 # Block cipher format is plaintext:ciphertext:key
diff --git a/checks/x509.cpp b/checks/x509.cpp
index 05c223937..b42071af6 100644
--- a/checks/x509.cpp
+++ b/checks/x509.cpp
@@ -1,4 +1,3 @@
-/* This file is in the public domain */
 #include <botan/x509self.h>
 #include <botan/x509stor.h>
 #include <botan/x509_ca.h>