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.

43 files changed, 47 insertions, 45 deletions

diff --git a/src/lib/utils/asm_x86_32/asm_x86_32.h b/src/lib/utils/asm_x86_32/asm_x86_32.h
index d5482c419..7149b8db5 100644
--- a/src/lib/utils/asm_x86_32/asm_x86_32.h
+++ b/src/lib/utils/asm_x86_32/asm_x86_32.h
@@ -2,7 +2,7 @@
 * Assembly Macros for 32-bit x86
 * (C) 1999-2008 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_ASM_MACROS_X86_32_H__
diff --git a/src/lib/utils/asm_x86_64/asm_x86_64.h b/src/lib/utils/asm_x86_64/asm_x86_64.h
index 7abc1f392..eaf4388de 100644
--- a/src/lib/utils/asm_x86_64/asm_x86_64.h
+++ b/src/lib/utils/asm_x86_64/asm_x86_64.h
@@ -2,7 +2,7 @@
 * Assembly Macros for 64-bit x86
 * (C) 1999-2008 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_ASM_MACROS_X86_64_H__
diff --git a/src/lib/utils/assert.cpp b/src/lib/utils/assert.cpp
index b6d4f4240..978fc12a1 100644
--- a/src/lib/utils/assert.cpp
+++ b/src/lib/utils/assert.cpp
@@ -2,7 +2,7 @@
 * Runtime assertion checking
 * (C) 2010,2012 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/exceptn.h>
diff --git a/src/lib/utils/assert.h b/src/lib/utils/assert.h
index 6117a460d..60b9ba88a 100644
--- a/src/lib/utils/assert.h
+++ b/src/lib/utils/assert.h
@@ -2,7 +2,7 @@
 * Runtime assertion checking
 * (C) 2010 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_ASSERTION_CHECKING_H__
diff --git a/src/lib/utils/bit_ops.h b/src/lib/utils/bit_ops.h
index 75a7584ad..5e8821593 100644
--- a/src/lib/utils/bit_ops.h
+++ b/src/lib/utils/bit_ops.h
@@ -6,7 +6,7 @@
 * (C) 2014 cryptosource GmbH
 * (C) 2014 Falko Strenzke [email protected]
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_BIT_OPS_H__
diff --git a/src/lib/utils/bswap.h b/src/lib/utils/bswap.h
index 9d2c9bc28..54f58a01d 100644
--- a/src/lib/utils/bswap.h
+++ b/src/lib/utils/bswap.h
@@ -3,7 +3,7 @@
 * (C) 1999-2011 Jack Lloyd
 * (C) 2007 Yves Jerschow
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_BYTE_SWAP_H__
diff --git a/src/lib/utils/calendar.cpp b/src/lib/utils/calendar.cpp
index 14f0113f2..3ce5170fc 100644
--- a/src/lib/utils/calendar.cpp
+++ b/src/lib/utils/calendar.cpp
@@ -2,7 +2,7 @@
 * Calendar Functions
 * (C) 1999-2010 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/calendar.h>
diff --git a/src/lib/utils/calendar.h b/src/lib/utils/calendar.h
index d617cc9a0..4efff0edc 100644
--- a/src/lib/utils/calendar.h
+++ b/src/lib/utils/calendar.h
@@ -2,7 +2,7 @@
 * Calendar Functions
 * (C) 1999-2009 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_CALENDAR_H__
diff --git a/src/lib/utils/charset.cpp b/src/lib/utils/charset.cpp
index 7ee637f80..cb106d6e9 100644
--- a/src/lib/utils/charset.cpp
+++ b/src/lib/utils/charset.cpp
@@ -2,7 +2,7 @@
 * Character Set Handling
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/charset.h>
diff --git a/src/lib/utils/charset.h b/src/lib/utils/charset.h
index afb11733b..b708c886a 100644
--- a/src/lib/utils/charset.h
+++ b/src/lib/utils/charset.h
@@ -2,7 +2,7 @@
 * Character Set Handling
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_CHARSET_H__
diff --git a/src/lib/utils/cpuid.cpp b/src/lib/utils/cpuid.cpp
index 18ef4b959..7b7b27f7c 100644
--- a/src/lib/utils/cpuid.cpp
+++ b/src/lib/utils/cpuid.cpp
@@ -2,7 +2,7 @@
 * Runtime CPU detection
 * (C) 2009-2010,2013 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/cpuid.h>
