Ensure all files have copyright and license info.

Update license header line to specify the terms and refer to the file,
neither of which it included before.

31 files changed, 131 insertions, 10 deletions

diff --git a/src/cmd/apps.h b/src/cmd/apps.h
index 5f866938f..8e8e48742 100644
--- a/src/cmd/apps.h
+++ b/src/cmd/apps.h
@@ -1,3 +1,8 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
 
 #include <iostream>
 #include <functional>
diff --git a/src/cmd/asn1.cpp b/src/cmd/asn1.cpp
index cb68b2fcc..8b6400e2a 100644
--- a/src/cmd/asn1.cpp
+++ b/src/cmd/asn1.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #include <botan/bigint.h>
diff --git a/src/cmd/base64.cpp b/src/cmd/base64.cpp
index de9954bab..9a841ba2c 100644
--- a/src/cmd/base64.cpp
+++ b/src/cmd/base64.cpp
@@ -2,7 +2,7 @@
 * Encode/decode base64 strings
 * (C) 2009 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include "apps.h"
diff --git a/src/cmd/bcrypt.cpp b/src/cmd/bcrypt.cpp
index 30b0c425a..4d3926b83 100644
--- a/src/cmd/bcrypt.cpp
+++ b/src/cmd/bcrypt.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_BCRYPT)
diff --git a/src/cmd/ca.cpp b/src/cmd/ca.cpp
index 453258ac6..fd1873cc3 100644
--- a/src/cmd/ca.cpp
+++ b/src/cmd/ca.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_X509_CERTIFICATES)
diff --git a/src/cmd/cert_verify.cpp b/src/cmd/cert_verify.cpp
index 800ac8f6c..b486f8880 100644
--- a/src/cmd/cert_verify.cpp
+++ b/src/cmd/cert_verify.cpp
@@ -2,7 +2,7 @@
 * Simple example of a certificate validation
 * (C) 2010 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include "apps.h"
diff --git a/src/cmd/compress.cpp b/src/cmd/compress.cpp
index c7ee5841c..8480801e9 100644
--- a/src/cmd/compress.cpp
+++ b/src/cmd/compress.cpp
@@ -1,3 +1,8 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
 
 #include "apps.h"
 
diff --git a/src/cmd/credentials.h b/src/cmd/credentials.h
index 6f7d00155..c67fe22e3 100644
--- a/src/cmd/credentials.h
+++ b/src/cmd/credentials.h
@@ -1,3 +1,8 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
 
 #ifndef EXAMPLE_CREDENTIALS_MANAGER_H__
 #define EXAMPLE_CREDENTIALS_MANAGER_H__