diff --git a/src/lib/utils/cpuid.h b/src/lib/utils/cpuid.h
index 1c4c1df0b..cbbdcad6d 100644
--- a/src/lib/utils/cpuid.h
+++ b/src/lib/utils/cpuid.h
@@ -2,7 +2,7 @@
 * Runtime CPU detection
 * (C) 2009-2010,2013 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_CPUID_H__
diff --git a/src/lib/utils/database.h b/src/lib/utils/database.h
index 742c52c7c..03a3174d6 100644
--- a/src/lib/utils/database.h
+++ b/src/lib/utils/database.h
@@ -2,7 +2,7 @@
 * SQL database interface
 * (C) 2014 Jack Lloyd
 *
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_SQL_DATABASE_H__
diff --git a/src/lib/utils/datastor/datastor.cpp b/src/lib/utils/datastor/datastor.cpp
index 7563e9309..344c03f7c 100644
--- a/src/lib/utils/datastor/datastor.cpp
+++ b/src/lib/utils/datastor/datastor.cpp
@@ -2,7 +2,7 @@
 * Data Store
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/datastor.h>
diff --git a/src/lib/utils/datastor/datastor.h b/src/lib/utils/datastor/datastor.h
index 1c0504fc9..66bb0e650 100644
--- a/src/lib/utils/datastor/datastor.h
+++ b/src/lib/utils/datastor/datastor.h
@@ -2,7 +2,7 @@
 * Data Store
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_DATA_STORE_H__
diff --git a/src/lib/utils/donna128.h b/src/lib/utils/donna128.h
index f2b2d88ea..2cfeb455f 100644
--- a/src/lib/utils/donna128.h
+++ b/src/lib/utils/donna128.h
@@ -2,7 +2,7 @@
 * A minimal 128-bit integer type for curve25519-donna
 * (C) 2014 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_CURVE25519_DONNA128_H__
diff --git a/src/lib/utils/dyn_load/dyn_load.cpp b/src/lib/utils/dyn_load/dyn_load.cpp
index 51afb1afe..723d2502e 100644
--- a/src/lib/utils/dyn_load/dyn_load.cpp
+++ b/src/lib/utils/dyn_load/dyn_load.cpp
@@ -2,7 +2,7 @@
 * Dynamically Loaded Object
 * (C) 2010 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/internal/dyn_load.h>
diff --git a/src/lib/utils/dyn_load/dyn_load.h b/src/lib/utils/dyn_load/dyn_load.h
index 9edaed202..32227f76f 100644
--- a/src/lib/utils/dyn_load/dyn_load.h
+++ b/src/lib/utils/dyn_load/dyn_load.h
@@ -2,7 +2,7 @@
 * Dynamically Loaded Object
 * (C) 2010 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_DYNAMIC_LOADER_H__
diff --git a/src/lib/utils/exceptn.h b/src/lib/utils/exceptn.h
index c480ffd48..e7231f84d 100644
--- a/src/lib/utils/exceptn.h
+++ b/src/lib/utils/exceptn.h
@@ -2,7 +2,7 @@
 * Exceptions
 * (C) 1999-2009 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_EXCEPTION_H__
diff --git a/src/lib/utils/get_byte.h b/src/lib/utils/get_byte.h
index 6f8ef2632..0846befbd 100644
--- a/src/lib/utils/get_byte.h
+++ b/src/lib/utils/get_byte.h
@@ -2,7 +2,7 @@
 * Read out bytes
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_GET_BYTE_H__
diff --git a/src/lib/utils/http_util/http_util.cpp b/src/lib/utils/http_util/http_util.cpp
index 10f2770e6..913d4fd19 100644
--- a/src/lib/utils/http_util/http_util.cpp
+++ b/src/lib/utils/http_util/http_util.cpp
@@ -2,7 +2,7 @@
 * Sketchy HTTP client
 * (C) 2013 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/http_util.h>
diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h
index 56cf0687b..2acb6c6e4 100644
--- a/src/lib/utils/http_util/http_util.h
+++ b/src/lib/utils/http_util/http_util.h
@@ -2,7 +2,7 @@
 * HTTP utilities
 * (C) 2013 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_UTILS_URLGET_H__
diff --git a/src/lib/utils/loadstor.h b/src/lib/utils/loadstor.h
index a162a3e25..771bbd533 100644
--- a/src/lib/utils/loadstor.h
+++ b/src/lib/utils/loadstor.h
@@ -3,7 +3,7 @@
 * (C) 1999-2007 Jack Lloyd
 *     2007 Yves Jerschow
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_LOAD_STORE_H__
diff --git a/src/lib/utils/mem_ops.h b/src/lib/utils/mem_ops.h
index 05b2c22a5..f9e39fa31 100644
--- a/src/lib/utils/mem_ops.h
+++ b/src/lib/utils/mem_ops.h
@@ -2,7 +2,7 @@
 * Memory Operations
 * (C) 1999-2009,2012 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_MEMORY_OPS_H__
diff --git a/src/lib/utils/mul128.h b/src/lib/utils/mul128.h
index 6725021ba..3ad7dbcdb 100644
--- a/src/lib/utils/mul128.h
+++ b/src/lib/utils/mul128.h
@@ -2,7 +2,7 @@
 * 64x64->128 bit multiply operation
 * (C) 2013 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_UTIL_MUL128_H__
diff --git a/src/lib/utils/parsing.cpp b/src/lib/utils/parsing.cpp
index c5081dcd7..ff8d5f0fb 100644
--- a/src/lib/utils/parsing.cpp
+++ b/src/lib/utils/parsing.cpp
@@ -2,7 +2,7 @@
 * Various string utils and parsing functions
 * (C) 1999-2007,2013,2014 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/parsing.h>
diff --git a/src/lib/utils/parsing.h b/src/lib/utils/parsing.h
index f2642ff95..8e7a3a22a 100644
--- a/src/lib/utils/parsing.h
+++ b/src/lib/utils/parsing.h
@@ -2,7 +2,7 @@
 * Various string utils and parsing functions
 * (C) 1999-2007,2013 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_PARSER_H__