diff --git a/src/cmd/dsa_sign.cpp b/src/cmd/dsa_sign.cpp
index edbf135c3..c052b8a73 100644
--- a/src/cmd/dsa_sign.cpp
+++ b/src/cmd/dsa_sign.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_DSA)
diff --git a/src/cmd/dsa_ver.cpp b/src/cmd/dsa_ver.cpp
index dddf34dbf..1d058df14 100644
--- a/src/cmd/dsa_ver.cpp
+++ b/src/cmd/dsa_ver.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_DSA)
diff --git a/src/cmd/factor.cpp b/src/cmd/factor.cpp
index b95b8ea95..4cba01d95 100644
--- a/src/cmd/factor.cpp
+++ b/src/cmd/factor.cpp
@@ -1,7 +1,7 @@
 /*
 * (C) 2009-2010 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 *
 * Factor integers using a combination of trial division by small
 * primes, and Pollard's Rho algorithm
diff --git a/src/cmd/fpe.cpp b/src/cmd/fpe.cpp
index 088b10e82..fc60fe099 100644
--- a/src/cmd/fpe.cpp
+++ b/src/cmd/fpe.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_FPE_FE1)
diff --git a/src/cmd/getopt.cpp b/src/cmd/getopt.cpp
index 74e6723cb..48d30b2f2 100644
--- a/src/cmd/getopt.cpp
+++ b/src/cmd/getopt.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2009 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "getopt.h"
 #include <iostream>
 
diff --git a/src/cmd/getopt.h b/src/cmd/getopt.h
index 40558aec8..f0ad7c713 100644
--- a/src/cmd/getopt.h
+++ b/src/cmd/getopt.h
@@ -1,7 +1,7 @@
 /*
 * (C) 2009 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_CHECK_GETOPT_H__
diff --git a/src/cmd/hash.cpp b/src/cmd/hash.cpp
index 869eb5797..df332cb23 100644
--- a/src/cmd/hash.cpp
+++ b/src/cmd/hash.cpp
@@ -1,7 +1,7 @@
 /*
 * (C) 2009 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include "apps.h"
diff --git a/src/cmd/is_prime.cpp b/src/cmd/is_prime.cpp
index 8bfa4421a..5a95f0a12 100644
--- a/src/cmd/is_prime.cpp
+++ b/src/cmd/is_prime.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 #include <botan/numthry.h>
 
diff --git a/src/cmd/keygen.cpp b/src/cmd/keygen.cpp
index ae23ce45e..9a9d17322 100644
--- a/src/cmd/keygen.cpp
+++ b/src/cmd/keygen.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 #include <iostream>
 #include <fstream>
diff --git a/src/cmd/main.cpp b/src/cmd/main.cpp
index 42acf99e7..e605c814c 100644
--- a/src/cmd/main.cpp
+++ b/src/cmd/main.cpp
@@ -1,7 +1,7 @@
 /*
 * (C) 2009,2014 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <vector>
diff --git a/src/cmd/ocsp.cpp b/src/cmd/ocsp.cpp
index dba49b600..1106d3fe4 100644
--- a/src/cmd/ocsp.cpp
+++ b/src/cmd/ocsp.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_OCSP)
diff --git a/src/cmd/pkcs10.cpp b/src/cmd/pkcs10.cpp
index 0cdb47878..ff5fa7bf9 100644
--- a/src/cmd/pkcs10.cpp
+++ b/src/cmd/pkcs10.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_X509_CERTIFICATES)
diff --git a/src/cmd/rng.cpp b/src/cmd/rng.cpp
index 0fdec2019..3f48e629f 100644
--- a/src/cmd/rng.cpp
+++ b/src/cmd/rng.cpp
@@ -1,7 +1,7 @@
 /*
 * (C) 2014 Jack Lloyd
 *
-* Distributed under the terms in doc/license.rst
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include "apps.h"
diff --git a/src/cmd/self_sig.cpp b/src/cmd/self_sig.cpp
index 2bef9492d..0a6c59d87 100644
--- a/src/cmd/self_sig.cpp
+++ b/src/cmd/self_sig.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_X509_CERTIFICATES)
diff --git a/src/cmd/speed.cpp b/src/cmd/speed.cpp
index 9c6d8a585..8f19063be 100644
--- a/src/cmd/speed.cpp
+++ b/src/cmd/speed.cpp
@@ -1,7 +1,7 @@
 /*
 * (C) 2009 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include "speed.h"
diff --git a/src/cmd/speed.h b/src/cmd/speed.h
index 97aa0ecc1..5f3918a3f 100644
--- a/src/cmd/speed.h
+++ b/src/cmd/speed.h
@@ -1,3 +1,8 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
 
 #ifndef BOTAN_CHECK_BENCHMARK_H__
 #define BOTAN_CHECK_BENCHMARK_H__
diff --git a/src/cmd/speed_pk.cpp b/src/cmd/speed_pk.cpp
index d978cde9d..313892a23 100644
--- a/src/cmd/speed_pk.cpp
+++ b/src/cmd/speed_pk.cpp
@@ -1,7 +1,7 @@
 /*
 * (C) 2009-2010 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include "speed.h"
diff --git a/src/cmd/timer.cpp b/src/cmd/timer.cpp
index 14eb47524..369e3fd04 100644
--- a/src/cmd/timer.cpp
+++ b/src/cmd/timer.cpp
@@ -1,7 +1,7 @@
 /*
 * (C) 2009 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include "timer.h"
diff --git a/src/cmd/timer.h b/src/cmd/timer.h
index 8e3dc6b26..ac5bd5cef 100644
--- a/src/cmd/timer.h
+++ b/src/cmd/timer.h
@@ -1,3 +1,8 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
 
 #ifndef BOTAN_BENCHMARK_TIMER_H__
 #define BOTAN_BENCHMARK_TIMER_H__
diff --git a/src/cmd/tls_client.cpp b/src/cmd/tls_client.cpp
index 072d674ea..d10c46ba4 100644
--- a/src/cmd/tls_client.cpp
+++ b/src/cmd/tls_client.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_TLS)
diff --git a/src/cmd/tls_server.cpp b/src/cmd/tls_server.cpp
index a892835dc..ae51ff55b 100644
--- a/src/cmd/tls_server.cpp
+++ b/src/cmd/tls_server.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_TLS)
diff --git a/src/cmd/tls_server_asio.cpp b/src/cmd/tls_server_asio.cpp
index 33d743e4f..9d31107bb 100644
--- a/src/cmd/tls_server_asio.cpp
+++ b/src/cmd/tls_server_asio.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 
 #if defined(BOTAN_HAS_TLS)
diff --git a/src/cmd/x509print.cpp b/src/cmd/x509print.cpp
index 006c51de8..4bc46d5b9 100644
--- a/src/cmd/x509print.cpp
+++ b/src/cmd/x509print.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
 #include "apps.h"
 #if defined(BOTAN_HAS_X509_CERTIFICATES)
 #include <botan/x509cert.h>