diff --git a/src/lib/utils/prefetch.h b/src/lib/utils/prefetch.h
index 66024e5ce..22514b797 100644
--- a/src/lib/utils/prefetch.h
+++ b/src/lib/utils/prefetch.h
@@ -2,7 +2,7 @@
 * Prefetching Operations
 * (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_PREFETCH_H__
diff --git a/src/lib/utils/read_cfg.cpp b/src/lib/utils/read_cfg.cpp
index 31348832a..8f186cefd 100644
--- a/src/lib/utils/read_cfg.cpp
+++ b/src/lib/utils/read_cfg.cpp
@@ -2,7 +2,7 @@
 * Simple config/test file reader
 * (C) 2013,2014 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/parsing.h>
diff --git a/src/lib/utils/rotate.h b/src/lib/utils/rotate.h
index 2593010b4..9313a2d18 100644
--- a/src/lib/utils/rotate.h
+++ b/src/lib/utils/rotate.h
@@ -2,7 +2,7 @@
 * Word Rotation Operations
 * (C) 1999-2008 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_WORD_ROTATE_H__
diff --git a/src/lib/utils/rounding.h b/src/lib/utils/rounding.h
index 4ddd7a432..02edb1929 100644
--- a/src/lib/utils/rounding.h
+++ b/src/lib/utils/rounding.h
@@ -2,7 +2,7 @@
 * Integer Rounding Functions
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_ROUNDING_H__
diff --git a/src/lib/utils/semaphore.cpp b/src/lib/utils/semaphore.cpp
index f4f5b2b53..f30c43661 100644
--- a/src/lib/utils/semaphore.cpp
+++ b/src/lib/utils/semaphore.cpp
@@ -1,12 +1,14 @@
 /*
 * Semaphore
-* by Pierre Gaston (http://p9as.blogspot.com/2012/06/c11-semaphores.html)
-* modified by Joel Low for Botan
+* (C) 2013 Joel Low
 *
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/internal/semaphore.h>
 
+// Based on code by Pierre Gaston (http://p9as.blogspot.com/2012/06/c11-semaphores.html)
+
 namespace Botan {
 
 void Semaphore::release(size_t n)
diff --git a/src/lib/utils/semaphore.h b/src/lib/utils/semaphore.h
index c3ce73680..3495043e5 100644
--- a/src/lib/utils/semaphore.h
+++ b/src/lib/utils/semaphore.h
@@ -1,8 +1,8 @@
 /*
 * Semaphore
-* by Pierre Gaston (http://p9as.blogspot.com/2012/06/c11-semaphores.html)
-* modified by Joel Low for Botan
+* (C) 2013 Joel Low
 *
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_SEMAPHORE_H__
diff --git a/src/lib/utils/sqlite3/sqlite3.cpp b/src/lib/utils/sqlite3/sqlite3.cpp
index 0ed8df83c..61c7f15bc 100644
--- a/src/lib/utils/sqlite3/sqlite3.cpp
+++ b/src/lib/utils/sqlite3/sqlite3.cpp
@@ -2,7 +2,7 @@
 * SQLite wrapper
 * (C) 2012 Jack Lloyd
 *
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/sqlite3.h>
diff --git a/src/lib/utils/sqlite3/sqlite3.h b/src/lib/utils/sqlite3/sqlite3.h
index 7853a012f..6c78deb42 100644
--- a/src/lib/utils/sqlite3/sqlite3.h
+++ b/src/lib/utils/sqlite3/sqlite3.h
@@ -2,7 +2,7 @@
 * SQLite3 wrapper
 * (C) 2012,2014 Jack Lloyd
 *
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_UTILS_SQLITE3_H__
diff --git a/src/lib/utils/stl_util.h b/src/lib/utils/stl_util.h
index 0710d61a5..06f09498e 100644
--- a/src/lib/utils/stl_util.h
+++ b/src/lib/utils/stl_util.h
@@ -2,7 +2,7 @@
 * STL Utility Functions
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_STL_UTIL_H__
diff --git a/src/lib/utils/ta_utils.cpp b/src/lib/utils/ta_utils.cpp
index 9a2c0df49..8aee726ec 100644
--- a/src/lib/utils/ta_utils.cpp
+++ b/src/lib/utils/ta_utils.cpp
@@ -2,7 +2,7 @@
 * Timing Attack Countermeasure Functions
 * (C) 2010 Falko Strenzke, Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/internal/ta_utils.h>
diff --git a/src/lib/utils/ta_utils.h b/src/lib/utils/ta_utils.h
index 866a4cc37..9353214b2 100644
--- a/src/lib/utils/ta_utils.h
+++ b/src/lib/utils/ta_utils.h
@@ -2,7 +2,7 @@
 * Timing Attack Countermeasure Functions
 * (C) 2010 Falko Strenzke, Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_TIMING_ATTACK_CM_H__
diff --git a/src/lib/utils/types.h b/src/lib/utils/types.h
index 13bb4b604..c12cc72dc 100644
--- a/src/lib/utils/types.h
+++ b/src/lib/utils/types.h
@@ -2,7 +2,7 @@
 * Low Level Types
 * (C) 1999-2007 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_TYPES_H__
diff --git a/src/lib/utils/version.cpp b/src/lib/utils/version.cpp
index 32679cf63..d13d091ca 100644
--- a/src/lib/utils/version.cpp
+++ b/src/lib/utils/version.cpp
@@ -2,7 +2,7 @@
 * Version Information
 * (C) 1999-2013 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/version.h>
diff --git a/src/lib/utils/version.h b/src/lib/utils/version.h
index 219c261a5..c2f070433 100644
--- a/src/lib/utils/version.h
+++ b/src/lib/utils/version.h
@@ -2,7 +2,7 @@
 * Version Information
 * (C) 1999-2011 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_VERSION_H__
diff --git a/src/lib/utils/xor_buf.h b/src/lib/utils/xor_buf.h
index 20ca211c2..967348d4c 100644
--- a/src/lib/utils/xor_buf.h
+++ b/src/lib/utils/xor_buf.h
@@ -2,7 +2,7 @@
 * XOR operations
 * (C) 1999-2008 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #ifndef BOTAN_XOR_BUF_H__
diff --git a/src/lib/utils/zero_mem.cpp b/src/lib/utils/zero_mem.cpp
index 833b54aca..d8c438435 100644
--- a/src/lib/utils/zero_mem.cpp
+++ b/src/lib/utils/zero_mem.cpp
@@ -2,7 +2,7 @@
 * Zero Memory
 * (C) 2012 Jack Lloyd
 *
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
 */
 
 #include <botan/mem_ops.h>