aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rwxr-xr-xconfigure.py4
-rw-r--r--src/cmd/apps.h5
-rw-r--r--src/cmd/asn1.cpp6
-rw-r--r--src/cmd/base64.cpp2
-rw-r--r--src/cmd/bcrypt.cpp6
-rw-r--r--src/cmd/ca.cpp6
-rw-r--r--src/cmd/cert_verify.cpp2
-rw-r--r--src/cmd/compress.cpp5
-rw-r--r--src/cmd/credentials.h5
-rw-r--r--src/cmd/dsa_sign.cpp6
-rw-r--r--src/cmd/dsa_ver.cpp6
-rw-r--r--src/cmd/factor.cpp2
-rw-r--r--src/cmd/fpe.cpp6
-rw-r--r--src/cmd/getopt.cpp6
-rw-r--r--src/cmd/getopt.h2
-rw-r--r--src/cmd/hash.cpp2
-rw-r--r--src/cmd/is_prime.cpp6
-rw-r--r--src/cmd/keygen.cpp6
-rw-r--r--src/cmd/main.cpp2
-rw-r--r--src/cmd/ocsp.cpp6
-rw-r--r--src/cmd/pkcs10.cpp6
-rw-r--r--src/cmd/rng.cpp2
-rw-r--r--src/cmd/self_sig.cpp6
-rw-r--r--src/cmd/speed.cpp2
-rw-r--r--src/cmd/speed.h5
-rw-r--r--src/cmd/speed_pk.cpp2
-rw-r--r--src/cmd/timer.cpp2
-rw-r--r--src/cmd/timer.h5
-rw-r--r--src/cmd/tls_client.cpp6
-rw-r--r--src/cmd/tls_server.cpp6
-rw-r--r--src/cmd/tls_server_asio.cpp6
-rw-r--r--src/cmd/x509print.cpp6
-rw-r--r--src/contrib/sqlite/codec.cpp2
-rw-r--r--src/contrib/sqlite/codec.h2
-rw-r--r--src/contrib/sqlite/codec_c_interface.h2
-rw-r--r--src/contrib/sqlite/codecext.c2
-rw-r--r--src/contrib/sqlite/test_sqlite.cpp2
-rw-r--r--src/lib/algo_base/buf_comp.h2
-rw-r--r--src/lib/algo_base/key_spec.h2
-rw-r--r--src/lib/algo_base/scan_name.cpp2
-rw-r--r--src/lib/algo_base/scan_name.h2
-rw-r--r--src/lib/algo_base/sym_algo.h2
-rw-r--r--src/lib/algo_base/symkey.cpp2
-rw-r--r--src/lib/algo_base/symkey.h2
-rw-r--r--src/lib/algo_base/transform.h2
-rw-r--r--src/lib/algo_factory/algo_cache.h2
-rw-r--r--src/lib/algo_factory/algo_factory.cpp2
-rw-r--r--src/lib/algo_factory/algo_factory.h2
-rw-r--r--src/lib/algo_factory/prov_weight.cpp2
-rw-r--r--src/lib/alloc/locking_allocator/locking_allocator.cpp2
-rw-r--r--src/lib/alloc/locking_allocator/locking_allocator.h2
-rw-r--r--src/lib/alloc/secmem.h2
-rw-r--r--src/lib/asn1/alg_id.cpp2
-rw-r--r--src/lib/asn1/alg_id.h2
-rw-r--r--src/lib/asn1/asn1_alt_name.cpp2
-rw-r--r--src/lib/asn1/asn1_alt_name.h2
-rw-r--r--src/lib/asn1/asn1_attribute.cpp2
-rw-r--r--src/lib/asn1/asn1_attribute.h2
-rw-r--r--src/lib/asn1/asn1_obj.cpp2
-rw-r--r--src/lib/asn1/asn1_obj.h2
-rw-r--r--src/lib/asn1/asn1_oid.cpp2
-rw-r--r--src/lib/asn1/asn1_oid.h2
-rw-r--r--src/lib/asn1/asn1_str.cpp2
-rw-r--r--src/lib/asn1/asn1_str.h2
-rw-r--r--src/lib/asn1/asn1_time.cpp2
-rw-r--r--src/lib/asn1/asn1_time.h2
-rw-r--r--src/lib/asn1/ber_dec.cpp2
-rw-r--r--src/lib/asn1/ber_dec.h2
-rw-r--r--src/lib/asn1/der_enc.cpp2
-rw-r--r--src/lib/asn1/der_enc.h2
-rw-r--r--src/lib/asn1/oid_lookup/default.cpp2
-rw-r--r--src/lib/asn1/oid_lookup/oids.cpp2
-rw-r--r--src/lib/asn1/oid_lookup/oids.h2
-rw-r--r--src/lib/asn1/x509_dn.cpp2
-rw-r--r--src/lib/asn1/x509_dn.h2
-rw-r--r--src/lib/benchmark/benchmark.cpp2
-rw-r--r--src/lib/benchmark/benchmark.h2
-rw-r--r--src/lib/block/aes/aes.cpp2
-rw-r--r--src/lib/block/aes/aes.h2
-rw-r--r--src/lib/block/aes_ni/aes_ni.cpp2
-rw-r--r--src/lib/block/aes_ni/aes_ni.h2
-rw-r--r--src/lib/block/aes_ssse3/aes_ssse3.cpp2
-rw-r--r--src/lib/block/aes_ssse3/aes_ssse3.h2
-rw-r--r--src/lib/block/block_cipher.h2
-rw-r--r--src/lib/block/blowfish/blfs_tab.cpp2
-rw-r--r--src/lib/block/blowfish/blowfish.cpp2
-rw-r--r--src/lib/block/blowfish/blowfish.h2
-rw-r--r--src/lib/block/camellia/camellia.cpp2
-rw-r--r--src/lib/block/camellia/camellia.h2
-rw-r--r--src/lib/block/camellia/camellia_sbox.h2
-rw-r--r--src/lib/block/cascade/cascade.cpp2
-rw-r--r--src/lib/block/cascade/cascade.h2
-rw-r--r--src/lib/block/cast/cast128.cpp2
-rw-r--r--src/lib/block/cast/cast128.h2
-rw-r--r--src/lib/block/cast/cast256.cpp2
-rw-r--r--src/lib/block/cast/cast256.h2
-rw-r--r--src/lib/block/cast/cast_sboxes.h2
-rw-r--r--src/lib/block/des/des.cpp2
-rw-r--r--src/lib/block/des/des.h2
-rw-r--r--src/lib/block/des/des_tab.cpp2
-rw-r--r--src/lib/block/des/desx.cpp2
-rw-r--r--src/lib/block/des/desx.h2
-rw-r--r--src/lib/block/gost_28147/gost_28147.cpp2
-rw-r--r--src/lib/block/gost_28147/gost_28147.h2
-rw-r--r--src/lib/block/idea/idea.cpp2
-rw-r--r--src/lib/block/idea/idea.h2
-rw-r--r--src/lib/block/idea_sse2/idea_sse2.cpp2
-rw-r--r--src/lib/block/idea_sse2/idea_sse2.h2
-rw-r--r--src/lib/block/kasumi/kasumi.cpp2
-rw-r--r--src/lib/block/kasumi/kasumi.h2
-rw-r--r--src/lib/block/lion/lion.cpp2
-rw-r--r--src/lib/block/lion/lion.h2
-rw-r--r--src/lib/block/mars/mars.cpp2
-rw-r--r--src/lib/block/mars/mars.h2
-rw-r--r--src/lib/block/misty1/misty1.cpp2
-rw-r--r--src/lib/block/misty1/misty1.h2
-rw-r--r--src/lib/block/noekeon/noekeon.cpp2
-rw-r--r--src/lib/block/noekeon/noekeon.h2
-rw-r--r--src/lib/block/noekeon_simd/noekeon_simd.cpp2
-rw-r--r--src/lib/block/noekeon_simd/noekeon_simd.h2
-rw-r--r--src/lib/block/rc2/rc2.cpp2
-rw-r--r--src/lib/block/rc2/rc2.h2
-rw-r--r--src/lib/block/rc5/rc5.cpp2
-rw-r--r--src/lib/block/rc5/rc5.h2
-rw-r--r--src/lib/block/rc6/rc6.cpp2
-rw-r--r--src/lib/block/rc6/rc6.h2
-rw-r--r--src/lib/block/safer/safer_sk.cpp2
-rw-r--r--src/lib/block/safer/safer_sk.h2
-rw-r--r--src/lib/block/seed/seed.cpp2
-rw-r--r--src/lib/block/seed/seed.h2
-rw-r--r--src/lib/block/seed/seed_tab.cpp2
-rw-r--r--src/lib/block/serpent/serpent.cpp2
-rw-r--r--src/lib/block/serpent/serpent.h2
-rw-r--r--src/lib/block/serpent/serpent_sbox.h2
-rw-r--r--src/lib/block/serpent_simd/serp_simd.cpp2
-rw-r--r--src/lib/block/serpent_simd/serp_simd.h2
-rw-r--r--src/lib/block/serpent_x86_32/serp_x86_32.cpp2
-rw-r--r--src/lib/block/serpent_x86_32/serp_x86_32.h2
-rw-r--r--src/lib/block/serpent_x86_32/serp_x86_32_imp.S2
-rw-r--r--src/lib/block/tea/tea.cpp2
-rw-r--r--src/lib/block/tea/tea.h2
-rw-r--r--src/lib/block/threefish/threefish.cpp2
-rw-r--r--src/lib/block/threefish/threefish.h2
-rw-r--r--src/lib/block/threefish_avx2/threefish_avx2.cpp2
-rw-r--r--src/lib/block/threefish_avx2/threefish_avx2.h2
-rw-r--r--src/lib/block/twofish/two_tab.cpp2
-rw-r--r--src/lib/block/twofish/twofish.cpp2
-rw-r--r--src/lib/block/twofish/twofish.h2
-rw-r--r--src/lib/block/xtea/xtea.cpp2
-rw-r--r--src/lib/block/xtea/xtea.h2
-rw-r--r--src/lib/block/xtea_simd/xtea_simd.cpp2
-rw-r--r--src/lib/block/xtea_simd/xtea_simd.h2
-rw-r--r--src/lib/cert/cvc/asn1_eac_str.cpp2
-rw-r--r--src/lib/cert/cvc/asn1_eac_tm.cpp2
-rw-r--r--src/lib/cert/cvc/cvc_ado.cpp2
-rw-r--r--src/lib/cert/cvc/cvc_ado.h2
-rw-r--r--src/lib/cert/cvc/cvc_cert.cpp6
-rw-r--r--src/lib/cert/cvc/cvc_cert.h2
-rw-r--r--src/lib/cert/cvc/cvc_gen_cert.h2
-rw-r--r--src/lib/cert/cvc/cvc_req.cpp6
-rw-r--r--src/lib/cert/cvc/cvc_req.h2
-rw-r--r--src/lib/cert/cvc/cvc_self.cpp6
-rw-r--r--src/lib/cert/cvc/cvc_self.h2
-rw-r--r--src/lib/cert/cvc/eac_asn_obj.h2
-rw-r--r--src/lib/cert/cvc/eac_obj.h2
-rw-r--r--src/lib/cert/cvc/ecdsa_sig.cpp2
-rw-r--r--src/lib/cert/cvc/ecdsa_sig.h2
-rw-r--r--src/lib/cert/cvc/signed_obj.cpp2
-rw-r--r--src/lib/cert/cvc/signed_obj.h2
-rw-r--r--src/lib/cert/x509/cert_status.h2
-rw-r--r--src/lib/cert/x509/certstor.cpp2
-rw-r--r--src/lib/cert/x509/certstor.h2
-rw-r--r--src/lib/cert/x509/crl_ent.cpp2
-rw-r--r--src/lib/cert/x509/crl_ent.h2
-rw-r--r--src/lib/cert/x509/key_constraint.cpp2
-rw-r--r--src/lib/cert/x509/key_constraint.h2
-rw-r--r--src/lib/cert/x509/ocsp.cpp2
-rw-r--r--src/lib/cert/x509/ocsp.h2
-rw-r--r--src/lib/cert/x509/ocsp_types.cpp2
-rw-r--r--src/lib/cert/x509/ocsp_types.h2
-rw-r--r--src/lib/cert/x509/pkcs10.cpp2
-rw-r--r--src/lib/cert/x509/pkcs10.h2
-rw-r--r--src/lib/cert/x509/x509_ca.cpp2
-rw-r--r--src/lib/cert/x509/x509_ca.h2
-rw-r--r--src/lib/cert/x509/x509_crl.cpp2
-rw-r--r--src/lib/cert/x509/x509_crl.h2
-rw-r--r--src/lib/cert/x509/x509_ext.cpp2
-rw-r--r--src/lib/cert/x509/x509_ext.h2
-rw-r--r--src/lib/cert/x509/x509_obj.cpp2
-rw-r--r--src/lib/cert/x509/x509_obj.h2
-rw-r--r--src/lib/cert/x509/x509cert.cpp2
-rw-r--r--src/lib/cert/x509/x509cert.h2
-rw-r--r--src/lib/cert/x509/x509opt.cpp2
-rw-r--r--src/lib/cert/x509/x509path.cpp2
-rw-r--r--src/lib/cert/x509/x509path.h2
-rw-r--r--src/lib/cert/x509/x509self.cpp2
-rw-r--r--src/lib/cert/x509/x509self.h2
-rw-r--r--src/lib/checksum/adler32/adler32.cpp2
-rw-r--r--src/lib/checksum/adler32/adler32.h2
-rw-r--r--src/lib/checksum/crc24/crc24.cpp2
-rw-r--r--src/lib/checksum/crc24/crc24.h2
-rw-r--r--src/lib/checksum/crc32/crc32.cpp2
-rw-r--r--src/lib/checksum/crc32/crc32.h2
-rw-r--r--src/lib/codec/base64/base64.cpp2
-rw-r--r--src/lib/codec/base64/base64.h2
-rw-r--r--src/lib/codec/hex/hex.cpp2
-rw-r--r--src/lib/codec/hex/hex.h2
-rw-r--r--src/lib/codec/openpgp/openpgp.cpp2
-rw-r--r--src/lib/codec/openpgp/openpgp.h2
-rw-r--r--src/lib/codec/pem/pem.cpp2
-rw-r--r--src/lib/codec/pem/pem.h2
-rw-r--r--src/lib/compression/bzip2/bzip2.cpp2
-rw-r--r--src/lib/compression/bzip2/bzip2.h2
-rw-r--r--src/lib/compression/comp_util.cpp2
-rw-r--r--src/lib/compression/comp_util.h2
-rw-r--r--src/lib/compression/compression.cpp2
-rw-r--r--src/lib/compression/compression.h2
-rw-r--r--src/lib/compression/lzma/lzma.cpp2
-rw-r--r--src/lib/compression/lzma/lzma.h2
-rw-r--r--src/lib/compression/zlib/zlib.cpp2
-rw-r--r--src/lib/compression/zlib/zlib.h2
-rw-r--r--src/lib/constructs/aont/package.cpp2
-rw-r--r--src/lib/constructs/aont/package.h2
-rw-r--r--src/lib/constructs/cryptobox/cryptobox.cpp2
-rw-r--r--src/lib/constructs/cryptobox/cryptobox.h2
-rw-r--r--src/lib/constructs/fpe_fe1/fpe_fe1.cpp2
-rw-r--r--src/lib/constructs/fpe_fe1/fpe_fe1.h2
-rw-r--r--src/lib/constructs/pbes2/pbes2.cpp2
-rw-r--r--src/lib/constructs/pbes2/pbes2.h2
-rw-r--r--src/lib/constructs/rfc3394/rfc3394.cpp2
-rw-r--r--src/lib/constructs/rfc3394/rfc3394.h2
-rw-r--r--src/lib/constructs/srp6/srp6.cpp2
-rw-r--r--src/lib/constructs/srp6/srp6.h2
-rw-r--r--src/lib/constructs/srp6/srp6_files.cpp2
-rw-r--r--src/lib/constructs/srp6/srp6_files.h2
-rw-r--r--src/lib/constructs/tss/tss.cpp2
-rw-r--r--src/lib/constructs/tss/tss.h2
-rw-r--r--src/lib/credentials/credentials_manager.cpp2
-rw-r--r--src/lib/credentials/credentials_manager.h2
-rw-r--r--src/lib/engine/aes_isa_eng/aes_isa_engine.cpp2
-rw-r--r--src/lib/engine/aes_isa_eng/aes_isa_engine.h2
-rw-r--r--src/lib/engine/asm_engine/asm_engine.cpp2
-rw-r--r--src/lib/engine/asm_engine/asm_engine.h2
-rw-r--r--src/lib/engine/core_engine/core_engine.h2
-rw-r--r--src/lib/engine/core_engine/core_modes.cpp2
-rw-r--r--src/lib/engine/core_engine/def_pk_ops.cpp2
-rw-r--r--src/lib/engine/core_engine/def_powm.cpp2
-rw-r--r--src/lib/engine/core_engine/lookup_block.cpp2
-rw-r--r--src/lib/engine/core_engine/lookup_hash.cpp2
-rw-r--r--src/lib/engine/core_engine/lookup_mac.cpp2
-rw-r--r--src/lib/engine/core_engine/lookup_pbkdf.cpp2
-rw-r--r--src/lib/engine/core_engine/lookup_stream.cpp2
-rw-r--r--src/lib/engine/dyn_engine/dyn_engine.cpp2
-rw-r--r--src/lib/engine/dyn_engine/dyn_engine.h2
-rw-r--r--src/lib/engine/engine.cpp2
-rw-r--r--src/lib/engine/engine.h2
-rw-r--r--src/lib/engine/openssl/openssl_engine.h2
-rw-r--r--src/lib/engine/openssl/ossl_arc4.cpp2
-rw-r--r--src/lib/engine/openssl/ossl_bc.cpp2
-rw-r--r--src/lib/engine/openssl/ossl_md.cpp2
-rw-r--r--src/lib/engine/simd_engine/simd_engine.cpp2
-rw-r--r--src/lib/engine/simd_engine/simd_engine.h2
-rw-r--r--src/lib/entropy/beos_stats/es_beos.cpp2
-rw-r--r--src/lib/entropy/beos_stats/es_beos.h2
-rw-r--r--src/lib/entropy/cryptoapi_rng/es_capi.cpp2
-rw-r--r--src/lib/entropy/cryptoapi_rng/es_capi.h2
-rw-r--r--src/lib/entropy/dev_random/dev_random.cpp2
-rw-r--r--src/lib/entropy/dev_random/dev_random.h2
-rw-r--r--src/lib/entropy/egd/es_egd.cpp2
-rw-r--r--src/lib/entropy/egd/es_egd.h2
-rw-r--r--src/lib/entropy/entropy_src.h2
-rw-r--r--src/lib/entropy/hres_timer/hres_timer.cpp2
-rw-r--r--src/lib/entropy/hres_timer/hres_timer.h2
-rw-r--r--src/lib/entropy/proc_walk/proc_walk.cpp2
-rw-r--r--src/lib/entropy/proc_walk/proc_walk.h2
-rw-r--r--src/lib/entropy/rdrand/rdrand.cpp2
-rw-r--r--src/lib/entropy/rdrand/rdrand.h2
-rw-r--r--src/lib/entropy/unix_procs/unix_proc_sources.cpp2
-rw-r--r--src/lib/entropy/unix_procs/unix_procs.cpp2
-rw-r--r--src/lib/entropy/unix_procs/unix_procs.h2
-rw-r--r--src/lib/entropy/win32_stats/es_win32.cpp2
-rw-r--r--src/lib/entropy/win32_stats/es_win32.h2
-rw-r--r--src/lib/filters/aead_filt/aead_filt.h2
-rw-r--r--src/lib/filters/algo_filt.cpp2
-rw-r--r--src/lib/filters/basefilt.cpp2
-rw-r--r--src/lib/filters/basefilt.h2
-rw-r--r--src/lib/filters/buf_filt.cpp2
-rw-r--r--src/lib/filters/buf_filt.h2
-rw-r--r--src/lib/filters/codec_filt/b64_filt.cpp2
-rw-r--r--src/lib/filters/codec_filt/b64_filt.h2
-rw-r--r--src/lib/filters/codec_filt/hex_filt.cpp2
-rw-r--r--src/lib/filters/codec_filt/hex_filt.h2
-rw-r--r--src/lib/filters/comp_filter.cpp2
-rw-r--r--src/lib/filters/comp_filter.h2
-rw-r--r--src/lib/filters/data_snk.cpp2
-rw-r--r--src/lib/filters/data_snk.h2
-rw-r--r--src/lib/filters/data_src.cpp2
-rw-r--r--src/lib/filters/data_src.h2
-rw-r--r--src/lib/filters/fd_unix/fd_unix.cpp2
-rw-r--r--src/lib/filters/fd_unix/fd_unix.h2
-rw-r--r--src/lib/filters/filter.cpp2
-rw-r--r--src/lib/filters/filter.h2
-rw-r--r--src/lib/filters/filters.h2
-rw-r--r--src/lib/filters/key_filt.h2
-rw-r--r--src/lib/filters/out_buf.cpp2
-rw-r--r--src/lib/filters/out_buf.h2
-rw-r--r--src/lib/filters/pipe.cpp2
-rw-r--r--src/lib/filters/pipe.h2
-rw-r--r--src/lib/filters/pipe_io.cpp2
-rw-r--r--src/lib/filters/pipe_rw.cpp2
-rw-r--r--src/lib/filters/secqueue.cpp2
-rw-r--r--src/lib/filters/secqueue.h2
-rw-r--r--src/lib/filters/threaded_fork.cpp2
-rw-r--r--src/lib/filters/transform_filter.cpp2
-rw-r--r--src/lib/filters/transform_filter.h2
-rw-r--r--src/lib/hash/comb4p/comb4p.cpp2
-rw-r--r--src/lib/hash/comb4p/comb4p.h2
-rw-r--r--src/lib/hash/gost_3411/gost_3411.cpp2
-rw-r--r--src/lib/hash/gost_3411/gost_3411.h2
-rw-r--r--src/lib/hash/has160/has160.cpp2
-rw-r--r--src/lib/hash/has160/has160.h2
-rw-r--r--src/lib/hash/hash.h2
-rw-r--r--src/lib/hash/keccak/keccak.cpp2
-rw-r--r--src/lib/hash/keccak/keccak.h2
-rw-r--r--src/lib/hash/md2/md2.cpp2
-rw-r--r--src/lib/hash/md2/md2.h2
-rw-r--r--src/lib/hash/md4/md4.cpp2
-rw-r--r--src/lib/hash/md4/md4.h2
-rw-r--r--src/lib/hash/md4_x86_32/md4_x86_32.cpp2
-rw-r--r--src/lib/hash/md4_x86_32/md4_x86_32.h2
-rw-r--r--src/lib/hash/md4_x86_32/md4_x86_32_imp.S2
-rw-r--r--src/lib/hash/md5/md5.cpp2
-rw-r--r--src/lib/hash/md5/md5.h2
-rw-r--r--src/lib/hash/md5_x86_32/md5_x86_32.cpp2
-rw-r--r--src/lib/hash/md5_x86_32/md5_x86_32.h2
-rw-r--r--src/lib/hash/md5_x86_32/md5_x86_32_imp.S2
-rw-r--r--src/lib/hash/mdx_hash/mdx_hash.cpp2
-rw-r--r--src/lib/hash/mdx_hash/mdx_hash.h2
-rw-r--r--src/lib/hash/par_hash/par_hash.cpp2
-rw-r--r--src/lib/hash/par_hash/par_hash.h2
-rw-r--r--src/lib/hash/rmd128/rmd128.cpp2
-rw-r--r--src/lib/hash/rmd128/rmd128.h2
-rw-r--r--src/lib/hash/rmd160/rmd160.cpp2
-rw-r--r--src/lib/hash/rmd160/rmd160.h2
-rw-r--r--src/lib/hash/sha1/sha160.cpp2
-rw-r--r--src/lib/hash/sha1/sha160.h2
-rw-r--r--src/lib/hash/sha1_sse2/sha1_sse2.cpp2
-rw-r--r--src/lib/hash/sha1_sse2/sha1_sse2.h2
-rw-r--r--src/lib/hash/sha1_x86_32/sha1_x86_32.cpp2
-rw-r--r--src/lib/hash/sha1_x86_32/sha1_x86_32.h2
-rw-r--r--src/lib/hash/sha1_x86_32/sha1_x86_32_imp.S2
-rw-r--r--src/lib/hash/sha1_x86_64/sha1_x86_64.cpp2
-rw-r--r--src/lib/hash/sha1_x86_64/sha1_x86_64.h2
-rw-r--r--src/lib/hash/sha1_x86_64/sha1_x86_64_imp.S2
-rw-r--r--src/lib/hash/sha2_32/sha2_32.cpp2
-rw-r--r--src/lib/hash/sha2_32/sha2_32.h2
-rw-r--r--src/lib/hash/sha2_64/sha2_64.cpp2
-rw-r--r--src/lib/hash/sha2_64/sha2_64.h2
-rw-r--r--src/lib/hash/skein/skein_512.cpp2
-rw-r--r--src/lib/hash/skein/skein_512.h2
-rw-r--r--src/lib/hash/tiger/tig_tab.cpp2
-rw-r--r--src/lib/hash/tiger/tiger.cpp2
-rw-r--r--src/lib/hash/tiger/tiger.h2
-rw-r--r--src/lib/hash/whirlpool/whirlpool.cpp2
-rw-r--r--src/lib/hash/whirlpool/whrl_tab.cpp2
-rw-r--r--src/lib/hash/whirlpool/whrlpool.h2
-rw-r--r--src/lib/kdf/kdf.cpp2
-rw-r--r--src/lib/kdf/kdf.h2
-rw-r--r--src/lib/kdf/kdf1/kdf1.cpp2
-rw-r--r--src/lib/kdf/kdf1/kdf1.h2
-rw-r--r--src/lib/kdf/kdf2/kdf2.cpp2
-rw-r--r--src/lib/kdf/kdf2/kdf2.h2
-rw-r--r--src/lib/kdf/prf_ssl3/prf_ssl3.cpp2
-rw-r--r--src/lib/kdf/prf_ssl3/prf_ssl3.h2
-rw-r--r--src/lib/kdf/prf_tls/prf_tls.cpp2
-rw-r--r--src/lib/kdf/prf_tls/prf_tls.h2
-rw-r--r--src/lib/kdf/prf_x942/prf_x942.cpp2
-rw-r--r--src/lib/kdf/prf_x942/prf_x942.h2
-rw-r--r--src/lib/libstate/botan.h2
-rw-r--r--src/lib/libstate/entropy_srcs.cpp2
-rw-r--r--src/lib/libstate/global_state.cpp2
-rw-r--r--src/lib/libstate/global_state.h2
-rw-r--r--src/lib/libstate/init.cpp2
-rw-r--r--src/lib/libstate/init.h2
-rw-r--r--src/lib/libstate/libstate.cpp2
-rw-r--r--src/lib/libstate/libstate.h2
-rw-r--r--src/lib/libstate/lookup.cpp2
-rw-r--r--src/lib/libstate/lookup.h2
-rw-r--r--src/lib/mac/cbc_mac/cbc_mac.cpp2
-rw-r--r--src/lib/mac/cbc_mac/cbc_mac.h2
-rw-r--r--src/lib/mac/cmac/cmac.cpp2
-rw-r--r--src/lib/mac/cmac/cmac.h2
-rw-r--r--src/lib/mac/hmac/hmac.cpp2
-rw-r--r--src/lib/mac/hmac/hmac.h2
-rw-r--r--src/lib/mac/mac.cpp2
-rw-r--r--src/lib/mac/mac.h2
-rw-r--r--src/lib/mac/poly1305/poly1305.cpp2
-rw-r--r--src/lib/mac/poly1305/poly1305.h2
-rw-r--r--src/lib/mac/poly1305/poly1305_donna.h2
-rw-r--r--src/lib/mac/ssl3mac/ssl3_mac.cpp2
-rw-r--r--src/lib/mac/ssl3mac/ssl3_mac.h2
-rw-r--r--src/lib/mac/x919_mac/x919_mac.cpp2
-rw-r--r--src/lib/mac/x919_mac/x919_mac.h2
-rw-r--r--src/lib/math/bigint/big_code.cpp2
-rw-r--r--src/lib/math/bigint/big_io.cpp2
-rw-r--r--src/lib/math/bigint/big_ops2.cpp2
-rw-r--r--src/lib/math/bigint/big_ops3.cpp2
-rw-r--r--src/lib/math/bigint/big_rand.cpp2
-rw-r--r--src/lib/math/bigint/bigint.cpp2
-rw-r--r--src/lib/math/bigint/bigint.h2
-rw-r--r--src/lib/math/bigint/divide.cpp2
-rw-r--r--src/lib/math/bigint/divide.h2
-rw-r--r--src/lib/math/ec_gfp/curve_gfp.cpp2
-rw-r--r--src/lib/math/ec_gfp/curve_gfp.h2
-rw-r--r--src/lib/math/ec_gfp/curve_nistp.cpp2
-rw-r--r--src/lib/math/ec_gfp/curve_nistp.h2
-rw-r--r--src/lib/math/ec_gfp/point_gfp.cpp2
-rw-r--r--src/lib/math/ec_gfp/point_gfp.h2
-rw-r--r--src/lib/math/mp/mp_asm.cpp2
-rw-r--r--src/lib/math/mp/mp_comba.cpp2
-rw-r--r--src/lib/math/mp/mp_core.h2
-rw-r--r--src/lib/math/mp/mp_generic/mp_asmi.h2
-rw-r--r--src/lib/math/mp/mp_generic/mp_madd.h2
-rw-r--r--src/lib/math/mp/mp_karat.cpp2
-rw-r--r--src/lib/math/mp/mp_misc.cpp2
-rw-r--r--src/lib/math/mp/mp_monty.cpp2
-rw-r--r--src/lib/math/mp/mp_mulop.cpp2
-rw-r--r--src/lib/math/mp/mp_shift.cpp2
-rw-r--r--src/lib/math/mp/mp_types.h2
-rw-r--r--src/lib/math/mp/mp_x86_32/mp_asmi.h2
-rw-r--r--src/lib/math/mp/mp_x86_32/mp_madd.h2
-rw-r--r--src/lib/math/mp/mp_x86_32_msvc/mp_asmi.h2
-rw-r--r--src/lib/math/mp/mp_x86_64/mp_asmi.h2
-rw-r--r--src/lib/math/mp/mp_x86_64/mp_madd.h2
-rw-r--r--src/lib/math/numbertheory/def_powm.h2
-rw-r--r--src/lib/math/numbertheory/dsa_gen.cpp2
-rw-r--r--src/lib/math/numbertheory/jacobi.cpp2
-rw-r--r--src/lib/math/numbertheory/make_prm.cpp2
-rw-r--r--src/lib/math/numbertheory/mp_numth.cpp2
-rw-r--r--src/lib/math/numbertheory/numthry.cpp2
-rw-r--r--src/lib/math/numbertheory/numthry.h2
-rw-r--r--src/lib/math/numbertheory/pow_mod.cpp2
-rw-r--r--src/lib/math/numbertheory/pow_mod.h2
-rw-r--r--src/lib/math/numbertheory/powm_fw.cpp2
-rw-r--r--src/lib/math/numbertheory/powm_mnt.cpp2
-rw-r--r--src/lib/math/numbertheory/primes.cpp2
-rw-r--r--src/lib/math/numbertheory/reducer.cpp2
-rw-r--r--src/lib/math/numbertheory/reducer.h2
-rw-r--r--src/lib/math/numbertheory/ressol.cpp2
-rw-r--r--src/lib/modes/aead/aead.cpp2
-rw-r--r--src/lib/modes/aead/aead.h2
-rw-r--r--src/lib/modes/aead/ccm/ccm.cpp2
-rw-r--r--src/lib/modes/aead/ccm/ccm.h2
-rw-r--r--src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp2
-rw-r--r--src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h2
-rw-r--r--src/lib/modes/aead/eax/eax.cpp2
-rw-r--r--src/lib/modes/aead/eax/eax.h2
-rw-r--r--src/lib/modes/aead/gcm/clmul/clmul.cpp2
-rw-r--r--src/lib/modes/aead/gcm/clmul/clmul.h2
-rw-r--r--src/lib/modes/aead/gcm/gcm.cpp2
-rw-r--r--src/lib/modes/aead/gcm/gcm.h2
-rw-r--r--src/lib/modes/aead/ocb/ocb.cpp2
-rw-r--r--src/lib/modes/aead/ocb/ocb.h2
-rw-r--r--src/lib/modes/aead/siv/siv.cpp2
-rw-r--r--src/lib/modes/aead/siv/siv.h2
-rw-r--r--src/lib/modes/cbc/cbc.cpp2
-rw-r--r--src/lib/modes/cbc/cbc.h2
-rw-r--r--src/lib/modes/cfb/cfb.cpp2
-rw-r--r--src/lib/modes/cfb/cfb.h2
-rw-r--r--src/lib/modes/cipher_mode.h2
-rw-r--r--src/lib/modes/ecb/ecb.cpp2
-rw-r--r--src/lib/modes/ecb/ecb.h2
-rw-r--r--src/lib/modes/mode_pad/mode_pad.cpp2
-rw-r--r--src/lib/modes/mode_pad/mode_pad.h2
-rw-r--r--src/lib/modes/xts/xts.cpp2
-rw-r--r--src/lib/modes/xts/xts.h2
-rw-r--r--src/lib/passhash/bcrypt/bcrypt.cpp2
-rw-r--r--src/lib/passhash/bcrypt/bcrypt.h2
-rw-r--r--src/lib/passhash/passhash9/passhash9.cpp2
-rw-r--r--src/lib/passhash/passhash9/passhash9.h2
-rw-r--r--src/lib/pbkdf/pbkdf.cpp2
-rw-r--r--src/lib/pbkdf/pbkdf.h2
-rw-r--r--src/lib/pbkdf/pbkdf1/pbkdf1.cpp2
-rw-r--r--src/lib/pbkdf/pbkdf1/pbkdf1.h2
-rw-r--r--src/lib/pbkdf/pbkdf2/pbkdf2.cpp2
-rw-r--r--src/lib/pbkdf/pbkdf2/pbkdf2.h2
-rw-r--r--src/lib/pk_pad/eme.cpp2
-rw-r--r--src/lib/pk_pad/eme.h2
-rw-r--r--src/lib/pk_pad/eme_oaep/oaep.cpp2
-rw-r--r--src/lib/pk_pad/eme_oaep/oaep.h2
-rw-r--r--src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp2
-rw-r--r--src/lib/pk_pad/eme_pkcs1/eme_pkcs.h2
-rw-r--r--src/lib/pk_pad/emsa.h2
-rw-r--r--src/lib/pk_pad/emsa1/emsa1.cpp2
-rw-r--r--src/lib/pk_pad/emsa1/emsa1.h2
-rw-r--r--src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp2
-rw-r--r--src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h2
-rw-r--r--src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp2
-rw-r--r--src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h2
-rw-r--r--src/lib/pk_pad/emsa_pssr/pssr.cpp2
-rw-r--r--src/lib/pk_pad/emsa_pssr/pssr.h2
-rw-r--r--src/lib/pk_pad/emsa_raw/emsa_raw.cpp2
-rw-r--r--src/lib/pk_pad/emsa_raw/emsa_raw.h2
-rw-r--r--src/lib/pk_pad/emsa_x931/emsa_x931.cpp2
-rw-r--r--src/lib/pk_pad/emsa_x931/emsa_x931.h2
-rw-r--r--src/lib/pk_pad/get_pk_pad.cpp2
-rw-r--r--src/lib/pk_pad/hash_id/hash_id.cpp2
-rw-r--r--src/lib/pk_pad/hash_id/hash_id.h2
-rw-r--r--src/lib/pk_pad/mgf1/mgf1.cpp2
-rw-r--r--src/lib/pk_pad/mgf1/mgf1.h2
-rw-r--r--src/lib/prf/hkdf/hkdf.cpp2
-rw-r--r--src/lib/prf/hkdf/hkdf.h2
-rw-r--r--src/lib/pubkey/blinding.cpp2
-rw-r--r--src/lib/pubkey/blinding.h2
-rw-r--r--src/lib/pubkey/curve25519/curve25519.cpp2
-rw-r--r--src/lib/pubkey/curve25519/curve25519.h2
-rw-r--r--src/lib/pubkey/dh/dh.cpp2
-rw-r--r--src/lib/pubkey/dh/dh.h2
-rw-r--r--src/lib/pubkey/dl_algo/dl_algo.cpp2
-rw-r--r--src/lib/pubkey/dl_algo/dl_algo.h2
-rw-r--r--src/lib/pubkey/dl_group/dl_group.cpp2
-rw-r--r--src/lib/pubkey/dl_group/dl_group.h2
-rw-r--r--src/lib/pubkey/dl_group/named.cpp2
-rw-r--r--src/lib/pubkey/dlies/dlies.cpp2
-rw-r--r--src/lib/pubkey/dlies/dlies.h2
-rw-r--r--src/lib/pubkey/dsa/dsa.cpp2
-rw-r--r--src/lib/pubkey/dsa/dsa.h2
-rw-r--r--src/lib/pubkey/ec_group/ec_group.cpp2
-rw-r--r--src/lib/pubkey/ec_group/ec_group.h2
-rw-r--r--src/lib/pubkey/ec_group/named.cpp2
-rw-r--r--src/lib/pubkey/ecc_key/ecc_key.cpp2
-rw-r--r--src/lib/pubkey/ecc_key/ecc_key.h2
-rw-r--r--src/lib/pubkey/ecdh/ecdh.cpp2
-rw-r--r--src/lib/pubkey/ecdh/ecdh.h2
-rw-r--r--src/lib/pubkey/ecdsa/ecdsa.cpp2
-rw-r--r--src/lib/pubkey/ecdsa/ecdsa.h2
-rw-r--r--src/lib/pubkey/elgamal/elgamal.cpp2
-rw-r--r--src/lib/pubkey/elgamal/elgamal.h2
-rw-r--r--src/lib/pubkey/gost_3410/gost_3410.cpp2
-rw-r--r--src/lib/pubkey/gost_3410/gost_3410.h2
-rw-r--r--src/lib/pubkey/if_algo/if_algo.cpp2
-rw-r--r--src/lib/pubkey/if_algo/if_algo.h2
-rw-r--r--src/lib/pubkey/keypair/keypair.cpp2
-rw-r--r--src/lib/pubkey/keypair/keypair.h2
-rw-r--r--src/lib/pubkey/mce/binary_matrix.cpp2
-rw-r--r--src/lib/pubkey/mce/binary_matrix.h2
-rw-r--r--src/lib/pubkey/mce/code_based_key_gen.cpp2
-rw-r--r--src/lib/pubkey/mce/code_based_key_gen.h2
-rw-r--r--src/lib/pubkey/mce/code_based_util.h2
-rw-r--r--src/lib/pubkey/mce/gf2m_rootfind_dcmp.cpp2
-rw-r--r--src/lib/pubkey/mce/gf2m_rootfind_dcmp.h2
-rw-r--r--src/lib/pubkey/mce/gf2m_small_m.cpp17
-rw-r--r--src/lib/pubkey/mce/gf2m_small_m.h2
-rw-r--r--src/lib/pubkey/mce/goppa_code.cpp2
-rw-r--r--src/lib/pubkey/mce/goppa_code.h2
-rw-r--r--src/lib/pubkey/mce/mce_kem.cpp2
-rw-r--r--src/lib/pubkey/mce/mce_kem.h2
-rw-r--r--src/lib/pubkey/mce/mceliece.cpp2
-rw-r--r--src/lib/pubkey/mce/mceliece.h2
-rw-r--r--src/lib/pubkey/mce/mceliece_key.cpp2
-rw-r--r--src/lib/pubkey/mce/mceliece_key.h2
-rw-r--r--src/lib/pubkey/mce/polyn_gf2m.cpp2
-rw-r--r--src/lib/pubkey/mce/polyn_gf2m.h2
-rw-r--r--src/lib/pubkey/mce/workfactor.cpp3
-rw-r--r--src/lib/pubkey/mceies/mceies.cpp2
-rw-r--r--src/lib/pubkey/mceies/mceies.h2
-rw-r--r--src/lib/pubkey/nr/nr.cpp2
-rw-r--r--src/lib/pubkey/nr/nr.h2
-rw-r--r--src/lib/pubkey/pk_algs.cpp2
-rw-r--r--src/lib/pubkey/pk_algs.h2
-rw-r--r--src/lib/pubkey/pk_keys.cpp2
-rw-r--r--src/lib/pubkey/pk_keys.h2
-rw-r--r--src/lib/pubkey/pk_ops.h2
-rw-r--r--src/lib/pubkey/pkcs8.cpp2
-rw-r--r--src/lib/pubkey/pkcs8.h2
-rw-r--r--src/lib/pubkey/pubkey.cpp2
-rw-r--r--src/lib/pubkey/pubkey.h2
-rw-r--r--src/lib/pubkey/rfc6979/rfc6979.cpp2
-rw-r--r--src/lib/pubkey/rfc6979/rfc6979.h2
-rw-r--r--src/lib/pubkey/rsa/rsa.cpp2
-rw-r--r--src/lib/pubkey/rsa/rsa.h2
-rw-r--r--src/lib/pubkey/rw/rw.cpp2
-rw-r--r--src/lib/pubkey/rw/rw.h2
-rw-r--r--src/lib/pubkey/workfactor.cpp2
-rw-r--r--src/lib/pubkey/workfactor.h2
-rw-r--r--src/lib/pubkey/x509_key.cpp2
-rw-r--r--src/lib/pubkey/x509_key.h2
-rw-r--r--src/lib/rng/auto_rng/auto_rng.h2
-rw-r--r--src/lib/rng/hmac_drbg/hmac_drbg.cpp2
-rw-r--r--src/lib/rng/hmac_drbg/hmac_drbg.h2
-rw-r--r--src/lib/rng/hmac_rng/hmac_rng.cpp2
-rw-r--r--src/lib/rng/hmac_rng/hmac_rng.h2
-rw-r--r--src/lib/rng/rng.cpp2
-rw-r--r--src/lib/rng/rng.h2
-rw-r--r--src/lib/rng/system_rng/system_rng.cpp2
-rw-r--r--src/lib/rng/system_rng/system_rng.h2
-rw-r--r--src/lib/rng/x931_rng/x931_rng.cpp2
-rw-r--r--src/lib/rng/x931_rng/x931_rng.h2
-rw-r--r--src/lib/selftest/selftest.cpp2
-rw-r--r--src/lib/selftest/selftest.h2
-rw-r--r--src/lib/simd/simd_32.h2
-rw-r--r--src/lib/simd/simd_altivec/simd_altivec.h2
-rw-r--r--src/lib/simd/simd_scalar/simd_scalar.h2
-rw-r--r--src/lib/simd/simd_sse2/simd_sse2.h2
-rw-r--r--src/lib/stream/chacha/chacha.cpp2
-rw-r--r--src/lib/stream/chacha/chacha.h2
-rw-r--r--src/lib/stream/ctr/ctr.cpp2
-rw-r--r--src/lib/stream/ctr/ctr.h2
-rw-r--r--src/lib/stream/ofb/ofb.cpp2
-rw-r--r--src/lib/stream/ofb/ofb.h2
-rw-r--r--src/lib/stream/rc4/rc4.cpp2
-rw-r--r--src/lib/stream/rc4/rc4.h2
-rw-r--r--src/lib/stream/salsa20/salsa20.cpp2
-rw-r--r--src/lib/stream/salsa20/salsa20.h2
-rw-r--r--src/lib/stream/stream_cipher.cpp2
-rw-r--r--src/lib/stream/stream_cipher.h2
-rw-r--r--src/lib/tls/msg_cert_req.cpp2
-rw-r--r--src/lib/tls/msg_cert_verify.cpp2
-rw-r--r--src/lib/tls/msg_certificate.cpp2
-rw-r--r--src/lib/tls/msg_client_hello.cpp2
-rw-r--r--src/lib/tls/msg_client_kex.cpp2
-rw-r--r--src/lib/tls/msg_finished.cpp2
-rw-r--r--src/lib/tls/msg_hello_verify.cpp2
-rw-r--r--src/lib/tls/msg_next_protocol.cpp2
-rw-r--r--src/lib/tls/msg_server_hello.cpp2
-rw-r--r--src/lib/tls/msg_server_kex.cpp2
-rw-r--r--src/lib/tls/msg_session_ticket.cpp2
-rw-r--r--src/lib/tls/sessions_sql/tls_session_manager_sql.cpp2
-rw-r--r--src/lib/tls/sessions_sql/tls_session_manager_sql.h2
-rw-r--r--src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.cpp2
-rw-r--r--src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h2
-rw-r--r--src/lib/tls/tls_alert.cpp2
-rw-r--r--src/lib/tls/tls_alert.h2
-rw-r--r--src/lib/tls/tls_blocking.cpp2
-rw-r--r--src/lib/tls/tls_blocking.h2
-rw-r--r--src/lib/tls/tls_channel.cpp2
-rw-r--r--src/lib/tls/tls_channel.h2
-rw-r--r--src/lib/tls/tls_ciphersuite.cpp2
-rw-r--r--src/lib/tls/tls_ciphersuite.h2
-rw-r--r--src/lib/tls/tls_client.cpp2
-rw-r--r--src/lib/tls/tls_client.h2
-rw-r--r--src/lib/tls/tls_exceptn.h2
-rw-r--r--src/lib/tls/tls_extensions.cpp2
-rw-r--r--src/lib/tls/tls_extensions.h2
-rw-r--r--src/lib/tls/tls_handshake_hash.cpp2
-rw-r--r--src/lib/tls/tls_handshake_hash.h2
-rw-r--r--src/lib/tls/tls_handshake_io.cpp2
-rw-r--r--src/lib/tls/tls_handshake_io.h2
-rw-r--r--src/lib/tls/tls_handshake_msg.h2
-rw-r--r--src/lib/tls/tls_handshake_state.cpp2
-rw-r--r--src/lib/tls/tls_handshake_state.h2
-rw-r--r--src/lib/tls/tls_heartbeats.cpp2
-rw-r--r--src/lib/tls/tls_heartbeats.h2
-rw-r--r--src/lib/tls/tls_magic.h2
-rw-r--r--src/lib/tls/tls_messages.h2
-rw-r--r--src/lib/tls/tls_policy.cpp2
-rw-r--r--src/lib/tls/tls_policy.h2
-rw-r--r--src/lib/tls/tls_reader.h2
-rw-r--r--src/lib/tls/tls_record.cpp2
-rw-r--r--src/lib/tls/tls_record.h2
-rw-r--r--src/lib/tls/tls_seq_numbers.h2
-rw-r--r--src/lib/tls/tls_server.cpp2
-rw-r--r--src/lib/tls/tls_server.h2
-rw-r--r--src/lib/tls/tls_server_info.h2
-rw-r--r--src/lib/tls/tls_session.cpp2
-rw-r--r--src/lib/tls/tls_session.h2
-rw-r--r--src/lib/tls/tls_session_key.cpp2
-rw-r--r--src/lib/tls/tls_session_key.h2
-rw-r--r--src/lib/tls/tls_session_manager.h2
-rw-r--r--src/lib/tls/tls_session_manager_memory.cpp2
-rw-r--r--src/lib/tls/tls_suite_info.cpp2
-rw-r--r--src/lib/tls/tls_version.cpp2
-rw-r--r--src/lib/tls/tls_version.h2
-rw-r--r--src/lib/utils/asm_x86_32/asm_x86_32.h2
-rw-r--r--src/lib/utils/asm_x86_64/asm_x86_64.h2
-rw-r--r--src/lib/utils/assert.cpp2
-rw-r--r--src/lib/utils/assert.h2
-rw-r--r--src/lib/utils/bit_ops.h2
-rw-r--r--src/lib/utils/bswap.h2
-rw-r--r--src/lib/utils/calendar.cpp2
-rw-r--r--src/lib/utils/calendar.h2
-rw-r--r--src/lib/utils/charset.cpp2
-rw-r--r--src/lib/utils/charset.h2
-rw-r--r--src/lib/utils/cpuid.cpp2
-rw-r--r--src/lib/utils/cpuid.h2
-rw-r--r--src/lib/utils/database.h2
-rw-r--r--src/lib/utils/datastor/datastor.cpp2
-rw-r--r--src/lib/utils/datastor/datastor.h2
-rw-r--r--src/lib/utils/donna128.h2
-rw-r--r--src/lib/utils/dyn_load/dyn_load.cpp2
-rw-r--r--src/lib/utils/dyn_load/dyn_load.h2
-rw-r--r--src/lib/utils/exceptn.h2
-rw-r--r--src/lib/utils/get_byte.h2
-rw-r--r--src/lib/utils/http_util/http_util.cpp2
-rw-r--r--src/lib/utils/http_util/http_util.h2
-rw-r--r--src/lib/utils/loadstor.h2
-rw-r--r--src/lib/utils/mem_ops.h2
-rw-r--r--src/lib/utils/mul128.h2
-rw-r--r--src/lib/utils/parsing.cpp2
-rw-r--r--src/lib/utils/parsing.h2
-rw-r--r--src/lib/utils/prefetch.h2
-rw-r--r--src/lib/utils/read_cfg.cpp2
-rw-r--r--src/lib/utils/rotate.h2
-rw-r--r--src/lib/utils/rounding.h2
-rw-r--r--src/lib/utils/semaphore.cpp6
-rw-r--r--src/lib/utils/semaphore.h4
-rw-r--r--src/lib/utils/sqlite3/sqlite3.cpp2
-rw-r--r--src/lib/utils/sqlite3/sqlite3.h2
-rw-r--r--src/lib/utils/stl_util.h2
-rw-r--r--src/lib/utils/ta_utils.cpp2
-rw-r--r--src/lib/utils/ta_utils.h2
-rw-r--r--src/lib/utils/types.h2
-rw-r--r--src/lib/utils/version.cpp2
-rw-r--r--src/lib/utils/version.h2
-rw-r--r--src/lib/utils/xor_buf.h2
-rw-r--r--src/lib/utils/zero_mem.cpp2
-rw-r--r--src/python/core.cpp2
-rw-r--r--src/python/filter.cpp2
-rw-r--r--src/python/python_botan.h2
-rw-r--r--src/python/rsa.cpp2
-rw-r--r--src/python/x509.cpp2
-rwxr-xr-xsrc/scripts/comba.py2
-rwxr-xr-xsrc/scripts/combine_relnotes.py2
-rwxr-xr-xsrc/scripts/dist.py2
-rwxr-xr-xsrc/scripts/install.py2
-rwxr-xr-xsrc/scripts/tls_suite_info.py2
-rw-r--r--src/tests/nist_x509.cpp22
-rw-r--r--src/tests/test_aead.cpp6
-rw-r--r--src/tests/test_bigint.cpp2
-rw-r--r--src/tests/test_block.cpp6
-rw-r--r--src/tests/test_c25519.cpp6
-rw-r--r--src/tests/test_cryptobox.cpp7
-rw-r--r--src/tests/test_cvc.cpp2
-rw-r--r--src/tests/test_dh.cpp6
-rw-r--r--src/tests/test_dlies.cpp6
-rw-r--r--src/tests/test_dsa.cpp6
-rw-r--r--src/tests/test_ecdsa.cpp6
-rw-r--r--src/tests/test_elg.cpp6
-rw-r--r--src/tests/test_gost_3410.cpp6
-rw-r--r--src/tests/test_hash.cpp6
-rw-r--r--src/tests/test_hkdf.cpp6
-rw-r--r--src/tests/test_kdf.cpp6
-rw-r--r--src/tests/test_keywrap.cpp6
-rw-r--r--src/tests/test_mac.cpp6
-rw-r--r--src/tests/test_mceliece.cpp8
-rw-r--r--src/tests/test_modes.cpp6
-rw-r--r--src/tests/test_nr.cpp7
-rw-r--r--src/tests/test_ocb.cpp5
-rw-r--r--src/tests/test_passhash.cpp7
-rw-r--r--src/tests/test_pbkdf.cpp6
-rw-r--r--src/tests/test_pubkey.cpp2
-rw-r--r--src/tests/test_pubkey.h5
-rw-r--r--src/tests/test_rfc6979.cpp6
-rw-r--r--src/tests/test_rng.cpp8
-rw-r--r--src/tests/test_rng.h5
-rw-r--r--src/tests/test_rsa.cpp7
-rw-r--r--src/tests/test_rw.cpp6
-rw-r--r--src/tests/test_stream.cpp6
-rw-r--r--src/tests/test_transform.cpp6
-rw-r--r--src/tests/test_tss.cpp2
-rw-r--r--src/tests/tests.cpp6
-rw-r--r--src/tests/tests.h5
-rw-r--r--src/tests/unit_ecc.cpp2
-rw-r--r--src/tests/unit_ecdh.cpp2
-rw-r--r--src/tests/unit_ecdsa.cpp16
-rw-r--r--src/tests/unit_tls.cpp5
-rw-r--r--src/tests/unit_x509.cpp2
767 files changed, 1066 insertions, 748 deletions
diff --git a/configure.py b/configure.py
index f0c3ae963..ccb6f854d 100755
--- a/configure.py
+++ b/configure.py
@@ -3,7 +3,7 @@
"""
Configuration program for botan (http://botan.randombit.net/)
(C) 2009,2010,2011,2012,2013,2014 Jack Lloyd
- Distributed under the terms of the Botan license
+ Botan is released under the Simplified BSD License (see license.txt)
Tested with CPython 2.6, 2.7, 3.2, 3.3 and PyPy 1.5
@@ -1751,7 +1751,7 @@ def generate_amalgamation(build_config):
* Botan %s Amalgamation
* (C) 1999-2013,2014 Jack Lloyd and others
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
""" % (build_config.version_string)
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>
diff --git a/src/contrib/sqlite/codec.cpp b/src/contrib/sqlite/codec.cpp
index 70519ccfa..c4e6c8db7 100644
--- a/src/contrib/sqlite/codec.cpp
+++ b/src/contrib/sqlite/codec.cpp
@@ -2,7 +2,7 @@
* Codec class for SQLite3 encryption codec.
* (C) 2010 Olivier de Gaalon
*
- * Distributed under the terms of the Botan license
+ * Botan is released under the Simplified BSD License (see license.txt)
*/
#include "codec.h"
diff --git a/src/contrib/sqlite/codec.h b/src/contrib/sqlite/codec.h
index 2f94bcc59..673de2480 100644
--- a/src/contrib/sqlite/codec.h
+++ b/src/contrib/sqlite/codec.h
@@ -2,7 +2,7 @@
* Codec class for SQLite3 encryption codec.
* (C) 2010 Olivier de Gaalon
*
- * Distributed under the terms of the Botan license
+ * Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef _CODEC_H_
diff --git a/src/contrib/sqlite/codec_c_interface.h b/src/contrib/sqlite/codec_c_interface.h
index 1d8c8706f..9f515c113 100644
--- a/src/contrib/sqlite/codec_c_interface.h
+++ b/src/contrib/sqlite/codec_c_interface.h
@@ -2,7 +2,7 @@
* Encryption codec class C interface
* (C) 2010 Olivier de Gaalon
*
- * Distributed under the terms of the Botan license
+ * Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef _CODEC_C_INTERFACE_H_
diff --git a/src/contrib/sqlite/codecext.c b/src/contrib/sqlite/codecext.c
index e32d60dc2..f44c04a2e 100644
--- a/src/contrib/sqlite/codecext.c
+++ b/src/contrib/sqlite/codecext.c
@@ -2,7 +2,7 @@
* Encryption codec implementation
* (C) 2010 Olivier de Gaalon
*
- * Distributed under the terms of the Botan license
+ * Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef SQLITE_OMIT_DISKIO
diff --git a/src/contrib/sqlite/test_sqlite.cpp b/src/contrib/sqlite/test_sqlite.cpp
index a516fd82b..74bf24b06 100644
--- a/src/contrib/sqlite/test_sqlite.cpp
+++ b/src/contrib/sqlite/test_sqlite.cpp
@@ -2,7 +2,7 @@
* Quick and dirty test for SQLite3 encryption codec.
* (C) 2010 Olivier de Gaalon
*
- * Distributed under the terms of the Botan license
+ * Botan is released under the Simplified BSD License (see license.txt)
*/
#define SQLITE_HAS_CODEC 1
diff --git a/src/lib/algo_base/buf_comp.h b/src/lib/algo_base/buf_comp.h
index f25af3b92..5d11fdb73 100644
--- a/src/lib/algo_base/buf_comp.h
+++ b/src/lib/algo_base/buf_comp.h
@@ -2,7 +2,7 @@
* Buffered Computation
* (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_BUFFERED_COMPUTATION_H__
diff --git a/src/lib/algo_base/key_spec.h b/src/lib/algo_base/key_spec.h
index 15881c1a6..78b6b8a23 100644
--- a/src/lib/algo_base/key_spec.h
+++ b/src/lib/algo_base/key_spec.h
@@ -2,7 +2,7 @@
* Symmetric Key Length Specification
* (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_KEY_LEN_SPECIFICATION_H__
diff --git a/src/lib/algo_base/scan_name.cpp b/src/lib/algo_base/scan_name.cpp
index d32c36a66..063900aae 100644
--- a/src/lib/algo_base/scan_name.cpp
+++ b/src/lib/algo_base/scan_name.cpp
@@ -2,7 +2,7 @@
* SCAN Name Abstraction
* (C) 2008-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/scan_name.h>
diff --git a/src/lib/algo_base/scan_name.h b/src/lib/algo_base/scan_name.h
index f4c4b46e7..eb64f94eb 100644
--- a/src/lib/algo_base/scan_name.h
+++ b/src/lib/algo_base/scan_name.h
@@ -2,7 +2,7 @@
* SCAN Name Abstraction
* (C) 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SCAN_NAME_H__
diff --git a/src/lib/algo_base/sym_algo.h b/src/lib/algo_base/sym_algo.h
index 0b3b21f5e..7c37b2a47 100644
--- a/src/lib/algo_base/sym_algo.h
+++ b/src/lib/algo_base/sym_algo.h
@@ -2,7 +2,7 @@
* Symmetric Algorithm Base Class
* (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_SYMMETRIC_ALGORITHM_H__
diff --git a/src/lib/algo_base/symkey.cpp b/src/lib/algo_base/symkey.cpp
index dfac1553c..0cb0d9e35 100644
--- a/src/lib/algo_base/symkey.cpp
+++ b/src/lib/algo_base/symkey.cpp
@@ -2,7 +2,7 @@
* OctetString
* (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/symkey.h>
diff --git a/src/lib/algo_base/symkey.h b/src/lib/algo_base/symkey.h
index 7dfe9fbcd..f49bf226f 100644
--- a/src/lib/algo_base/symkey.h
+++ b/src/lib/algo_base/symkey.h
@@ -2,7 +2,7 @@
* OctetString
* (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_SYMKEY_H__
diff --git a/src/lib/algo_base/transform.h b/src/lib/algo_base/transform.h
index 4fe958632..444622b74 100644
--- a/src/lib/algo_base/transform.h
+++ b/src/lib/algo_base/transform.h
@@ -2,7 +2,7 @@
* Transformations of data
* (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_TRANSFORM_H__
diff --git a/src/lib/algo_factory/algo_cache.h b/src/lib/algo_factory/algo_cache.h
index 3bd9f0031..66c62da67 100644
--- a/src/lib/algo_factory/algo_cache.h
+++ b/src/lib/algo_factory/algo_cache.h
@@ -2,7 +2,7 @@
* An algorithm cache (used by Algorithm_Factory)
* (C) 2008-2009,2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ALGORITHM_CACHE_TEMPLATE_H__
diff --git a/src/lib/algo_factory/algo_factory.cpp b/src/lib/algo_factory/algo_factory.cpp
index 4c0c9f7cd..dcd1a3c5f 100644
--- a/src/lib/algo_factory/algo_factory.cpp
+++ b/src/lib/algo_factory/algo_factory.cpp
@@ -2,7 +2,7 @@
* Algorithm Factory
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/algo_factory.h>
diff --git a/src/lib/algo_factory/algo_factory.h b/src/lib/algo_factory/algo_factory.h
index 40d1be5ad..bff66d2fb 100644
--- a/src/lib/algo_factory/algo_factory.h
+++ b/src/lib/algo_factory/algo_factory.h
@@ -2,7 +2,7 @@
* Algorithm Factory
* (C) 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ALGORITHM_FACTORY_H__
diff --git a/src/lib/algo_factory/prov_weight.cpp b/src/lib/algo_factory/prov_weight.cpp
index fca791333..3c793a299 100644
--- a/src/lib/algo_factory/prov_weight.cpp
+++ b/src/lib/algo_factory/prov_weight.cpp
@@ -2,7 +2,7 @@
* Default provider weights for Algorithm_Cache
* (C) 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/algo_cache.h>
diff --git a/src/lib/alloc/locking_allocator/locking_allocator.cpp b/src/lib/alloc/locking_allocator/locking_allocator.cpp
index 9ea1235e9..643868c76 100644
--- a/src/lib/alloc/locking_allocator/locking_allocator.cpp
+++ b/src/lib/alloc/locking_allocator/locking_allocator.cpp
@@ -2,7 +2,7 @@
* Mlock Allocator
* (C) 2012,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/locking_allocator.h>
diff --git a/src/lib/alloc/locking_allocator/locking_allocator.h b/src/lib/alloc/locking_allocator/locking_allocator.h
index 3bebea5f2..2aca2dfa9 100644
--- a/src/lib/alloc/locking_allocator/locking_allocator.h
+++ b/src/lib/alloc/locking_allocator/locking_allocator.h
@@ -2,7 +2,7 @@
* Mlock Allocator
* (C) 2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MLOCK_ALLOCATOR_H__
diff --git a/src/lib/alloc/secmem.h b/src/lib/alloc/secmem.h
index 706ea037f..58d0734cb 100644
--- a/src/lib/alloc/secmem.h
+++ b/src/lib/alloc/secmem.h
@@ -2,7 +2,7 @@
* Secure Memory Buffers
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SECURE_MEMORY_BUFFERS_H__
diff --git a/src/lib/asn1/alg_id.cpp b/src/lib/asn1/alg_id.cpp
index bb8dac80a..8e6651d52 100644
--- a/src/lib/asn1/alg_id.cpp
+++ b/src/lib/asn1/alg_id.cpp
@@ -2,7 +2,7 @@
* Algorithm Identifier
* (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/alg_id.h>
diff --git a/src/lib/asn1/alg_id.h b/src/lib/asn1/alg_id.h
index d8b40e700..5083274f1 100644
--- a/src/lib/asn1/alg_id.h
+++ b/src/lib/asn1/alg_id.h
@@ -2,7 +2,7 @@
* Algorithm Identifier
* (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_ALGORITHM_IDENTIFIER_H__
diff --git a/src/lib/asn1/asn1_alt_name.cpp b/src/lib/asn1/asn1_alt_name.cpp
index 2e7116bac..9e59321f7 100644
--- a/src/lib/asn1/asn1_alt_name.cpp
+++ b/src/lib/asn1/asn1_alt_name.cpp
@@ -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)
*/
#include <botan/asn1_alt_name.h>
diff --git a/src/lib/asn1/asn1_alt_name.h b/src/lib/asn1/asn1_alt_name.h
index f2c83ed2c..daf62d464 100644
--- a/src/lib/asn1/asn1_alt_name.h
+++ b/src/lib/asn1/asn1_alt_name.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_ASN1_ALT_NAME_H__
diff --git a/src/lib/asn1/asn1_attribute.cpp b/src/lib/asn1/asn1_attribute.cpp
index dff52bef9..406a57d9a 100644
--- a/src/lib/asn1/asn1_attribute.cpp
+++ b/src/lib/asn1/asn1_attribute.cpp
@@ -2,7 +2,7 @@
* Attribute
* (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/asn1_attribute.h>
diff --git a/src/lib/asn1/asn1_attribute.h b/src/lib/asn1/asn1_attribute.h
index 877135803..e094bd3aa 100644
--- a/src/lib/asn1/asn1_attribute.h
+++ b/src/lib/asn1/asn1_attribute.h
@@ -2,7 +2,7 @@
* ASN.1 Attribute
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ASN1_ATTRIBUTE_H__
diff --git a/src/lib/asn1/asn1_obj.cpp b/src/lib/asn1/asn1_obj.cpp
index 898e91614..265668d83 100644
--- a/src/lib/asn1/asn1_obj.cpp
+++ b/src/lib/asn1/asn1_obj.cpp
@@ -2,7 +2,7 @@
* ASN.1 Internals
* (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/asn1_obj.h>
diff --git a/src/lib/asn1/asn1_obj.h b/src/lib/asn1/asn1_obj.h
index 564f4ecdb..d208ec78e 100644
--- a/src/lib/asn1/asn1_obj.h
+++ b/src/lib/asn1/asn1_obj.h
@@ -2,7 +2,7 @@
* ASN.1 Internals
* (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_ASN1_H__
diff --git a/src/lib/asn1/asn1_oid.cpp b/src/lib/asn1/asn1_oid.cpp
index 964315080..21c2daafb 100644
--- a/src/lib/asn1/asn1_oid.cpp
+++ b/src/lib/asn1/asn1_oid.cpp
@@ -2,7 +2,7 @@
* ASN.1 OID
* (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/asn1_oid.h>
diff --git a/src/lib/asn1/asn1_oid.h b/src/lib/asn1/asn1_oid.h
index a0b1edeba..cf4fd9f54 100644
--- a/src/lib/asn1/asn1_oid.h
+++ b/src/lib/asn1/asn1_oid.h
@@ -2,7 +2,7 @@
* ASN.1 OID
* (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_ASN1_OID_H__
diff --git a/src/lib/asn1/asn1_str.cpp b/src/lib/asn1/asn1_str.cpp
index 44db189f9..05be90e3d 100644
--- a/src/lib/asn1/asn1_str.cpp
+++ b/src/lib/asn1/asn1_str.cpp
@@ -2,7 +2,7 @@
* Simple ASN.1 String 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)
*/
#include <botan/asn1_str.h>
diff --git a/src/lib/asn1/asn1_str.h b/src/lib/asn1/asn1_str.h
index 42f1ef5ae..911331c9c 100644
--- a/src/lib/asn1/asn1_str.h
+++ b/src/lib/asn1/asn1_str.h
@@ -2,7 +2,7 @@
* ASN.1 string type
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ASN1_STRING_H__
diff --git a/src/lib/asn1/asn1_time.cpp b/src/lib/asn1/asn1_time.cpp
index 32f214e53..b79e8a9ba 100644
--- a/src/lib/asn1/asn1_time.cpp
+++ b/src/lib/asn1/asn1_time.cpp
@@ -2,7 +2,7 @@
* X.509 Time 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)
*/
#include <botan/asn1_time.h>
diff --git a/src/lib/asn1/asn1_time.h b/src/lib/asn1/asn1_time.h
index 95baacd86..6650f2fd4 100644
--- a/src/lib/asn1/asn1_time.h
+++ b/src/lib/asn1/asn1_time.h
@@ -2,7 +2,7 @@
* ASN.1 Time Representation
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ASN1_TIME_H__
diff --git a/src/lib/asn1/ber_dec.cpp b/src/lib/asn1/ber_dec.cpp
index c74377389..0ff79399c 100644
--- a/src/lib/asn1/ber_dec.cpp
+++ b/src/lib/asn1/ber_dec.cpp
@@ -2,7 +2,7 @@
* BER Decoder
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ber_dec.h>
diff --git a/src/lib/asn1/ber_dec.h b/src/lib/asn1/ber_dec.h
index ebfa91c85..98cfcb10f 100644
--- a/src/lib/asn1/ber_dec.h
+++ b/src/lib/asn1/ber_dec.h
@@ -2,7 +2,7 @@
* BER Decoder
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_BER_DECODER_H__
diff --git a/src/lib/asn1/der_enc.cpp b/src/lib/asn1/der_enc.cpp
index c1e5fd45c..ab84c258d 100644
--- a/src/lib/asn1/der_enc.cpp
+++ b/src/lib/asn1/der_enc.cpp
@@ -2,7 +2,7 @@
* DER Encoder
* (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/der_enc.h>
diff --git a/src/lib/asn1/der_enc.h b/src/lib/asn1/der_enc.h
index 61efb27b1..0e96fea3b 100644
--- a/src/lib/asn1/der_enc.h
+++ b/src/lib/asn1/der_enc.h
@@ -2,7 +2,7 @@
* DER Encoder
* (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_DER_ENCODER_H__
diff --git a/src/lib/asn1/oid_lookup/default.cpp b/src/lib/asn1/oid_lookup/default.cpp
index 7500f70bb..161607ad2 100644
--- a/src/lib/asn1/oid_lookup/default.cpp
+++ b/src/lib/asn1/oid_lookup/default.cpp
@@ -2,7 +2,7 @@
* OID Registry
* (C) 1999-2010,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/oids.h>
diff --git a/src/lib/asn1/oid_lookup/oids.cpp b/src/lib/asn1/oid_lookup/oids.cpp
index 93170ab7f..6584e8682 100644
--- a/src/lib/asn1/oid_lookup/oids.cpp
+++ b/src/lib/asn1/oid_lookup/oids.cpp
@@ -2,7 +2,7 @@
* OID Registry
* (C) 1999-2008,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/oids.h>
diff --git a/src/lib/asn1/oid_lookup/oids.h b/src/lib/asn1/oid_lookup/oids.h
index 27533202f..28f22447b 100644
--- a/src/lib/asn1/oid_lookup/oids.h
+++ b/src/lib/asn1/oid_lookup/oids.h
@@ -2,7 +2,7 @@
* OID Registry
* (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_OIDS_H__
diff --git a/src/lib/asn1/x509_dn.cpp b/src/lib/asn1/x509_dn.cpp
index 672e18f18..ff4a73ebb 100644
--- a/src/lib/asn1/x509_dn.cpp
+++ b/src/lib/asn1/x509_dn.cpp
@@ -2,7 +2,7 @@
* X509_DN
* (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/x509_dn.h>
diff --git a/src/lib/asn1/x509_dn.h b/src/lib/asn1/x509_dn.h
index e37fe6627..43e0103bd 100644
--- a/src/lib/asn1/x509_dn.h
+++ b/src/lib/asn1/x509_dn.h
@@ -2,7 +2,7 @@
* X.509 Distinguished Name
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_X509_DN_H__
diff --git a/src/lib/benchmark/benchmark.cpp b/src/lib/benchmark/benchmark.cpp
index c0a680358..0508af79d 100644
--- a/src/lib/benchmark/benchmark.cpp
+++ b/src/lib/benchmark/benchmark.cpp
@@ -2,7 +2,7 @@
* Runtime benchmarking
* (C) 2008-2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/benchmark.h>
diff --git a/src/lib/benchmark/benchmark.h b/src/lib/benchmark/benchmark.h
index 40784a767..8dda48497 100644
--- a/src/lib/benchmark/benchmark.h
+++ b/src/lib/benchmark/benchmark.h
@@ -2,7 +2,7 @@
* Runtime benchmarking
* (C) 2008-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_RUNTIME_BENCHMARK_H__
diff --git a/src/lib/block/aes/aes.cpp b/src/lib/block/aes/aes.cpp
index f8d632c44..8180231ca 100644
--- a/src/lib/block/aes/aes.cpp
+++ b/src/lib/block/aes/aes.cpp
@@ -4,7 +4,7 @@
*
* Based on the public domain reference implemenation
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/aes.h>
diff --git a/src/lib/block/aes/aes.h b/src/lib/block/aes/aes.h
index 5ddd39b08..b57d4ce65 100644
--- a/src/lib/block/aes/aes.h
+++ b/src/lib/block/aes/aes.h
@@ -2,7 +2,7 @@
* AES
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_AES_H__
diff --git a/src/lib/block/aes_ni/aes_ni.cpp b/src/lib/block/aes_ni/aes_ni.cpp
index c752d359c..aa061b3c1 100644
--- a/src/lib/block/aes_ni/aes_ni.cpp
+++ b/src/lib/block/aes_ni/aes_ni.cpp
@@ -2,7 +2,7 @@
* AES using AES-NI instructions
* (C) 2009,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/aes_ni.h>
diff --git a/src/lib/block/aes_ni/aes_ni.h b/src/lib/block/aes_ni/aes_ni.h
index aac6b0808..f329b409e 100644
--- a/src/lib/block/aes_ni/aes_ni.h
+++ b/src/lib/block/aes_ni/aes_ni.h
@@ -2,7 +2,7 @@
* AES using AES-NI instructions
* (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_AES_NI_H__
diff --git a/src/lib/block/aes_ssse3/aes_ssse3.cpp b/src/lib/block/aes_ssse3/aes_ssse3.cpp
index 476b004bb..40f0a5c8e 100644
--- a/src/lib/block/aes_ssse3/aes_ssse3.cpp
+++ b/src/lib/block/aes_ssse3/aes_ssse3.cpp
@@ -7,7 +7,7 @@
* with Vector Permute Instructions" (CHES 2009). His original code is
* available at http://crypto.stanford.edu/vpaes/
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/aes_ssse3.h>
diff --git a/src/lib/block/aes_ssse3/aes_ssse3.h b/src/lib/block/aes_ssse3/aes_ssse3.h
index 938abeae3..4e3df39e9 100644
--- a/src/lib/block/aes_ssse3/aes_ssse3.h
+++ b/src/lib/block/aes_ssse3/aes_ssse3.h
@@ -2,7 +2,7 @@
* AES using SSSE3
* (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_AES_SSSE3_H__
diff --git a/src/lib/block/block_cipher.h b/src/lib/block/block_cipher.h
index 5cbd6bdae..19dbc8e57 100644
--- a/src/lib/block/block_cipher.h
+++ b/src/lib/block/block_cipher.h
@@ -2,7 +2,7 @@
* Block Cipher Base Class
* (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_BLOCK_CIPHER_H__
diff --git a/src/lib/block/blowfish/blfs_tab.cpp b/src/lib/block/blowfish/blfs_tab.cpp
index 070fa6c69..d5ea9cfdf 100644
--- a/src/lib/block/blowfish/blfs_tab.cpp
+++ b/src/lib/block/blowfish/blfs_tab.cpp
@@ -2,7 +2,7 @@
* S-Box and P-Box Tables for Blowfish
* (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/blowfish.h>
diff --git a/src/lib/block/blowfish/blowfish.cpp b/src/lib/block/blowfish/blowfish.cpp
index b896033f4..d388f9d97 100644
--- a/src/lib/block/blowfish/blowfish.cpp
+++ b/src/lib/block/blowfish/blowfish.cpp
@@ -2,7 +2,7 @@
* Blowfish
* (C) 1999-2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/blowfish.h>
diff --git a/src/lib/block/blowfish/blowfish.h b/src/lib/block/blowfish/blowfish.h
index cdf65f285..8653bb7d6 100644
--- a/src/lib/block/blowfish/blowfish.h
+++ b/src/lib/block/blowfish/blowfish.h
@@ -2,7 +2,7 @@
* Blowfish
* (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_BLOWFISH_H__
diff --git a/src/lib/block/camellia/camellia.cpp b/src/lib/block/camellia/camellia.cpp
index a5d70d736..2ee4251d7 100644
--- a/src/lib/block/camellia/camellia.cpp
+++ b/src/lib/block/camellia/camellia.cpp
@@ -2,7 +2,7 @@
* Camellia
* (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/camellia.h>
diff --git a/src/lib/block/camellia/camellia.h b/src/lib/block/camellia/camellia.h
index 09f420765..ea08ce2a2 100644
--- a/src/lib/block/camellia/camellia.h
+++ b/src/lib/block/camellia/camellia.h
@@ -2,7 +2,7 @@
* Camellia
* (C) 2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_CAMELLIA_H__
diff --git a/src/lib/block/camellia/camellia_sbox.h b/src/lib/block/camellia/camellia_sbox.h
index 24c849a16..874beb4ce 100644
--- a/src/lib/block/camellia/camellia_sbox.h
+++ b/src/lib/block/camellia/camellia_sbox.h
@@ -2,7 +2,7 @@
* Camellia SBox Tables
* (C) 2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_CAMELLIA_SBOX_H__
diff --git a/src/lib/block/cascade/cascade.cpp b/src/lib/block/cascade/cascade.cpp
index 67846204d..98e862de9 100644
--- a/src/lib/block/cascade/cascade.cpp
+++ b/src/lib/block/cascade/cascade.cpp
@@ -2,7 +2,7 @@
* Block Cipher Cascade
* (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/cascade.h>
diff --git a/src/lib/block/cascade/cascade.h b/src/lib/block/cascade/cascade.h
index 011c2a2bf..440f5c8f4 100644
--- a/src/lib/block/cascade/cascade.h
+++ b/src/lib/block/cascade/cascade.h
@@ -2,7 +2,7 @@
* Block Cipher Cascade
* (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_CASCADE_H__
diff --git a/src/lib/block/cast/cast128.cpp b/src/lib/block/cast/cast128.cpp
index 169b18f01..e28106c55 100644
--- a/src/lib/block/cast/cast128.cpp
+++ b/src/lib/block/cast/cast128.cpp
@@ -2,7 +2,7 @@
* CAST-128
* (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/cast128.h>
diff --git a/src/lib/block/cast/cast128.h b/src/lib/block/cast/cast128.h
index 233c1e478..ed28d6a71 100644
--- a/src/lib/block/cast/cast128.h
+++ b/src/lib/block/cast/cast128.h
@@ -2,7 +2,7 @@
* CAST-128
* (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_CAST128_H__
diff --git a/src/lib/block/cast/cast256.cpp b/src/lib/block/cast/cast256.cpp
index 0c4dbb941..8dc78c11e 100644
--- a/src/lib/block/cast/cast256.cpp
+++ b/src/lib/block/cast/cast256.cpp
@@ -2,7 +2,7 @@
* CAST-256
* (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/cast256.h>
diff --git a/src/lib/block/cast/cast256.h b/src/lib/block/cast/cast256.h
index cd4572c4d..206b4d83e 100644
--- a/src/lib/block/cast/cast256.h
+++ b/src/lib/block/cast/cast256.h
@@ -2,7 +2,7 @@
* CAST-256
* (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_CAST256_H__
diff --git a/src/lib/block/cast/cast_sboxes.h b/src/lib/block/cast/cast_sboxes.h
index 95578c4a0..f73ce8142 100644
--- a/src/lib/block/cast/cast_sboxes.h
+++ b/src/lib/block/cast/cast_sboxes.h
@@ -2,7 +2,7 @@
* S-Box Tables for CAST-128 and CAST-256
* (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_CAST_SBOX_TABLES_H__
diff --git a/src/lib/block/des/des.cpp b/src/lib/block/des/des.cpp
index a87b4d6bc..3b6c2ee4a 100644
--- a/src/lib/block/des/des.cpp
+++ b/src/lib/block/des/des.cpp
@@ -5,7 +5,7 @@
* Based on a public domain implemenation by Phil Karn (who in turn
* credited Richard Outerbridge and Jim Gillogly)
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/des.h>
diff --git a/src/lib/block/des/des.h b/src/lib/block/des/des.h
index 4f3811bcf..aa201e560 100644
--- a/src/lib/block/des/des.h
+++ b/src/lib/block/des/des.h
@@ -2,7 +2,7 @@
* DES
* (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_DES_H__
diff --git a/src/lib/block/des/des_tab.cpp b/src/lib/block/des/des_tab.cpp
index b46ca3063..0f8179995 100644
--- a/src/lib/block/des/des_tab.cpp
+++ b/src/lib/block/des/des_tab.cpp
@@ -2,7 +2,7 @@
* Substitution/Permutation Tables for DES
* (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/des.h>
diff --git a/src/lib/block/des/desx.cpp b/src/lib/block/des/desx.cpp
index 879e73ee9..2e5274932 100644
--- a/src/lib/block/des/desx.cpp
+++ b/src/lib/block/des/desx.cpp
@@ -2,7 +2,7 @@
* DES
* (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/desx.h>
diff --git a/src/lib/block/des/desx.h b/src/lib/block/des/desx.h
index aeda3f3c4..f324ed7d5 100644
--- a/src/lib/block/des/desx.h
+++ b/src/lib/block/des/desx.h
@@ -2,7 +2,7 @@
* DESX
* (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_DESX_H__
diff --git a/src/lib/block/gost_28147/gost_28147.cpp b/src/lib/block/gost_28147/gost_28147.cpp
index 09ca9a57e..f70072f22 100644
--- a/src/lib/block/gost_28147/gost_28147.cpp
+++ b/src/lib/block/gost_28147/gost_28147.cpp
@@ -2,7 +2,7 @@
* GOST 28147-89
* (C) 1999-2009,2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/gost_28147.h>
diff --git a/src/lib/block/gost_28147/gost_28147.h b/src/lib/block/gost_28147/gost_28147.h
index 34b99197e..6d6e546f2 100644
--- a/src/lib/block/gost_28147/gost_28147.h
+++ b/src/lib/block/gost_28147/gost_28147.h
@@ -2,7 +2,7 @@
* GOST 28147-89
* (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_GOST_28147_89_H__
diff --git a/src/lib/block/idea/idea.cpp b/src/lib/block/idea/idea.cpp
index 61a938c57..2d282461d 100644
--- a/src/lib/block/idea/idea.cpp
+++ b/src/lib/block/idea/idea.cpp
@@ -2,7 +2,7 @@
* IDEA
* (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/idea.h>
diff --git a/src/lib/block/idea/idea.h b/src/lib/block/idea/idea.h
index da5dc4cb6..3c01ad873 100644
--- a/src/lib/block/idea/idea.h
+++ b/src/lib/block/idea/idea.h
@@ -2,7 +2,7 @@
* IDEA
* (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_IDEA_H__
diff --git a/src/lib/block/idea_sse2/idea_sse2.cpp b/src/lib/block/idea_sse2/idea_sse2.cpp
index 70698560d..389fbdd2b 100644
--- a/src/lib/block/idea_sse2/idea_sse2.cpp
+++ b/src/lib/block/idea_sse2/idea_sse2.cpp
@@ -2,7 +2,7 @@
* IDEA in SSE2
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/idea_sse2.h>
diff --git a/src/lib/block/idea_sse2/idea_sse2.h b/src/lib/block/idea_sse2/idea_sse2.h
index 8e475568e..10d19688e 100644
--- a/src/lib/block/idea_sse2/idea_sse2.h
+++ b/src/lib/block/idea_sse2/idea_sse2.h
@@ -2,7 +2,7 @@
* IDEA in SSE2
* (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_IDEA_SSE2_H__
diff --git a/src/lib/block/kasumi/kasumi.cpp b/src/lib/block/kasumi/kasumi.cpp
index 69f146ebb..53321e94d 100644
--- a/src/lib/block/kasumi/kasumi.cpp
+++ b/src/lib/block/kasumi/kasumi.cpp
@@ -2,7 +2,7 @@
* KASUMI
* (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/kasumi.h>
diff --git a/src/lib/block/kasumi/kasumi.h b/src/lib/block/kasumi/kasumi.h
index b91a2eb77..97e8dbb31 100644
--- a/src/lib/block/kasumi/kasumi.h
+++ b/src/lib/block/kasumi/kasumi.h
@@ -2,7 +2,7 @@
* KASUMI
* (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_KASUMI_H__
diff --git a/src/lib/block/lion/lion.cpp b/src/lib/block/lion/lion.cpp
index 95f703f8b..7e18eec56 100644
--- a/src/lib/block/lion/lion.cpp
+++ b/src/lib/block/lion/lion.cpp
@@ -2,7 +2,7 @@
* Lion
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/lion.h>
diff --git a/src/lib/block/lion/lion.h b/src/lib/block/lion/lion.h
index 345cd5da0..451ee9f88 100644
--- a/src/lib/block/lion/lion.h
+++ b/src/lib/block/lion/lion.h
@@ -2,7 +2,7 @@
* Lion
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_LION_H__
diff --git a/src/lib/block/mars/mars.cpp b/src/lib/block/mars/mars.cpp
index ca4e6f5c7..6821738dd 100644
--- a/src/lib/block/mars/mars.cpp
+++ b/src/lib/block/mars/mars.cpp
@@ -2,7 +2,7 @@
* MARS
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/mars.h>
diff --git a/src/lib/block/mars/mars.h b/src/lib/block/mars/mars.h
index 90f6480e6..90de963ce 100644
--- a/src/lib/block/mars/mars.h
+++ b/src/lib/block/mars/mars.h
@@ -2,7 +2,7 @@
* MARS
* (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_MARS_H__
diff --git a/src/lib/block/misty1/misty1.cpp b/src/lib/block/misty1/misty1.cpp
index 98f20eee8..d6ffda945 100644
--- a/src/lib/block/misty1/misty1.cpp
+++ b/src/lib/block/misty1/misty1.cpp
@@ -2,7 +2,7 @@
* MISTY1
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/misty1.h>
diff --git a/src/lib/block/misty1/misty1.h b/src/lib/block/misty1/misty1.h
index 40917b08b..17b617283 100644
--- a/src/lib/block/misty1/misty1.h
+++ b/src/lib/block/misty1/misty1.h
@@ -2,7 +2,7 @@
* MISTY1
* (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_MISTY1_H__
diff --git a/src/lib/block/noekeon/noekeon.cpp b/src/lib/block/noekeon/noekeon.cpp
index 53e67e5e6..aa593c95f 100644
--- a/src/lib/block/noekeon/noekeon.cpp
+++ b/src/lib/block/noekeon/noekeon.cpp
@@ -2,7 +2,7 @@
* Noekeon
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/noekeon.h>
diff --git a/src/lib/block/noekeon/noekeon.h b/src/lib/block/noekeon/noekeon.h
index 108b34cd6..36be5903c 100644
--- a/src/lib/block/noekeon/noekeon.h
+++ b/src/lib/block/noekeon/noekeon.h
@@ -2,7 +2,7 @@
* Noekeon
* (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_NOEKEON_H__
diff --git a/src/lib/block/noekeon_simd/noekeon_simd.cpp b/src/lib/block/noekeon_simd/noekeon_simd.cpp
index 2a4c1fd74..07fcf19ff 100644
--- a/src/lib/block/noekeon_simd/noekeon_simd.cpp
+++ b/src/lib/block/noekeon_simd/noekeon_simd.cpp
@@ -2,7 +2,7 @@
* Noekeon in SIMD
* (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/noekeon_simd.h>
diff --git a/src/lib/block/noekeon_simd/noekeon_simd.h b/src/lib/block/noekeon_simd/noekeon_simd.h
index 5cc2d8b09..eaf48a364 100644
--- a/src/lib/block/noekeon_simd/noekeon_simd.h
+++ b/src/lib/block/noekeon_simd/noekeon_simd.h
@@ -2,7 +2,7 @@
* Noekeon in SIMD
* (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_NOEKEON_SIMD_H__
diff --git a/src/lib/block/rc2/rc2.cpp b/src/lib/block/rc2/rc2.cpp
index d7c76a7a6..329b174e9 100644
--- a/src/lib/block/rc2/rc2.cpp
+++ b/src/lib/block/rc2/rc2.cpp
@@ -2,7 +2,7 @@
* RC2
* (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/rc2.h>
diff --git a/src/lib/block/rc2/rc2.h b/src/lib/block/rc2/rc2.h
index ae41c9ce2..1ae58e186 100644
--- a/src/lib/block/rc2/rc2.h
+++ b/src/lib/block/rc2/rc2.h
@@ -2,7 +2,7 @@
* RC2
* (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_RC2_H__
diff --git a/src/lib/block/rc5/rc5.cpp b/src/lib/block/rc5/rc5.cpp
index f370e6cfb..45067678f 100644
--- a/src/lib/block/rc5/rc5.cpp
+++ b/src/lib/block/rc5/rc5.cpp
@@ -2,7 +2,7 @@
* RC5
* (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/rc5.h>
diff --git a/src/lib/block/rc5/rc5.h b/src/lib/block/rc5/rc5.h
index 9055974e5..782d0592c 100644
--- a/src/lib/block/rc5/rc5.h
+++ b/src/lib/block/rc5/rc5.h
@@ -2,7 +2,7 @@
* RC5
* (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_RC5_H__
diff --git a/src/lib/block/rc6/rc6.cpp b/src/lib/block/rc6/rc6.cpp
index 01255954d..183395310 100644
--- a/src/lib/block/rc6/rc6.cpp
+++ b/src/lib/block/rc6/rc6.cpp
@@ -2,7 +2,7 @@
* RC6
* (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/rc6.h>
diff --git a/src/lib/block/rc6/rc6.h b/src/lib/block/rc6/rc6.h
index 4331c3e0f..282d56639 100644
--- a/src/lib/block/rc6/rc6.h
+++ b/src/lib/block/rc6/rc6.h
@@ -2,7 +2,7 @@
* RC6
* (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_RC6_H__
diff --git a/src/lib/block/safer/safer_sk.cpp b/src/lib/block/safer/safer_sk.cpp
index 3e93ab8cf..390e5d9bb 100644
--- a/src/lib/block/safer/safer_sk.cpp
+++ b/src/lib/block/safer/safer_sk.cpp
@@ -2,7 +2,7 @@
* SAFER-SK
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/safer_sk.h>
diff --git a/src/lib/block/safer/safer_sk.h b/src/lib/block/safer/safer_sk.h
index 043ecb456..d346c739e 100644
--- a/src/lib/block/safer/safer_sk.h
+++ b/src/lib/block/safer/safer_sk.h
@@ -2,7 +2,7 @@
* SAFER-SK
* (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_SAFER_SK_H__
diff --git a/src/lib/block/seed/seed.cpp b/src/lib/block/seed/seed.cpp
index d133e4153..833f9943f 100644
--- a/src/lib/block/seed/seed.cpp
+++ b/src/lib/block/seed/seed.cpp
@@ -2,7 +2,7 @@
* SEED
* (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/seed.h>
diff --git a/src/lib/block/seed/seed.h b/src/lib/block/seed/seed.h
index 25138a700..d98d6e798 100644
--- a/src/lib/block/seed/seed.h
+++ b/src/lib/block/seed/seed.h
@@ -2,7 +2,7 @@
* SEED
* (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_SEED_H__
diff --git a/src/lib/block/seed/seed_tab.cpp b/src/lib/block/seed/seed_tab.cpp
index 6ada36e52..eb2a9a2fc 100644
--- a/src/lib/block/seed/seed_tab.cpp
+++ b/src/lib/block/seed/seed_tab.cpp
@@ -2,7 +2,7 @@
* S-Box Tables for SEED
* (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/seed.h>
diff --git a/src/lib/block/serpent/serpent.cpp b/src/lib/block/serpent/serpent.cpp
index 7b75d6b84..f66cd2a32 100644
--- a/src/lib/block/serpent/serpent.cpp
+++ b/src/lib/block/serpent/serpent.cpp
@@ -2,7 +2,7 @@
* Serpent
* (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/serpent.h>
diff --git a/src/lib/block/serpent/serpent.h b/src/lib/block/serpent/serpent.h
index dc539c9f3..a3f5d0817 100644
--- a/src/lib/block/serpent/serpent.h
+++ b/src/lib/block/serpent/serpent.h
@@ -2,7 +2,7 @@
* Serpent
* (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_SERPENT_H__
diff --git a/src/lib/block/serpent/serpent_sbox.h b/src/lib/block/serpent/serpent_sbox.h
index fb396120e..afde289b1 100644
--- a/src/lib/block/serpent/serpent_sbox.h
+++ b/src/lib/block/serpent/serpent_sbox.h
@@ -5,7 +5,7 @@
* The sbox expressions used here were discovered by Dag Arne Osvik and
* are described in his paper "Speeding Up Serpent".
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SERPENT_SBOX_H__
diff --git a/src/lib/block/serpent_simd/serp_simd.cpp b/src/lib/block/serpent_simd/serp_simd.cpp
index bedf20122..1a379efca 100644
--- a/src/lib/block/serpent_simd/serp_simd.cpp
+++ b/src/lib/block/serpent_simd/serp_simd.cpp
@@ -2,7 +2,7 @@
* Serpent (SIMD)
* (C) 2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/serp_simd.h>
diff --git a/src/lib/block/serpent_simd/serp_simd.h b/src/lib/block/serpent_simd/serp_simd.h
index b3c0b06c8..cde5bf112 100644
--- a/src/lib/block/serpent_simd/serp_simd.h
+++ b/src/lib/block/serpent_simd/serp_simd.h
@@ -2,7 +2,7 @@
* Serpent (SIMD)
* (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_SERPENT_SIMD_H__
diff --git a/src/lib/block/serpent_x86_32/serp_x86_32.cpp b/src/lib/block/serpent_x86_32/serp_x86_32.cpp
index afff5835c..5548e3496 100644
--- a/src/lib/block/serpent_x86_32/serp_x86_32.cpp
+++ b/src/lib/block/serpent_x86_32/serp_x86_32.cpp
@@ -2,7 +2,7 @@
* Serpent in x86-32
* (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/serp_x86_32.h>
diff --git a/src/lib/block/serpent_x86_32/serp_x86_32.h b/src/lib/block/serpent_x86_32/serp_x86_32.h
index f6c4d564a..89fb1a8fe 100644
--- a/src/lib/block/serpent_x86_32/serp_x86_32.h
+++ b/src/lib/block/serpent_x86_32/serp_x86_32.h
@@ -2,7 +2,7 @@
* Serpent in x86-32 asm
* (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_SERPENT_X86_32_H__
diff --git a/src/lib/block/serpent_x86_32/serp_x86_32_imp.S b/src/lib/block/serpent_x86_32/serp_x86_32_imp.S
index e2549a099..807c3fc54 100644
--- a/src/lib/block/serpent_x86_32/serp_x86_32_imp.S
+++ b/src/lib/block/serpent_x86_32/serp_x86_32_imp.S
@@ -2,7 +2,7 @@
* Serpent in x86-32 assembler
* (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/internal/asm_x86_32.h>
diff --git a/src/lib/block/tea/tea.cpp b/src/lib/block/tea/tea.cpp
index 2accab700..01f342607 100644
--- a/src/lib/block/tea/tea.cpp
+++ b/src/lib/block/tea/tea.cpp
@@ -2,7 +2,7 @@
* TEA
* (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/tea.h>
diff --git a/src/lib/block/tea/tea.h b/src/lib/block/tea/tea.h
index 0d203975e..55e6d8309 100644
--- a/src/lib/block/tea/tea.h
+++ b/src/lib/block/tea/tea.h
@@ -2,7 +2,7 @@
* TEA
* (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_TEA_H__
diff --git a/src/lib/block/threefish/threefish.cpp b/src/lib/block/threefish/threefish.cpp
index aa1b1ee81..f6636615b 100644
--- a/src/lib/block/threefish/threefish.cpp
+++ b/src/lib/block/threefish/threefish.cpp
@@ -2,7 +2,7 @@
* Threefish-512
* (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/threefish.h>
diff --git a/src/lib/block/threefish/threefish.h b/src/lib/block/threefish/threefish.h
index 0d3c6fb9d..6020b8a28 100644
--- a/src/lib/block/threefish/threefish.h
+++ b/src/lib/block/threefish/threefish.h
@@ -2,7 +2,7 @@
* Threefish
* (C) 2013,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_THREEFISH_H__
diff --git a/src/lib/block/threefish_avx2/threefish_avx2.cpp b/src/lib/block/threefish_avx2/threefish_avx2.cpp
index 9fad9bdcc..ee0ecde85 100644
--- a/src/lib/block/threefish_avx2/threefish_avx2.cpp
+++ b/src/lib/block/threefish_avx2/threefish_avx2.cpp
@@ -2,7 +2,7 @@
* Threefish-512
* (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/threefish_avx2.h>
diff --git a/src/lib/block/threefish_avx2/threefish_avx2.h b/src/lib/block/threefish_avx2/threefish_avx2.h
index ed0da00d6..ba24f114f 100644
--- a/src/lib/block/threefish_avx2/threefish_avx2.h
+++ b/src/lib/block/threefish_avx2/threefish_avx2.h
@@ -2,7 +2,7 @@
* Threefish-512 in AVX2
* (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_THREEFISH_AVX2_H__
diff --git a/src/lib/block/twofish/two_tab.cpp b/src/lib/block/twofish/two_tab.cpp
index 19ba58de6..6eb6b62f0 100644
--- a/src/lib/block/twofish/two_tab.cpp
+++ b/src/lib/block/twofish/two_tab.cpp
@@ -2,7 +2,7 @@
* S-Box and MDS Tables for Twofish
* (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/twofish.h>
diff --git a/src/lib/block/twofish/twofish.cpp b/src/lib/block/twofish/twofish.cpp
index 4ea8a799e..ffdf4b198 100644
--- a/src/lib/block/twofish/twofish.cpp
+++ b/src/lib/block/twofish/twofish.cpp
@@ -5,7 +5,7 @@
* The key schedule implemenation is based on a public domain
* implementation by Matthew Skala
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/twofish.h>
diff --git a/src/lib/block/twofish/twofish.h b/src/lib/block/twofish/twofish.h
index 3d8e47498..f6e030df2 100644
--- a/src/lib/block/twofish/twofish.h
+++ b/src/lib/block/twofish/twofish.h
@@ -2,7 +2,7 @@
* Twofish
* (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_TWOFISH_H__
diff --git a/src/lib/block/xtea/xtea.cpp b/src/lib/block/xtea/xtea.cpp
index 165a6ea6a..59060dff7 100644
--- a/src/lib/block/xtea/xtea.cpp
+++ b/src/lib/block/xtea/xtea.cpp
@@ -2,7 +2,7 @@
* XTEA
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/xtea.h>
diff --git a/src/lib/block/xtea/xtea.h b/src/lib/block/xtea/xtea.h
index 42acc35a5..4de0bea72 100644
--- a/src/lib/block/xtea/xtea.h
+++ b/src/lib/block/xtea/xtea.h
@@ -2,7 +2,7 @@
* XTEA
* (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_XTEA_H__
diff --git a/src/lib/block/xtea_simd/xtea_simd.cpp b/src/lib/block/xtea_simd/xtea_simd.cpp
index d684eca5a..87c7a20bf 100644
--- a/src/lib/block/xtea_simd/xtea_simd.cpp
+++ b/src/lib/block/xtea_simd/xtea_simd.cpp
@@ -2,7 +2,7 @@
* XTEA in SIMD
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/xtea_simd.h>
diff --git a/src/lib/block/xtea_simd/xtea_simd.h b/src/lib/block/xtea_simd/xtea_simd.h
index ecfdf90a5..451dc8c8d 100644
--- a/src/lib/block/xtea_simd/xtea_simd.h
+++ b/src/lib/block/xtea_simd/xtea_simd.h
@@ -2,7 +2,7 @@
* XTEA in SIMD
* (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_XTEA_SIMD_H__
diff --git a/src/lib/cert/cvc/asn1_eac_str.cpp b/src/lib/cert/cvc/asn1_eac_str.cpp
index 2084a9c03..2472eee17 100644
--- a/src/lib/cert/cvc/asn1_eac_str.cpp
+++ b/src/lib/cert/cvc/asn1_eac_str.cpp
@@ -3,7 +3,7 @@
* (C) 2007 FlexSecure GmbH
* 2008-2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/eac_asn_obj.h>
diff --git a/src/lib/cert/cvc/asn1_eac_tm.cpp b/src/lib/cert/cvc/asn1_eac_tm.cpp
index e40f555b3..6aad1067c 100644
--- a/src/lib/cert/cvc/asn1_eac_tm.cpp
+++ b/src/lib/cert/cvc/asn1_eac_tm.cpp
@@ -3,7 +3,7 @@
* (C) 2007 FlexSecure GmbH
* 2008-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/eac_asn_obj.h>
diff --git a/src/lib/cert/cvc/cvc_ado.cpp b/src/lib/cert/cvc/cvc_ado.cpp
index 54bc9facd..21a345808 100644
--- a/src/lib/cert/cvc/cvc_ado.cpp
+++ b/src/lib/cert/cvc/cvc_ado.cpp
@@ -3,7 +3,7 @@
* (C) 2007 FlexSecure GmbH
* 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/cvc_ado.h>
diff --git a/src/lib/cert/cvc/cvc_ado.h b/src/lib/cert/cvc/cvc_ado.h
index 6f5b1d527..4b861ec81 100644
--- a/src/lib/cert/cvc/cvc_ado.h
+++ b/src/lib/cert/cvc/cvc_ado.h
@@ -2,7 +2,7 @@
* EAC1_1 CVC ADO
* (C) 2008 Falko Strenzke
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_EAC_CVC_ADO_H__
diff --git a/src/lib/cert/cvc/cvc_cert.cpp b/src/lib/cert/cvc/cvc_cert.cpp
index 3ab78b7d4..cf6bc409a 100644
--- a/src/lib/cert/cvc/cvc_cert.cpp
+++ b/src/lib/cert/cvc/cvc_cert.cpp
@@ -1,8 +1,8 @@
/*
- (C) 2007 FlexSecure GmbH
- 2008-2010 Jack Lloyd
+* (C) 2007 FlexSecure GmbH
+* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/cvc_cert.h>
diff --git a/src/lib/cert/cvc/cvc_cert.h b/src/lib/cert/cvc/cvc_cert.h
index 7c084379f..a45388550 100644
--- a/src/lib/cert/cvc/cvc_cert.h
+++ b/src/lib/cert/cvc/cvc_cert.h
@@ -3,7 +3,7 @@
* (C) 2008 Falko Strenzke
* 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_CVC_EAC_H__
diff --git a/src/lib/cert/cvc/cvc_gen_cert.h b/src/lib/cert/cvc/cvc_gen_cert.h
index 7fa4eba29..02c6f7324 100644
--- a/src/lib/cert/cvc/cvc_gen_cert.h
+++ b/src/lib/cert/cvc/cvc_gen_cert.h
@@ -3,7 +3,7 @@
* (C) 2008 Falko Strenzke
* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_EAC_CVC_GEN_CERT_H__
diff --git a/src/lib/cert/cvc/cvc_req.cpp b/src/lib/cert/cvc/cvc_req.cpp
index 6c013f755..e142a5ac6 100644
--- a/src/lib/cert/cvc/cvc_req.cpp
+++ b/src/lib/cert/cvc/cvc_req.cpp
@@ -1,8 +1,8 @@
/*
- (C) 2007 FlexSecure GmbH
- 2008-2010 Jack Lloyd
+* (C) 2007 FlexSecure GmbH
+* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/cvc_req.h>
diff --git a/src/lib/cert/cvc/cvc_req.h b/src/lib/cert/cvc/cvc_req.h
index ac4e22453..b71a8e764 100644
--- a/src/lib/cert/cvc/cvc_req.h
+++ b/src/lib/cert/cvc/cvc_req.h
@@ -3,7 +3,7 @@
* (C) 2008 Falko Strenzke
* 2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_EAC_CVC_REQ_H__
diff --git a/src/lib/cert/cvc/cvc_self.cpp b/src/lib/cert/cvc/cvc_self.cpp
index 50c8a7c2a..fdc66bbfd 100644
--- a/src/lib/cert/cvc/cvc_self.cpp
+++ b/src/lib/cert/cvc/cvc_self.cpp
@@ -1,8 +1,8 @@
/*
- (C) 2007 FlexSecure GmbH
- 2008-2010 Jack Lloyd
+* (C) 2007 FlexSecure GmbH
+* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/cvc_self.h>
diff --git a/src/lib/cert/cvc/cvc_self.h b/src/lib/cert/cvc/cvc_self.h
index 1e6bbe49a..b29164a7f 100644
--- a/src/lib/cert/cvc/cvc_self.h
+++ b/src/lib/cert/cvc/cvc_self.h
@@ -3,7 +3,7 @@
* (C) 2007 FlexSecure GmbH
* 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_CVC_EAC_SELF_H__
diff --git a/src/lib/cert/cvc/eac_asn_obj.h b/src/lib/cert/cvc/eac_asn_obj.h
index 181daca2d..e102c65fb 100644
--- a/src/lib/cert/cvc/eac_asn_obj.h
+++ b/src/lib/cert/cvc/eac_asn_obj.h
@@ -3,7 +3,7 @@
* (C) 2007-2008 FlexSecure GmbH
* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_EAC_ASN1_OBJ_H__
diff --git a/src/lib/cert/cvc/eac_obj.h b/src/lib/cert/cvc/eac_obj.h
index 42274446c..b1e353ddf 100644
--- a/src/lib/cert/cvc/eac_obj.h
+++ b/src/lib/cert/cvc/eac_obj.h
@@ -2,7 +2,7 @@
* EAC1_1 objects
* (C) 2008 Falko Strenzke
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_EAC_OBJ_H__
diff --git a/src/lib/cert/cvc/ecdsa_sig.cpp b/src/lib/cert/cvc/ecdsa_sig.cpp
index 690244d50..5e85d7932 100644
--- a/src/lib/cert/cvc/ecdsa_sig.cpp
+++ b/src/lib/cert/cvc/ecdsa_sig.cpp
@@ -3,7 +3,7 @@
* (C) 2007 Falko Strenzke, FlexSecure GmbH
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ecdsa_sig.h>
diff --git a/src/lib/cert/cvc/ecdsa_sig.h b/src/lib/cert/cvc/ecdsa_sig.h
index 1c3b506cb..2845cbec9 100644
--- a/src/lib/cert/cvc/ecdsa_sig.h
+++ b/src/lib/cert/cvc/ecdsa_sig.h
@@ -3,7 +3,7 @@
* (C) 2007 Falko Strenzke, FlexSecure GmbH
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ECDSA_SIGNATURE_H__
diff --git a/src/lib/cert/cvc/signed_obj.cpp b/src/lib/cert/cvc/signed_obj.cpp
index 83c2c33dc..4a0f12008 100644
--- a/src/lib/cert/cvc/signed_obj.cpp
+++ b/src/lib/cert/cvc/signed_obj.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2007 FlexSecure GmbH
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/signed_obj.h>
diff --git a/src/lib/cert/cvc/signed_obj.h b/src/lib/cert/cvc/signed_obj.h
index ce2bd4dd7..a6b49c55b 100644
--- a/src/lib/cert/cvc/signed_obj.h
+++ b/src/lib/cert/cvc/signed_obj.h
@@ -3,7 +3,7 @@
* (C) 2007 FlexSecure GmbH
* 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_EAC_SIGNED_OBJECT_H__
diff --git a/src/lib/cert/x509/cert_status.h b/src/lib/cert/x509/cert_status.h
index 3b80253dc..56777cae8 100644
--- a/src/lib/cert/x509/cert_status.h
+++ b/src/lib/cert/x509/cert_status.h
@@ -2,7 +2,7 @@
* Result enums
* (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_X509_PATH_RESULT_H__
diff --git a/src/lib/cert/x509/certstor.cpp b/src/lib/cert/x509/certstor.cpp
index 41d971ff5..cbb0fd670 100644
--- a/src/lib/cert/x509/certstor.cpp
+++ b/src/lib/cert/x509/certstor.cpp
@@ -2,7 +2,7 @@
* Certificate Store
* (C) 1999-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/certstor.h>
diff --git a/src/lib/cert/x509/certstor.h b/src/lib/cert/x509/certstor.h
index 79a33f75d..6d6de2e7a 100644
--- a/src/lib/cert/x509/certstor.h
+++ b/src/lib/cert/x509/certstor.h
@@ -2,7 +2,7 @@
* Certificate Store
* (C) 1999-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_CERT_STORE_H__
diff --git a/src/lib/cert/x509/crl_ent.cpp b/src/lib/cert/x509/crl_ent.cpp
index a5663e6bb..1f2069baa 100644
--- a/src/lib/cert/x509/crl_ent.cpp
+++ b/src/lib/cert/x509/crl_ent.cpp
@@ -2,7 +2,7 @@
* CRL Entry
* (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/crl_ent.h>
diff --git a/src/lib/cert/x509/crl_ent.h b/src/lib/cert/x509/crl_ent.h
index e68008b70..7cf148fd9 100644
--- a/src/lib/cert/x509/crl_ent.h
+++ b/src/lib/cert/x509/crl_ent.h
@@ -2,7 +2,7 @@
* CRL Entry
* (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_CRL_ENTRY_H__
diff --git a/src/lib/cert/x509/key_constraint.cpp b/src/lib/cert/x509/key_constraint.cpp
index 8a4b3deb3..24791b34a 100644
--- a/src/lib/cert/x509/key_constraint.cpp
+++ b/src/lib/cert/x509/key_constraint.cpp
@@ -2,7 +2,7 @@
* KeyUsage
* (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/key_constraint.h>
diff --git a/src/lib/cert/x509/key_constraint.h b/src/lib/cert/x509/key_constraint.h
index 2c9b3778b..22ae7a32e 100644
--- a/src/lib/cert/x509/key_constraint.h
+++ b/src/lib/cert/x509/key_constraint.h
@@ -2,7 +2,7 @@
* Enumerations
* (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_ENUMS_H__
diff --git a/src/lib/cert/x509/ocsp.cpp b/src/lib/cert/x509/ocsp.cpp
index fab14fc84..feda10676 100644
--- a/src/lib/cert/x509/ocsp.cpp
+++ b/src/lib/cert/x509/ocsp.cpp
@@ -2,7 +2,7 @@
* OCSP
* (C) 2012,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ocsp.h>
diff --git a/src/lib/cert/x509/ocsp.h b/src/lib/cert/x509/ocsp.h
index 2a4866455..af0f81403 100644
--- a/src/lib/cert/x509/ocsp.h
+++ b/src/lib/cert/x509/ocsp.h
@@ -2,7 +2,7 @@
* OCSP
* (C) 2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_OCSP_H__
diff --git a/src/lib/cert/x509/ocsp_types.cpp b/src/lib/cert/x509/ocsp_types.cpp
index e02b4a871..0877f848d 100644
--- a/src/lib/cert/x509/ocsp_types.cpp
+++ b/src/lib/cert/x509/ocsp_types.cpp
@@ -2,7 +2,7 @@
* OCSP subtypes
* (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/ocsp_types.h>
diff --git a/src/lib/cert/x509/ocsp_types.h b/src/lib/cert/x509/ocsp_types.h
index a2983f10b..42a84c38b 100644
--- a/src/lib/cert/x509/ocsp_types.h
+++ b/src/lib/cert/x509/ocsp_types.h
@@ -2,7 +2,7 @@
* OCSP subtypes
* (C) 2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_OCSP_TYPES_H__
diff --git a/src/lib/cert/x509/pkcs10.cpp b/src/lib/cert/x509/pkcs10.cpp
index c67f74142..cb4be6d5f 100644
--- a/src/lib/cert/x509/pkcs10.cpp
+++ b/src/lib/cert/x509/pkcs10.cpp
@@ -2,7 +2,7 @@
* PKCS #10
* (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/pkcs10.h>
diff --git a/src/lib/cert/x509/pkcs10.h b/src/lib/cert/x509/pkcs10.h
index b54425133..0d73466bd 100644
--- a/src/lib/cert/x509/pkcs10.h
+++ b/src/lib/cert/x509/pkcs10.h
@@ -2,7 +2,7 @@
* PKCS #10
* (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_PKCS10_H__
diff --git a/src/lib/cert/x509/x509_ca.cpp b/src/lib/cert/x509/x509_ca.cpp
index 3a849a29f..7703c49fd 100644
--- a/src/lib/cert/x509/x509_ca.cpp
+++ b/src/lib/cert/x509/x509_ca.cpp
@@ -2,7 +2,7 @@
* X.509 Certificate Authority
* (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/x509_ca.h>
diff --git a/src/lib/cert/x509/x509_ca.h b/src/lib/cert/x509/x509_ca.h
index d37b02eaf..6dc65493e 100644
--- a/src/lib/cert/x509/x509_ca.h
+++ b/src/lib/cert/x509/x509_ca.h
@@ -2,7 +2,7 @@
* X.509 Certificate Authority
* (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_X509_CA_H__
diff --git a/src/lib/cert/x509/x509_crl.cpp b/src/lib/cert/x509/x509_crl.cpp
index 29495a627..e3dfb787e 100644
--- a/src/lib/cert/x509/x509_crl.cpp
+++ b/src/lib/cert/x509/x509_crl.cpp
@@ -2,7 +2,7 @@
* X.509 CRL
* (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/x509_crl.h>
diff --git a/src/lib/cert/x509/x509_crl.h b/src/lib/cert/x509/x509_crl.h
index 3e45df121..1897d8d59 100644
--- a/src/lib/cert/x509/x509_crl.h
+++ b/src/lib/cert/x509/x509_crl.h
@@ -2,7 +2,7 @@
* X.509 CRL
* (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_X509_CRL_H__
diff --git a/src/lib/cert/x509/x509_ext.cpp b/src/lib/cert/x509/x509_ext.cpp
index db43ab175..78c9ceec6 100644
--- a/src/lib/cert/x509/x509_ext.cpp
+++ b/src/lib/cert/x509/x509_ext.cpp
@@ -2,7 +2,7 @@
* X.509 Certificate Extensions
* (C) 1999-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/x509_ext.h>
diff --git a/src/lib/cert/x509/x509_ext.h b/src/lib/cert/x509/x509_ext.h
index 963a0ea68..352a61d88 100644
--- a/src/lib/cert/x509/x509_ext.h
+++ b/src/lib/cert/x509/x509_ext.h
@@ -2,7 +2,7 @@
* X.509 Certificate Extensions
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_X509_EXTENSIONS_H__
diff --git a/src/lib/cert/x509/x509_obj.cpp b/src/lib/cert/x509/x509_obj.cpp
index 64e995dd3..746fc7312 100644
--- a/src/lib/cert/x509/x509_obj.cpp
+++ b/src/lib/cert/x509/x509_obj.cpp
@@ -2,7 +2,7 @@
* X.509 SIGNED Object
* (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/x509_obj.h>
diff --git a/src/lib/cert/x509/x509_obj.h b/src/lib/cert/x509/x509_obj.h
index be08957df..ec6bd530c 100644
--- a/src/lib/cert/x509/x509_obj.h
+++ b/src/lib/cert/x509/x509_obj.h
@@ -2,7 +2,7 @@
* X.509 SIGNED Object
* (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_X509_OBJECT_H__
diff --git a/src/lib/cert/x509/x509cert.cpp b/src/lib/cert/x509/x509cert.cpp
index b30f97964..f901001ac 100644
--- a/src/lib/cert/x509/x509cert.cpp
+++ b/src/lib/cert/x509/x509cert.cpp
@@ -2,7 +2,7 @@
* X.509 Certificates
* (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/x509cert.h>
diff --git a/src/lib/cert/x509/x509cert.h b/src/lib/cert/x509/x509cert.h
index bd341b6e0..563b900f2 100644
--- a/src/lib/cert/x509/x509cert.h
+++ b/src/lib/cert/x509/x509cert.h
@@ -2,7 +2,7 @@
* X.509 Certificates
* (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_X509_CERTS_H__
diff --git a/src/lib/cert/x509/x509opt.cpp b/src/lib/cert/x509/x509opt.cpp
index 8a27fdbde..c620ab25b 100644
--- a/src/lib/cert/x509/x509opt.cpp
+++ b/src/lib/cert/x509/x509opt.cpp
@@ -2,7 +2,7 @@
* X.509 Certificate Options
* (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/x509self.h>
diff --git a/src/lib/cert/x509/x509path.cpp b/src/lib/cert/x509/x509path.cpp
index c8accc874..111c4c3b7 100644
--- a/src/lib/cert/x509/x509path.cpp
+++ b/src/lib/cert/x509/x509path.cpp
@@ -2,7 +2,7 @@
* X.509 Certificate Path Validation
* (C) 2010,2011,2012,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/x509path.h>
diff --git a/src/lib/cert/x509/x509path.h b/src/lib/cert/x509/x509path.h
index 05ed43a2e..6f3ab115f 100644
--- a/src/lib/cert/x509/x509path.h
+++ b/src/lib/cert/x509/x509path.h
@@ -2,7 +2,7 @@
* X.509 Cert Path Validation
* (C) 2010-2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_X509_CERT_PATH_VALIDATION_H__
diff --git a/src/lib/cert/x509/x509self.cpp b/src/lib/cert/x509/x509self.cpp
index ceca63413..2f2f6a59f 100644
--- a/src/lib/cert/x509/x509self.cpp
+++ b/src/lib/cert/x509/x509self.cpp
@@ -2,7 +2,7 @@
* PKCS #10/Self Signed Cert Creation
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/x509self.h>
diff --git a/src/lib/cert/x509/x509self.h b/src/lib/cert/x509/x509self.h
index eee4d10c6..d15aabc59 100644
--- a/src/lib/cert/x509/x509self.h
+++ b/src/lib/cert/x509/x509self.h
@@ -2,7 +2,7 @@
* X.509 Self-Signed Certificate
* (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_X509_SELF_H__
diff --git a/src/lib/checksum/adler32/adler32.cpp b/src/lib/checksum/adler32/adler32.cpp
index 62589733f..f368b627c 100644
--- a/src/lib/checksum/adler32/adler32.cpp
+++ b/src/lib/checksum/adler32/adler32.cpp
@@ -2,7 +2,7 @@
* Adler32
* (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/adler32.h>
diff --git a/src/lib/checksum/adler32/adler32.h b/src/lib/checksum/adler32/adler32.h
index dc2872ca1..f3767b786 100644
--- a/src/lib/checksum/adler32/adler32.h
+++ b/src/lib/checksum/adler32/adler32.h
@@ -2,7 +2,7 @@
* Adler32
* (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_ADLER32_H__
diff --git a/src/lib/checksum/crc24/crc24.cpp b/src/lib/checksum/crc24/crc24.cpp
index d641047a2..4ca942aaa 100644
--- a/src/lib/checksum/crc24/crc24.cpp
+++ b/src/lib/checksum/crc24/crc24.cpp
@@ -2,7 +2,7 @@
* CRC24
* (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/crc24.h>
diff --git a/src/lib/checksum/crc24/crc24.h b/src/lib/checksum/crc24/crc24.h
index b5faebcee..a5cc090ad 100644
--- a/src/lib/checksum/crc24/crc24.h
+++ b/src/lib/checksum/crc24/crc24.h
@@ -2,7 +2,7 @@
* CRC24
* (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_CRC24_H__
diff --git a/src/lib/checksum/crc32/crc32.cpp b/src/lib/checksum/crc32/crc32.cpp
index 574e13bae..10d989cc6 100644
--- a/src/lib/checksum/crc32/crc32.cpp
+++ b/src/lib/checksum/crc32/crc32.cpp
@@ -2,7 +2,7 @@
* CRC32
* (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/crc32.h>
diff --git a/src/lib/checksum/crc32/crc32.h b/src/lib/checksum/crc32/crc32.h
index dec3d0449..503b18b7a 100644
--- a/src/lib/checksum/crc32/crc32.h
+++ b/src/lib/checksum/crc32/crc32.h
@@ -2,7 +2,7 @@
* CRC32
* (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_CRC32_H__
diff --git a/src/lib/codec/base64/base64.cpp b/src/lib/codec/base64/base64.cpp
index 284ae56f2..9e463e680 100644
--- a/src/lib/codec/base64/base64.cpp
+++ b/src/lib/codec/base64/base64.cpp
@@ -2,7 +2,7 @@
* Base64 Encoding and Decoding
* (C) 2010,2015 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/base64.h>
diff --git a/src/lib/codec/base64/base64.h b/src/lib/codec/base64/base64.h
index 9ea4143b7..ab7bb5a1c 100644
--- a/src/lib/codec/base64/base64.h
+++ b/src/lib/codec/base64/base64.h
@@ -2,7 +2,7 @@
* Base64 Encoding and Decoding
* (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_BASE64_CODEC_H__
diff --git a/src/lib/codec/hex/hex.cpp b/src/lib/codec/hex/hex.cpp
index 104125894..21c5a5a03 100644
--- a/src/lib/codec/hex/hex.cpp
+++ b/src/lib/codec/hex/hex.cpp
@@ -2,7 +2,7 @@
* Hex Encoding and Decoding
* (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/hex.h>
diff --git a/src/lib/codec/hex/hex.h b/src/lib/codec/hex/hex.h
index a64a6c8df..bd57ec88e 100644
--- a/src/lib/codec/hex/hex.h
+++ b/src/lib/codec/hex/hex.h
@@ -2,7 +2,7 @@
* Hex Encoding and Decoding
* (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_HEX_CODEC_H__
diff --git a/src/lib/codec/openpgp/openpgp.cpp b/src/lib/codec/openpgp/openpgp.cpp
index 7bd811a2f..3a464d906 100644
--- a/src/lib/codec/openpgp/openpgp.cpp
+++ b/src/lib/codec/openpgp/openpgp.cpp
@@ -2,7 +2,7 @@
* OpenPGP Codec
* (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/openpgp.h>
diff --git a/src/lib/codec/openpgp/openpgp.h b/src/lib/codec/openpgp/openpgp.h
index de56155f2..538b31342 100644
--- a/src/lib/codec/openpgp/openpgp.h
+++ b/src/lib/codec/openpgp/openpgp.h
@@ -2,7 +2,7 @@
* OpenPGP Codec
* (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_OPENPGP_CODEC_H__
diff --git a/src/lib/codec/pem/pem.cpp b/src/lib/codec/pem/pem.cpp
index 03ec33440..9b57c1531 100644
--- a/src/lib/codec/pem/pem.cpp
+++ b/src/lib/codec/pem/pem.cpp
@@ -2,7 +2,7 @@
* PEM Encoding/Decoding
* (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/pem.h>
diff --git a/src/lib/codec/pem/pem.h b/src/lib/codec/pem/pem.h
index a0c6f74aa..3b3fec32e 100644
--- a/src/lib/codec/pem/pem.h
+++ b/src/lib/codec/pem/pem.h
@@ -2,7 +2,7 @@
* PEM Encoding/Decoding
* (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_PEM_H__
diff --git a/src/lib/compression/bzip2/bzip2.cpp b/src/lib/compression/bzip2/bzip2.cpp
index ed464d332..471635e3e 100644
--- a/src/lib/compression/bzip2/bzip2.cpp
+++ b/src/lib/compression/bzip2/bzip2.cpp
@@ -4,7 +4,7 @@
* 2001-2007,2014 Jack Lloyd
* 2006 Matt Johnston
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/bzip2.h>
diff --git a/src/lib/compression/bzip2/bzip2.h b/src/lib/compression/bzip2/bzip2.h
index 6d033e430..d958cbfe7 100644
--- a/src/lib/compression/bzip2/bzip2.h
+++ b/src/lib/compression/bzip2/bzip2.h
@@ -3,7 +3,7 @@
* (C) 2001 Peter J Jones
* 2001-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_BZIP2_H__
diff --git a/src/lib/compression/comp_util.cpp b/src/lib/compression/comp_util.cpp
index 5f2e37d49..77b381c4e 100644
--- a/src/lib/compression/comp_util.cpp
+++ b/src/lib/compression/comp_util.cpp
@@ -2,7 +2,7 @@
* Allocation Tracker
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/comp_util.h>
diff --git a/src/lib/compression/comp_util.h b/src/lib/compression/comp_util.h
index 15fc23418..92989e518 100644
--- a/src/lib/compression/comp_util.h
+++ b/src/lib/compression/comp_util.h
@@ -2,7 +2,7 @@
* Shared code for compression libraries
* (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_COMPRESSION_UTILS_H__
diff --git a/src/lib/compression/compression.cpp b/src/lib/compression/compression.cpp
index 191d894c4..428271e9a 100644
--- a/src/lib/compression/compression.cpp
+++ b/src/lib/compression/compression.cpp
@@ -2,7 +2,7 @@
* Compression Transform
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/compression.h>
diff --git a/src/lib/compression/compression.h b/src/lib/compression/compression.h
index 68b25886b..b38d94f64 100644
--- a/src/lib/compression/compression.h
+++ b/src/lib/compression/compression.h
@@ -2,7 +2,7 @@
* Compression Transform
* (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_COMPRESSION_TRANSFORM_H__
diff --git a/src/lib/compression/lzma/lzma.cpp b/src/lib/compression/lzma/lzma.cpp
index d145ed305..0aadf1513 100644
--- a/src/lib/compression/lzma/lzma.cpp
+++ b/src/lib/compression/lzma/lzma.cpp
@@ -5,7 +5,7 @@
* 2006 Matt Johnston
* 2012 Vojtech Kral
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/lzma.h>
diff --git a/src/lib/compression/lzma/lzma.h b/src/lib/compression/lzma/lzma.h
index 0761a8194..8a142c192 100644
--- a/src/lib/compression/lzma/lzma.h
+++ b/src/lib/compression/lzma/lzma.h
@@ -4,7 +4,7 @@
* 2001-2007 Jack Lloyd
* 2012 Vojtech Kral
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_LZMA_H__
diff --git a/src/lib/compression/zlib/zlib.cpp b/src/lib/compression/zlib/zlib.cpp
index b31420254..10581b739 100644
--- a/src/lib/compression/zlib/zlib.cpp
+++ b/src/lib/compression/zlib/zlib.cpp
@@ -4,7 +4,7 @@
* 2001-2007,2014 Jack Lloyd
* 2006 Matt Johnston
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/zlib.h>
diff --git a/src/lib/compression/zlib/zlib.h b/src/lib/compression/zlib/zlib.h
index 963fbc269..19bae3480 100644
--- a/src/lib/compression/zlib/zlib.h
+++ b/src/lib/compression/zlib/zlib.h
@@ -3,7 +3,7 @@
* (C) 2001 Peter J Jones
* 2001-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ZLIB_H__
diff --git a/src/lib/constructs/aont/package.cpp b/src/lib/constructs/aont/package.cpp
index 1adee90e8..731cae408 100644
--- a/src/lib/constructs/aont/package.cpp
+++ b/src/lib/constructs/aont/package.cpp
@@ -3,7 +3,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 <botan/package.h>
diff --git a/src/lib/constructs/aont/package.h b/src/lib/constructs/aont/package.h
index 52d1c2190..76e679490 100644
--- a/src/lib/constructs/aont/package.h
+++ b/src/lib/constructs/aont/package.h
@@ -2,7 +2,7 @@
* Rivest's Package Tranform
* (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_AONT_PACKAGE_TRANSFORM_H__
diff --git a/src/lib/constructs/cryptobox/cryptobox.cpp b/src/lib/constructs/cryptobox/cryptobox.cpp
index aa2369c6c..fb210bc0b 100644
--- a/src/lib/constructs/cryptobox/cryptobox.cpp
+++ b/src/lib/constructs/cryptobox/cryptobox.cpp
@@ -2,7 +2,7 @@
* Cryptobox Message Routines
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/cryptobox.h>
diff --git a/src/lib/constructs/cryptobox/cryptobox.h b/src/lib/constructs/cryptobox/cryptobox.h
index 7a363f72d..27dc55a68 100644
--- a/src/lib/constructs/cryptobox/cryptobox.h
+++ b/src/lib/constructs/cryptobox/cryptobox.h
@@ -2,7 +2,7 @@
* Cryptobox Message Routines
* (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_CRYPTOBOX_H__
diff --git a/src/lib/constructs/fpe_fe1/fpe_fe1.cpp b/src/lib/constructs/fpe_fe1/fpe_fe1.cpp
index d52a4effc..c0a29519a 100644
--- a/src/lib/constructs/fpe_fe1/fpe_fe1.cpp
+++ b/src/lib/constructs/fpe_fe1/fpe_fe1.cpp
@@ -2,7 +2,7 @@
* Format Preserving Encryption (FE1 scheme)
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/fpe_fe1.h>
diff --git a/src/lib/constructs/fpe_fe1/fpe_fe1.h b/src/lib/constructs/fpe_fe1/fpe_fe1.h
index 555f97d3f..a1cae9917 100644
--- a/src/lib/constructs/fpe_fe1/fpe_fe1.h
+++ b/src/lib/constructs/fpe_fe1/fpe_fe1.h
@@ -2,7 +2,7 @@
* Format Preserving Encryption (FE1 scheme)
* (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_FPE_FE1_H__
diff --git a/src/lib/constructs/pbes2/pbes2.cpp b/src/lib/constructs/pbes2/pbes2.cpp
index afce0fce1..8c2348408 100644
--- a/src/lib/constructs/pbes2/pbes2.cpp
+++ b/src/lib/constructs/pbes2/pbes2.cpp
@@ -2,7 +2,7 @@
* PKCS #5 PBES2
* (C) 1999-2008,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/pbes2.h>
diff --git a/src/lib/constructs/pbes2/pbes2.h b/src/lib/constructs/pbes2/pbes2.h
index ac88f6adb..7d73795dc 100644
--- a/src/lib/constructs/pbes2/pbes2.h
+++ b/src/lib/constructs/pbes2/pbes2.h
@@ -2,7 +2,7 @@
* PKCS #5 v2.0 PBE
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_PBE_PKCS_v20_H__
diff --git a/src/lib/constructs/rfc3394/rfc3394.cpp b/src/lib/constructs/rfc3394/rfc3394.cpp
index ce37b0587..ee1cc1dd8 100644
--- a/src/lib/constructs/rfc3394/rfc3394.cpp
+++ b/src/lib/constructs/rfc3394/rfc3394.cpp
@@ -2,7 +2,7 @@
* AES Key Wrap (RFC 3394)
* (C) 2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/rfc3394.h>
diff --git a/src/lib/constructs/rfc3394/rfc3394.h b/src/lib/constructs/rfc3394/rfc3394.h
index febd5207e..9800bbab1 100644
--- a/src/lib/constructs/rfc3394/rfc3394.h
+++ b/src/lib/constructs/rfc3394/rfc3394.h
@@ -2,7 +2,7 @@
* AES Key Wrap (RFC 3394)
* (C) 2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_AES_KEY_WRAP_H__
diff --git a/src/lib/constructs/srp6/srp6.cpp b/src/lib/constructs/srp6/srp6.cpp
index fba7fa326..c3bf3e19a 100644
--- a/src/lib/constructs/srp6/srp6.cpp
+++ b/src/lib/constructs/srp6/srp6.cpp
@@ -2,7 +2,7 @@
* SRP-6a (RFC 5054 compatatible)
* (C) 2011,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/srp6.h>
diff --git a/src/lib/constructs/srp6/srp6.h b/src/lib/constructs/srp6/srp6.h
index b0adc5da4..3eb21b742 100644
--- a/src/lib/constructs/srp6/srp6.h
+++ b/src/lib/constructs/srp6/srp6.h
@@ -2,7 +2,7 @@
* SRP-6a (RFC 5054 compatatible)
* (C) 2011,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_RFC5054_SRP6_H__
diff --git a/src/lib/constructs/srp6/srp6_files.cpp b/src/lib/constructs/srp6/srp6_files.cpp
index 4df2986f3..50f51fa75 100644
--- a/src/lib/constructs/srp6/srp6_files.cpp
+++ b/src/lib/constructs/srp6/srp6_files.cpp
@@ -2,7 +2,7 @@
* SRP-6a File Handling
* (C) 2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/srp6_files.h>
diff --git a/src/lib/constructs/srp6/srp6_files.h b/src/lib/constructs/srp6/srp6_files.h
index 4e0d3ff02..45c3b0bfe 100644
--- a/src/lib/constructs/srp6/srp6_files.h
+++ b/src/lib/constructs/srp6/srp6_files.h
@@ -2,7 +2,7 @@
* SRP-6a File Handling
* (C) 2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SRP6A_FILES_H__
diff --git a/src/lib/constructs/tss/tss.cpp b/src/lib/constructs/tss/tss.cpp
index 5707c2403..c021bff7b 100644
--- a/src/lib/constructs/tss/tss.cpp
+++ b/src/lib/constructs/tss/tss.cpp
@@ -2,7 +2,7 @@
* RTSS (threshold secret sharing)
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tss.h>
diff --git a/src/lib/constructs/tss/tss.h b/src/lib/constructs/tss/tss.h
index 4664af317..09a5dbe19 100644
--- a/src/lib/constructs/tss/tss.h
+++ b/src/lib/constructs/tss/tss.h
@@ -2,7 +2,7 @@
* RTSS (threshold secret sharing)
* (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_RTSS_H__
diff --git a/src/lib/credentials/credentials_manager.cpp b/src/lib/credentials/credentials_manager.cpp
index 1077edf61..6443bb246 100644
--- a/src/lib/credentials/credentials_manager.cpp
+++ b/src/lib/credentials/credentials_manager.cpp
@@ -2,7 +2,7 @@
* Credentials Manager
* (C) 2011,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/credentials_manager.h>
diff --git a/src/lib/credentials/credentials_manager.h b/src/lib/credentials/credentials_manager.h
index 85db078e3..af0021393 100644
--- a/src/lib/credentials/credentials_manager.h
+++ b/src/lib/credentials/credentials_manager.h
@@ -2,7 +2,7 @@
* Credentials Manager
* (C) 2011,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_CREDENTIALS_MANAGER_H__
diff --git a/src/lib/engine/aes_isa_eng/aes_isa_engine.cpp b/src/lib/engine/aes_isa_eng/aes_isa_engine.cpp
index 956a1ce38..c73eefcd3 100644
--- a/src/lib/engine/aes_isa_eng/aes_isa_engine.cpp
+++ b/src/lib/engine/aes_isa_eng/aes_isa_engine.cpp
@@ -2,7 +2,7 @@
* Engine for AES instructions
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/aes_isa_engine.h>
diff --git a/src/lib/engine/aes_isa_eng/aes_isa_engine.h b/src/lib/engine/aes_isa_eng/aes_isa_engine.h
index 3c4d3e936..298574543 100644
--- a/src/lib/engine/aes_isa_eng/aes_isa_engine.h
+++ b/src/lib/engine/aes_isa_eng/aes_isa_engine.h
@@ -2,7 +2,7 @@
* Engine for AES instructions
* (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_AES_ISA_ENGINE_H__
diff --git a/src/lib/engine/asm_engine/asm_engine.cpp b/src/lib/engine/asm_engine/asm_engine.cpp
index a43a3302d..59be4a826 100644
--- a/src/lib/engine/asm_engine/asm_engine.cpp
+++ b/src/lib/engine/asm_engine/asm_engine.cpp
@@ -2,7 +2,7 @@
* Assembly Implementation Engine
* (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/internal/asm_engine.h>
diff --git a/src/lib/engine/asm_engine/asm_engine.h b/src/lib/engine/asm_engine/asm_engine.h
index 40fe5342f..02e629e98 100644
--- a/src/lib/engine/asm_engine/asm_engine.h
+++ b/src/lib/engine/asm_engine/asm_engine.h
@@ -2,7 +2,7 @@
* Assembly Implementation Engine
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_X86_32_ASM_ENGINE_H__
diff --git a/src/lib/engine/core_engine/core_engine.h b/src/lib/engine/core_engine/core_engine.h
index d12895662..40afff515 100644
--- a/src/lib/engine/core_engine/core_engine.h
+++ b/src/lib/engine/core_engine/core_engine.h
@@ -2,7 +2,7 @@
* Core Engine
* (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_CORE_ENGINE_H__
diff --git a/src/lib/engine/core_engine/core_modes.cpp b/src/lib/engine/core_engine/core_modes.cpp
index b29f46c9e..1d96e581d 100644
--- a/src/lib/engine/core_engine/core_modes.cpp
+++ b/src/lib/engine/core_engine/core_modes.cpp
@@ -2,7 +2,7 @@
* Core Engine
* (C) 1999-2007,2011,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/core_engine.h>
diff --git a/src/lib/engine/core_engine/def_pk_ops.cpp b/src/lib/engine/core_engine/def_pk_ops.cpp
index cbe7d27fc..f941245fb 100644
--- a/src/lib/engine/core_engine/def_pk_ops.cpp
+++ b/src/lib/engine/core_engine/def_pk_ops.cpp
@@ -2,7 +2,7 @@
* PK Operations
* (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/internal/core_engine.h>
diff --git a/src/lib/engine/core_engine/def_powm.cpp b/src/lib/engine/core_engine/def_powm.cpp
index 56a4b6844..541f18c04 100644
--- a/src/lib/engine/core_engine/def_powm.cpp
+++ b/src/lib/engine/core_engine/def_powm.cpp
@@ -2,7 +2,7 @@
* Modular Exponentiation
* (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/internal/core_engine.h>
diff --git a/src/lib/engine/core_engine/lookup_block.cpp b/src/lib/engine/core_engine/lookup_block.cpp
index fc2f1e982..703e578ac 100644
--- a/src/lib/engine/core_engine/lookup_block.cpp
+++ b/src/lib/engine/core_engine/lookup_block.cpp
@@ -2,7 +2,7 @@
* Block Cipher Lookup
* (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/internal/core_engine.h>
diff --git a/src/lib/engine/core_engine/lookup_hash.cpp b/src/lib/engine/core_engine/lookup_hash.cpp
index b5a071c4e..446851bff 100644
--- a/src/lib/engine/core_engine/lookup_hash.cpp
+++ b/src/lib/engine/core_engine/lookup_hash.cpp
@@ -2,7 +2,7 @@
* Hash Algorithms Lookup
* (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/internal/core_engine.h>
diff --git a/src/lib/engine/core_engine/lookup_mac.cpp b/src/lib/engine/core_engine/lookup_mac.cpp
index acb8da019..62e23eb57 100644
--- a/src/lib/engine/core_engine/lookup_mac.cpp
+++ b/src/lib/engine/core_engine/lookup_mac.cpp
@@ -2,7 +2,7 @@
* MAC Lookup
* (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/internal/core_engine.h>
diff --git a/src/lib/engine/core_engine/lookup_pbkdf.cpp b/src/lib/engine/core_engine/lookup_pbkdf.cpp
index bfd2c8bc2..1dc40322c 100644
--- a/src/lib/engine/core_engine/lookup_pbkdf.cpp
+++ b/src/lib/engine/core_engine/lookup_pbkdf.cpp
@@ -2,7 +2,7 @@
* PBKDF Lookup
* (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/core_engine.h>
diff --git a/src/lib/engine/core_engine/lookup_stream.cpp b/src/lib/engine/core_engine/lookup_stream.cpp
index 9e9a7e8df..a0fee6978 100644
--- a/src/lib/engine/core_engine/lookup_stream.cpp
+++ b/src/lib/engine/core_engine/lookup_stream.cpp
@@ -2,7 +2,7 @@
* Stream Cipher Lookup
* (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/internal/core_engine.h>
diff --git a/src/lib/engine/dyn_engine/dyn_engine.cpp b/src/lib/engine/dyn_engine/dyn_engine.cpp
index 078ec4b83..ad74370a2 100644
--- a/src/lib/engine/dyn_engine/dyn_engine.cpp
+++ b/src/lib/engine/dyn_engine/dyn_engine.cpp
@@ -2,7 +2,7 @@
* Dynamically Loaded Engine
* (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/dyn_engine.h>
diff --git a/src/lib/engine/dyn_engine/dyn_engine.h b/src/lib/engine/dyn_engine/dyn_engine.h
index a9671b5b5..02a9d6343 100644
--- a/src/lib/engine/dyn_engine/dyn_engine.h
+++ b/src/lib/engine/dyn_engine/dyn_engine.h
@@ -2,7 +2,7 @@
* Dynamically Loaded Engine
* (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_DYN_LOADED_ENGINE_H__
diff --git a/src/lib/engine/engine.cpp b/src/lib/engine/engine.cpp
index bfb08ec91..8c164804b 100644
--- a/src/lib/engine/engine.cpp
+++ b/src/lib/engine/engine.cpp
@@ -2,7 +2,7 @@
* Engine
* (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/engine.h>
diff --git a/src/lib/engine/engine.h b/src/lib/engine/engine.h
index 9774a941f..d28bc28ab 100644
--- a/src/lib/engine/engine.h
+++ b/src/lib/engine/engine.h
@@ -2,7 +2,7 @@
* Engine
* (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_ENGINE_H__
diff --git a/src/lib/engine/openssl/openssl_engine.h b/src/lib/engine/openssl/openssl_engine.h
index a106f3d21..3e3940499 100644
--- a/src/lib/engine/openssl/openssl_engine.h
+++ b/src/lib/engine/openssl/openssl_engine.h
@@ -2,7 +2,7 @@
* OpenSSL Engine
* (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_ENGINE_OPENSSL_H__
diff --git a/src/lib/engine/openssl/ossl_arc4.cpp b/src/lib/engine/openssl/ossl_arc4.cpp
index 0eb404af1..4533c2688 100644
--- a/src/lib/engine/openssl/ossl_arc4.cpp
+++ b/src/lib/engine/openssl/ossl_arc4.cpp
@@ -2,7 +2,7 @@
* OpenSSL RC4
* (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/internal/openssl_engine.h>
diff --git a/src/lib/engine/openssl/ossl_bc.cpp b/src/lib/engine/openssl/ossl_bc.cpp
index b3b509c36..8e8c6e5a8 100644
--- a/src/lib/engine/openssl/ossl_bc.cpp
+++ b/src/lib/engine/openssl/ossl_bc.cpp
@@ -2,7 +2,7 @@
* OpenSSL Block Cipher
* (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/internal/openssl_engine.h>
diff --git a/src/lib/engine/openssl/ossl_md.cpp b/src/lib/engine/openssl/ossl_md.cpp
index e09a68a8e..063271151 100644
--- a/src/lib/engine/openssl/ossl_md.cpp
+++ b/src/lib/engine/openssl/ossl_md.cpp
@@ -2,7 +2,7 @@
* OpenSSL Hash 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)
*/
#include <botan/internal/openssl_engine.h>
diff --git a/src/lib/engine/simd_engine/simd_engine.cpp b/src/lib/engine/simd_engine/simd_engine.cpp
index 75463a4b1..af5f5d524 100644
--- a/src/lib/engine/simd_engine/simd_engine.cpp
+++ b/src/lib/engine/simd_engine/simd_engine.cpp
@@ -2,7 +2,7 @@
* SIMD Engine
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/simd_engine.h>
diff --git a/src/lib/engine/simd_engine/simd_engine.h b/src/lib/engine/simd_engine/simd_engine.h
index 66c8886f1..3429e0fbd 100644
--- a/src/lib/engine/simd_engine/simd_engine.h
+++ b/src/lib/engine/simd_engine/simd_engine.h
@@ -2,7 +2,7 @@
* SIMD Assembly Engine
* (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_SIMD_ENGINE_H__
diff --git a/src/lib/entropy/beos_stats/es_beos.cpp b/src/lib/entropy/beos_stats/es_beos.cpp
index e514eb121..089bc3a71 100644
--- a/src/lib/entropy/beos_stats/es_beos.cpp
+++ b/src/lib/entropy/beos_stats/es_beos.cpp
@@ -2,7 +2,7 @@
* BeOS EntropySource
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/es_beos.h>
diff --git a/src/lib/entropy/beos_stats/es_beos.h b/src/lib/entropy/beos_stats/es_beos.h
index 5ccb430a5..331ae3bc0 100644
--- a/src/lib/entropy/beos_stats/es_beos.h
+++ b/src/lib/entropy/beos_stats/es_beos.h
@@ -2,7 +2,7 @@
* BeOS EntropySource
* (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_ENTROPY_SRC_BEOS_H__
diff --git a/src/lib/entropy/cryptoapi_rng/es_capi.cpp b/src/lib/entropy/cryptoapi_rng/es_capi.cpp
index fa2d09628..a18fca7f2 100644
--- a/src/lib/entropy/cryptoapi_rng/es_capi.cpp
+++ b/src/lib/entropy/cryptoapi_rng/es_capi.cpp
@@ -2,7 +2,7 @@
* Win32 CryptoAPI EntropySource
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/es_capi.h>
diff --git a/src/lib/entropy/cryptoapi_rng/es_capi.h b/src/lib/entropy/cryptoapi_rng/es_capi.h
index d75101923..359618535 100644
--- a/src/lib/entropy/cryptoapi_rng/es_capi.h
+++ b/src/lib/entropy/cryptoapi_rng/es_capi.h
@@ -2,7 +2,7 @@
* Win32 CAPI EntropySource
* (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_ENTROPY_SRC_WIN32_CAPI_H__
diff --git a/src/lib/entropy/dev_random/dev_random.cpp b/src/lib/entropy/dev_random/dev_random.cpp
index ef6bceaf7..06c420a67 100644
--- a/src/lib/entropy/dev_random/dev_random.cpp
+++ b/src/lib/entropy/dev_random/dev_random.cpp
@@ -2,7 +2,7 @@
* Reader of /dev/random and company
* (C) 1999-2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/dev_random.h>
diff --git a/src/lib/entropy/dev_random/dev_random.h b/src/lib/entropy/dev_random/dev_random.h
index d74412b27..44b02ede0 100644
--- a/src/lib/entropy/dev_random/dev_random.h
+++ b/src/lib/entropy/dev_random/dev_random.h
@@ -2,7 +2,7 @@
* /dev/random EntropySource
* (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_ENTROPY_SRC_DEVICE_H__
diff --git a/src/lib/entropy/egd/es_egd.cpp b/src/lib/entropy/egd/es_egd.cpp
index e61d4ef82..2ddb233bd 100644
--- a/src/lib/entropy/egd/es_egd.cpp
+++ b/src/lib/entropy/egd/es_egd.cpp
@@ -2,7 +2,7 @@
* EGD EntropySource
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/es_egd.h>
diff --git a/src/lib/entropy/egd/es_egd.h b/src/lib/entropy/egd/es_egd.h
index 02c52b9a3..d6cce8b7c 100644
--- a/src/lib/entropy/egd/es_egd.h
+++ b/src/lib/entropy/egd/es_egd.h
@@ -2,7 +2,7 @@
* EGD EntropySource
* (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_ENTROPY_SRC_EGD_H__
diff --git a/src/lib/entropy/entropy_src.h b/src/lib/entropy/entropy_src.h
index 1635a936c..77f822bbf 100644
--- a/src/lib/entropy/entropy_src.h
+++ b/src/lib/entropy/entropy_src.h
@@ -2,7 +2,7 @@
* EntropySource
* (C) 2008-2009,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ENTROPY_SOURCE_BASE_H__
diff --git a/src/lib/entropy/hres_timer/hres_timer.cpp b/src/lib/entropy/hres_timer/hres_timer.cpp
index 3fc68c771..f86638ce0 100644
--- a/src/lib/entropy/hres_timer/hres_timer.cpp
+++ b/src/lib/entropy/hres_timer/hres_timer.cpp
@@ -2,7 +2,7 @@
* High Resolution Timestamp Entropy Source
* (C) 1999-2009,2011,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/hres_timer.h>
diff --git a/src/lib/entropy/hres_timer/hres_timer.h b/src/lib/entropy/hres_timer/hres_timer.h
index 8b95c8308..762acadbf 100644
--- a/src/lib/entropy/hres_timer/hres_timer.h
+++ b/src/lib/entropy/hres_timer/hres_timer.h
@@ -2,7 +2,7 @@
* High Resolution Timestamp Entropy Source
* (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_ENTROPY_SRC_HRES_TIMER_H__
diff --git a/src/lib/entropy/proc_walk/proc_walk.cpp b/src/lib/entropy/proc_walk/proc_walk.cpp
index f459a7e32..7ea785361 100644
--- a/src/lib/entropy/proc_walk/proc_walk.cpp
+++ b/src/lib/entropy/proc_walk/proc_walk.cpp
@@ -4,7 +4,7 @@
*
* (C) 1999-2008,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/proc_walk.h>
diff --git a/src/lib/entropy/proc_walk/proc_walk.h b/src/lib/entropy/proc_walk/proc_walk.h
index 853aeb161..047fb3bb9 100644
--- a/src/lib/entropy/proc_walk/proc_walk.h
+++ b/src/lib/entropy/proc_walk/proc_walk.h
@@ -2,7 +2,7 @@
* File Tree Walking EntropySource
* (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_ENTROPY_SRC_PROC_WALK_H__
diff --git a/src/lib/entropy/rdrand/rdrand.cpp b/src/lib/entropy/rdrand/rdrand.cpp
index 0dae697c8..f0782390e 100644
--- a/src/lib/entropy/rdrand/rdrand.cpp
+++ b/src/lib/entropy/rdrand/rdrand.cpp
@@ -2,7 +2,7 @@
* Entropy Source Using Intel's rdrand instruction
* (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/internal/rdrand.h>
diff --git a/src/lib/entropy/rdrand/rdrand.h b/src/lib/entropy/rdrand/rdrand.h
index d7629d37f..bc02ef93e 100644
--- a/src/lib/entropy/rdrand/rdrand.h
+++ b/src/lib/entropy/rdrand/rdrand.h
@@ -2,7 +2,7 @@
* Entropy Source Using Intel's rdrand instruction
* (C) 2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ENTROPY_SRC_RDRAND_H__
diff --git a/src/lib/entropy/unix_procs/unix_proc_sources.cpp b/src/lib/entropy/unix_procs/unix_proc_sources.cpp
index 6cf185064..429198706 100644
--- a/src/lib/entropy/unix_procs/unix_proc_sources.cpp
+++ b/src/lib/entropy/unix_procs/unix_proc_sources.cpp
@@ -2,7 +2,7 @@
* Program List for Unix_EntropySource
* (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/internal/unix_procs.h>
diff --git a/src/lib/entropy/unix_procs/unix_procs.cpp b/src/lib/entropy/unix_procs/unix_procs.cpp
index 7925741bb..3f4cd3567 100644
--- a/src/lib/entropy/unix_procs/unix_procs.cpp
+++ b/src/lib/entropy/unix_procs/unix_procs.cpp
@@ -5,7 +5,7 @@
* (C) 1999-2009,2013 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/unix_procs.h>
diff --git a/src/lib/entropy/unix_procs/unix_procs.h b/src/lib/entropy/unix_procs/unix_procs.h
index 7c1ae8c65..11dbead65 100644
--- a/src/lib/entropy/unix_procs/unix_procs.h
+++ b/src/lib/entropy/unix_procs/unix_procs.h
@@ -2,7 +2,7 @@
* Unix EntropySource
* (C) 1999-2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ENTROPY_SRC_UNIX_H__
diff --git a/src/lib/entropy/win32_stats/es_win32.cpp b/src/lib/entropy/win32_stats/es_win32.cpp
index fff11592d..f57c4bebb 100644
--- a/src/lib/entropy/win32_stats/es_win32.cpp
+++ b/src/lib/entropy/win32_stats/es_win32.cpp
@@ -2,7 +2,7 @@
* Win32 EntropySource
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/es_win32.h>
diff --git a/src/lib/entropy/win32_stats/es_win32.h b/src/lib/entropy/win32_stats/es_win32.h
index 6c7c9ee09..4809abeee 100644
--- a/src/lib/entropy/win32_stats/es_win32.h
+++ b/src/lib/entropy/win32_stats/es_win32.h
@@ -2,7 +2,7 @@
* Win32 EntropySource
* (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_ENTROPY_SRC_WIN32_H__
diff --git a/src/lib/filters/aead_filt/aead_filt.h b/src/lib/filters/aead_filt/aead_filt.h
index 65f73d7d3..52e448a7a 100644
--- a/src/lib/filters/aead_filt/aead_filt.h
+++ b/src/lib/filters/aead_filt/aead_filt.h
@@ -2,7 +2,7 @@
* Filter interface for AEAD Modes
* (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_AEAD_FILTER_H__
diff --git a/src/lib/filters/algo_filt.cpp b/src/lib/filters/algo_filt.cpp
index 2bc14dc16..924977715 100644
--- a/src/lib/filters/algo_filt.cpp
+++ b/src/lib/filters/algo_filt.cpp
@@ -2,7 +2,7 @@
* Filters
* (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/filters.h>
diff --git a/src/lib/filters/basefilt.cpp b/src/lib/filters/basefilt.cpp
index eace9cfd5..89026f600 100644
--- a/src/lib/filters/basefilt.cpp
+++ b/src/lib/filters/basefilt.cpp
@@ -2,7 +2,7 @@
* Basic Filters
* (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/basefilt.h>
diff --git a/src/lib/filters/basefilt.h b/src/lib/filters/basefilt.h
index 152c47bec..f87ac66e7 100644
--- a/src/lib/filters/basefilt.h
+++ b/src/lib/filters/basefilt.h
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* (C) 2013 Joel Low
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_BASEFILT_H__
diff --git a/src/lib/filters/buf_filt.cpp b/src/lib/filters/buf_filt.cpp
index 60e51b02a..9d2d87305 100644
--- a/src/lib/filters/buf_filt.cpp
+++ b/src/lib/filters/buf_filt.cpp
@@ -2,7 +2,7 @@
* Buffered Filter
* (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/buf_filt.h>
diff --git a/src/lib/filters/buf_filt.h b/src/lib/filters/buf_filt.h
index 9a3fc9a2b..5c94e6423 100644
--- a/src/lib/filters/buf_filt.h
+++ b/src/lib/filters/buf_filt.h
@@ -2,7 +2,7 @@
* Buffered Filter
* (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_BUFFERED_FILTER_H__
diff --git a/src/lib/filters/codec_filt/b64_filt.cpp b/src/lib/filters/codec_filt/b64_filt.cpp
index b804b33c7..e8bcd3749 100644
--- a/src/lib/filters/codec_filt/b64_filt.cpp
+++ b/src/lib/filters/codec_filt/b64_filt.cpp
@@ -2,7 +2,7 @@
* Base64 Encoder/Decoder
* (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/b64_filt.h>
diff --git a/src/lib/filters/codec_filt/b64_filt.h b/src/lib/filters/codec_filt/b64_filt.h
index dcb3cdbd5..b73cca3b2 100644
--- a/src/lib/filters/codec_filt/b64_filt.h
+++ b/src/lib/filters/codec_filt/b64_filt.h
@@ -2,7 +2,7 @@
* Base64 Encoder/Decoder
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_BASE64_FILTER_H__
diff --git a/src/lib/filters/codec_filt/hex_filt.cpp b/src/lib/filters/codec_filt/hex_filt.cpp
index e85bdb17e..4cf92670a 100644
--- a/src/lib/filters/codec_filt/hex_filt.cpp
+++ b/src/lib/filters/codec_filt/hex_filt.cpp
@@ -2,7 +2,7 @@
* Hex Encoder/Decoder
* (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/hex_filt.h>
diff --git a/src/lib/filters/codec_filt/hex_filt.h b/src/lib/filters/codec_filt/hex_filt.h
index dbe6b9bae..008fd6799 100644
--- a/src/lib/filters/codec_filt/hex_filt.h
+++ b/src/lib/filters/codec_filt/hex_filt.h
@@ -2,7 +2,7 @@
* Hex Encoder/Decoder
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_HEX_FILTER_H__
diff --git a/src/lib/filters/comp_filter.cpp b/src/lib/filters/comp_filter.cpp
index a02a78eb7..b7694ce24 100644
--- a/src/lib/filters/comp_filter.cpp
+++ b/src/lib/filters/comp_filter.cpp
@@ -2,7 +2,7 @@
* Filter interface for compression
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/comp_filter.h>
diff --git a/src/lib/filters/comp_filter.h b/src/lib/filters/comp_filter.h
index 863d4ffef..7bfa5b568 100644
--- a/src/lib/filters/comp_filter.h
+++ b/src/lib/filters/comp_filter.h
@@ -2,7 +2,7 @@
* Filter interface for compression
* (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_COMPRESSION_FILTER_H__
diff --git a/src/lib/filters/data_snk.cpp b/src/lib/filters/data_snk.cpp
index 2903e5e1f..66d22ca5b 100644
--- a/src/lib/filters/data_snk.cpp
+++ b/src/lib/filters/data_snk.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2005 Matthew Gregan
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/data_snk.h>
diff --git a/src/lib/filters/data_snk.h b/src/lib/filters/data_snk.h
index 6b9da0b4d..8c5826285 100644
--- a/src/lib/filters/data_snk.h
+++ b/src/lib/filters/data_snk.h
@@ -2,7 +2,7 @@
* DataSink
* (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_SINK_H__
diff --git a/src/lib/filters/data_src.cpp b/src/lib/filters/data_src.cpp
index cc100ab13..0b13f9e66 100644
--- a/src/lib/filters/data_src.cpp
+++ b/src/lib/filters/data_src.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2005 Matthew Gregan
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/data_src.h>
diff --git a/src/lib/filters/data_src.h b/src/lib/filters/data_src.h
index 817bd2e8b..e6b7b9573 100644
--- a/src/lib/filters/data_src.h
+++ b/src/lib/filters/data_src.h
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_DATA_SRC_H__
diff --git a/src/lib/filters/fd_unix/fd_unix.cpp b/src/lib/filters/fd_unix/fd_unix.cpp
index dc6fbe696..891419f9d 100644
--- a/src/lib/filters/fd_unix/fd_unix.cpp
+++ b/src/lib/filters/fd_unix/fd_unix.cpp
@@ -2,7 +2,7 @@
* Pipe I/O for Unix
* (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/pipe.h>
diff --git a/src/lib/filters/fd_unix/fd_unix.h b/src/lib/filters/fd_unix/fd_unix.h
index 8335aed9e..78f6948de 100644
--- a/src/lib/filters/fd_unix/fd_unix.h
+++ b/src/lib/filters/fd_unix/fd_unix.h
@@ -2,7 +2,7 @@
* Pipe I/O for Unix
* (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_PIPE_UNIXFD_H__
diff --git a/src/lib/filters/filter.cpp b/src/lib/filters/filter.cpp
index de678f537..956ab99d7 100644
--- a/src/lib/filters/filter.cpp
+++ b/src/lib/filters/filter.cpp
@@ -2,7 +2,7 @@
* Filter
* (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/filter.h>
diff --git a/src/lib/filters/filter.h b/src/lib/filters/filter.h
index bdf4d11a4..1ac6e21b6 100644
--- a/src/lib/filters/filter.h
+++ b/src/lib/filters/filter.h
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* (C) 2013 Joel Low
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_FILTER_H__
diff --git a/src/lib/filters/filters.h b/src/lib/filters/filters.h
index 9c7d6b858..f0b3c110e 100644
--- a/src/lib/filters/filters.h
+++ b/src/lib/filters/filters.h
@@ -2,7 +2,7 @@
* Filters
* (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_FILTERS_H__
diff --git a/src/lib/filters/key_filt.h b/src/lib/filters/key_filt.h
index 6d69d6b83..c2a1fd92b 100644
--- a/src/lib/filters/key_filt.h
+++ b/src/lib/filters/key_filt.h
@@ -2,7 +2,7 @@
* Keyed_Filter
* (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_KEYED_FILTER_H__
diff --git a/src/lib/filters/out_buf.cpp b/src/lib/filters/out_buf.cpp
index 323b20e1d..34fbd84ed 100644
--- a/src/lib/filters/out_buf.cpp
+++ b/src/lib/filters/out_buf.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2007,2011 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/out_buf.h>
diff --git a/src/lib/filters/out_buf.h b/src/lib/filters/out_buf.h
index 2d17ac8d3..4617d9464 100644
--- a/src/lib/filters/out_buf.h
+++ b/src/lib/filters/out_buf.h
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_OUTPUT_BUFFER_H__
diff --git a/src/lib/filters/pipe.cpp b/src/lib/filters/pipe.cpp
index e89dd79bf..b3bbe501f 100644
--- a/src/lib/filters/pipe.cpp
+++ b/src/lib/filters/pipe.cpp
@@ -2,7 +2,7 @@
* Pipe
* (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/pipe.h>
diff --git a/src/lib/filters/pipe.h b/src/lib/filters/pipe.h
index 1fb03801f..ce91e9e82 100644
--- a/src/lib/filters/pipe.h
+++ b/src/lib/filters/pipe.h
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_PIPE_H__
diff --git a/src/lib/filters/pipe_io.cpp b/src/lib/filters/pipe_io.cpp
index a549eaee8..b7381a2f7 100644
--- a/src/lib/filters/pipe_io.cpp
+++ b/src/lib/filters/pipe_io.cpp
@@ -2,7 +2,7 @@
* Pipe I/O
* (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/pipe.h>
diff --git a/src/lib/filters/pipe_rw.cpp b/src/lib/filters/pipe_rw.cpp
index 06b87406e..10b4f5666 100644
--- a/src/lib/filters/pipe_rw.cpp
+++ b/src/lib/filters/pipe_rw.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/pipe.h>
diff --git a/src/lib/filters/secqueue.cpp b/src/lib/filters/secqueue.cpp
index 9908a2a8c..db6274c90 100644
--- a/src/lib/filters/secqueue.cpp
+++ b/src/lib/filters/secqueue.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/secqueue.h>
diff --git a/src/lib/filters/secqueue.h b/src/lib/filters/secqueue.h
index 05c2e3db1..7eb8ffc17 100644
--- a/src/lib/filters/secqueue.h
+++ b/src/lib/filters/secqueue.h
@@ -3,7 +3,7 @@
* (C) 1999-2007 Jack Lloyd
* 2012 Markus Wanner
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SECURE_QUEUE_H__
diff --git a/src/lib/filters/threaded_fork.cpp b/src/lib/filters/threaded_fork.cpp
index 05166d697..c01c84057 100644
--- a/src/lib/filters/threaded_fork.cpp
+++ b/src/lib/filters/threaded_fork.cpp
@@ -3,7 +3,7 @@
* (C) 2013 Joel Low
* 2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/basefilt.h>
diff --git a/src/lib/filters/transform_filter.cpp b/src/lib/filters/transform_filter.cpp
index e3a8202ce..b084bf42e 100644
--- a/src/lib/filters/transform_filter.cpp
+++ b/src/lib/filters/transform_filter.cpp
@@ -2,7 +2,7 @@
* Filter interface for Transformations
* (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/transform_filter.h>
diff --git a/src/lib/filters/transform_filter.h b/src/lib/filters/transform_filter.h
index ee1b61c4d..86bd7580e 100644
--- a/src/lib/filters/transform_filter.h
+++ b/src/lib/filters/transform_filter.h
@@ -2,7 +2,7 @@
* Filter interface for Transformations
* (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_TRANSFORMATION_FILTER_H__
diff --git a/src/lib/hash/comb4p/comb4p.cpp b/src/lib/hash/comb4p/comb4p.cpp
index 7abc3a3d2..194c4613e 100644
--- a/src/lib/hash/comb4p/comb4p.cpp
+++ b/src/lib/hash/comb4p/comb4p.cpp
@@ -2,7 +2,7 @@
* Comb4P hash combiner
* (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/comb4p.h>
diff --git a/src/lib/hash/comb4p/comb4p.h b/src/lib/hash/comb4p/comb4p.h
index 066b6f38c..ba745aefa 100644
--- a/src/lib/hash/comb4p/comb4p.h
+++ b/src/lib/hash/comb4p/comb4p.h
@@ -2,7 +2,7 @@
* Comb4P hash combiner
* (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_COMB4P_H__
diff --git a/src/lib/hash/gost_3411/gost_3411.cpp b/src/lib/hash/gost_3411/gost_3411.cpp
index eb889c0a5..abe8adb66 100644
--- a/src/lib/hash/gost_3411/gost_3411.cpp
+++ b/src/lib/hash/gost_3411/gost_3411.cpp
@@ -2,7 +2,7 @@
* GOST 34.11
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/gost_3411.h>
diff --git a/src/lib/hash/gost_3411/gost_3411.h b/src/lib/hash/gost_3411/gost_3411.h
index 5437ca4d8..fb636e30e 100644
--- a/src/lib/hash/gost_3411/gost_3411.h
+++ b/src/lib/hash/gost_3411/gost_3411.h
@@ -2,7 +2,7 @@
* GOST 34.11
* (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_GOST_3411_H__
diff --git a/src/lib/hash/has160/has160.cpp b/src/lib/hash/has160/has160.cpp
index fa14b5dca..4510ddbfc 100644
--- a/src/lib/hash/has160/has160.cpp
+++ b/src/lib/hash/has160/has160.cpp
@@ -2,7 +2,7 @@
* HAS-160
* (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/has160.h>
diff --git a/src/lib/hash/has160/has160.h b/src/lib/hash/has160/has160.h
index 9947d9580..795b244c3 100644
--- a/src/lib/hash/has160/has160.h
+++ b/src/lib/hash/has160/has160.h
@@ -2,7 +2,7 @@
* HAS-160
* (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_HAS_160_H__
diff --git a/src/lib/hash/hash.h b/src/lib/hash/hash.h
index 58a810c4b..174324c10 100644
--- a/src/lib/hash/hash.h
+++ b/src/lib/hash/hash.h
@@ -2,7 +2,7 @@
* Hash Function Base Class
* (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_HASH_FUNCTION_BASE_CLASS_H__
diff --git a/src/lib/hash/keccak/keccak.cpp b/src/lib/hash/keccak/keccak.cpp
index e34c0fd43..67a8ed204 100644
--- a/src/lib/hash/keccak/keccak.cpp
+++ b/src/lib/hash/keccak/keccak.cpp
@@ -2,7 +2,7 @@
* Keccak
* (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/keccak.h>
diff --git a/src/lib/hash/keccak/keccak.h b/src/lib/hash/keccak/keccak.h
index e91a04d32..a115d8f7f 100644
--- a/src/lib/hash/keccak/keccak.h
+++ b/src/lib/hash/keccak/keccak.h
@@ -2,7 +2,7 @@
* Keccak
* (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_KECCAK_H__
diff --git a/src/lib/hash/md2/md2.cpp b/src/lib/hash/md2/md2.cpp
index 8f6a90208..223619ebb 100644
--- a/src/lib/hash/md2/md2.cpp
+++ b/src/lib/hash/md2/md2.cpp
@@ -2,7 +2,7 @@
* MD2
* (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/md2.h>
diff --git a/src/lib/hash/md2/md2.h b/src/lib/hash/md2/md2.h
index 032d8a8e0..bde390385 100644
--- a/src/lib/hash/md2/md2.h
+++ b/src/lib/hash/md2/md2.h
@@ -2,7 +2,7 @@
* MD2
* (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_MD2_H__
diff --git a/src/lib/hash/md4/md4.cpp b/src/lib/hash/md4/md4.cpp
index 4018758aa..65934bf0b 100644
--- a/src/lib/hash/md4/md4.cpp
+++ b/src/lib/hash/md4/md4.cpp
@@ -2,7 +2,7 @@
* MD4
* (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/md4.h>
diff --git a/src/lib/hash/md4/md4.h b/src/lib/hash/md4/md4.h
index 750be0fe7..3d38550c2 100644
--- a/src/lib/hash/md4/md4.h
+++ b/src/lib/hash/md4/md4.h
@@ -2,7 +2,7 @@
* MD4
* (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_MD4_H__
diff --git a/src/lib/hash/md4_x86_32/md4_x86_32.cpp b/src/lib/hash/md4_x86_32/md4_x86_32.cpp
index ed3f72fc9..6deb75f51 100644
--- a/src/lib/hash/md4_x86_32/md4_x86_32.cpp
+++ b/src/lib/hash/md4_x86_32/md4_x86_32.cpp
@@ -2,7 +2,7 @@
* MD4 (x86-32)
* (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/md4_x86_32.h>
diff --git a/src/lib/hash/md4_x86_32/md4_x86_32.h b/src/lib/hash/md4_x86_32/md4_x86_32.h
index a9f23e94f..1cb6c779d 100644
--- a/src/lib/hash/md4_x86_32/md4_x86_32.h
+++ b/src/lib/hash/md4_x86_32/md4_x86_32.h
@@ -2,7 +2,7 @@
* MD4 (x86-32)
* (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_MD4_X86_32_H__
diff --git a/src/lib/hash/md4_x86_32/md4_x86_32_imp.S b/src/lib/hash/md4_x86_32/md4_x86_32_imp.S
index 192751166..035b30801 100644
--- a/src/lib/hash/md4_x86_32/md4_x86_32_imp.S
+++ b/src/lib/hash/md4_x86_32/md4_x86_32_imp.S
@@ -2,7 +2,7 @@
* MD4 in x86-32 assembler
* (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/internal/asm_x86_32.h>
diff --git a/src/lib/hash/md5/md5.cpp b/src/lib/hash/md5/md5.cpp
index a68bb725d..0808d0140 100644
--- a/src/lib/hash/md5/md5.cpp
+++ b/src/lib/hash/md5/md5.cpp
@@ -2,7 +2,7 @@
* MD5
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/md5.h>
diff --git a/src/lib/hash/md5/md5.h b/src/lib/hash/md5/md5.h
index bc90df0af..bbdc11aa6 100644
--- a/src/lib/hash/md5/md5.h
+++ b/src/lib/hash/md5/md5.h
@@ -2,7 +2,7 @@
* MD5
* (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_MD5_H__
diff --git a/src/lib/hash/md5_x86_32/md5_x86_32.cpp b/src/lib/hash/md5_x86_32/md5_x86_32.cpp
index 73071ac18..ea69b8bcc 100644
--- a/src/lib/hash/md5_x86_32/md5_x86_32.cpp
+++ b/src/lib/hash/md5_x86_32/md5_x86_32.cpp
@@ -2,7 +2,7 @@
* MD5 (x86-32)
* (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/md5_x86_32.h>
diff --git a/src/lib/hash/md5_x86_32/md5_x86_32.h b/src/lib/hash/md5_x86_32/md5_x86_32.h
index 0150249ae..2f8873a2a 100644
--- a/src/lib/hash/md5_x86_32/md5_x86_32.h
+++ b/src/lib/hash/md5_x86_32/md5_x86_32.h
@@ -2,7 +2,7 @@
* MD5 (x86-32)
* (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_MD5_X86_32_H__
diff --git a/src/lib/hash/md5_x86_32/md5_x86_32_imp.S b/src/lib/hash/md5_x86_32/md5_x86_32_imp.S
index f41aaccbf..23606e93a 100644
--- a/src/lib/hash/md5_x86_32/md5_x86_32_imp.S
+++ b/src/lib/hash/md5_x86_32/md5_x86_32_imp.S
@@ -2,7 +2,7 @@
* MD5 in x86-32 assembler
* (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/internal/asm_x86_32.h>
diff --git a/src/lib/hash/mdx_hash/mdx_hash.cpp b/src/lib/hash/mdx_hash/mdx_hash.cpp
index 81042c1fa..de7e45540 100644
--- a/src/lib/hash/mdx_hash/mdx_hash.cpp
+++ b/src/lib/hash/mdx_hash/mdx_hash.cpp
@@ -2,7 +2,7 @@
* Merkle-Damgard Hash Function
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/mdx_hash.h>
diff --git a/src/lib/hash/mdx_hash/mdx_hash.h b/src/lib/hash/mdx_hash/mdx_hash.h
index 14d3c27a0..9671cbe81 100644
--- a/src/lib/hash/mdx_hash/mdx_hash.h
+++ b/src/lib/hash/mdx_hash/mdx_hash.h
@@ -2,7 +2,7 @@
* MDx Hash Function
* (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_MDX_BASE_H__
diff --git a/src/lib/hash/par_hash/par_hash.cpp b/src/lib/hash/par_hash/par_hash.cpp
index df47780ef..437d0c485 100644
--- a/src/lib/hash/par_hash/par_hash.cpp
+++ b/src/lib/hash/par_hash/par_hash.cpp
@@ -2,7 +2,7 @@
* Parallel
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/par_hash.h>
diff --git a/src/lib/hash/par_hash/par_hash.h b/src/lib/hash/par_hash/par_hash.h
index 4f5395c23..189a67437 100644
--- a/src/lib/hash/par_hash/par_hash.h
+++ b/src/lib/hash/par_hash/par_hash.h
@@ -2,7 +2,7 @@
* Parallel Hash
* (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_PARALLEL_HASH_H__
diff --git a/src/lib/hash/rmd128/rmd128.cpp b/src/lib/hash/rmd128/rmd128.cpp
index 1a55b467d..6bdf95251 100644
--- a/src/lib/hash/rmd128/rmd128.cpp
+++ b/src/lib/hash/rmd128/rmd128.cpp
@@ -2,7 +2,7 @@
* RIPEMD-128
* (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/rmd128.h>
diff --git a/src/lib/hash/rmd128/rmd128.h b/src/lib/hash/rmd128/rmd128.h
index e37666a27..a91122c79 100644
--- a/src/lib/hash/rmd128/rmd128.h
+++ b/src/lib/hash/rmd128/rmd128.h
@@ -2,7 +2,7 @@
* RIPEMD-128
* (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_RIPEMD_128_H__
diff --git a/src/lib/hash/rmd160/rmd160.cpp b/src/lib/hash/rmd160/rmd160.cpp
index 29e2b4daa..c88288cab 100644
--- a/src/lib/hash/rmd160/rmd160.cpp
+++ b/src/lib/hash/rmd160/rmd160.cpp
@@ -2,7 +2,7 @@
* RIPEMD-160
* (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/rmd160.h>
diff --git a/src/lib/hash/rmd160/rmd160.h b/src/lib/hash/rmd160/rmd160.h
index 0e43fed9a..a4f428c37 100644
--- a/src/lib/hash/rmd160/rmd160.h
+++ b/src/lib/hash/rmd160/rmd160.h
@@ -2,7 +2,7 @@
* RIPEMD-160
* (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_RIPEMD_160_H__
diff --git a/src/lib/hash/sha1/sha160.cpp b/src/lib/hash/sha1/sha160.cpp
index 42dc8a206..b5741489d 100644
--- a/src/lib/hash/sha1/sha160.cpp
+++ b/src/lib/hash/sha1/sha160.cpp
@@ -2,7 +2,7 @@
* SHA-160
* (C) 1999-2008,2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/sha160.h>
diff --git a/src/lib/hash/sha1/sha160.h b/src/lib/hash/sha1/sha160.h
index e2a81808d..fbafb5c7d 100644
--- a/src/lib/hash/sha1/sha160.h
+++ b/src/lib/hash/sha1/sha160.h
@@ -2,7 +2,7 @@
* SHA-160
* (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_SHA_160_H__
diff --git a/src/lib/hash/sha1_sse2/sha1_sse2.cpp b/src/lib/hash/sha1_sse2/sha1_sse2.cpp
index f96afd9ce..e7684db57 100644
--- a/src/lib/hash/sha1_sse2/sha1_sse2.cpp
+++ b/src/lib/hash/sha1_sse2/sha1_sse2.cpp
@@ -2,7 +2,7 @@
* SHA-1 using SSE2
* (C) 2009-2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*
* Based on public domain code by Dean Gaudet
* (http://arctic.org/~dean/crypto/sha1.html)
diff --git a/src/lib/hash/sha1_sse2/sha1_sse2.h b/src/lib/hash/sha1_sse2/sha1_sse2.h
index 9b7b327f0..fc74c41b7 100644
--- a/src/lib/hash/sha1_sse2/sha1_sse2.h
+++ b/src/lib/hash/sha1_sse2/sha1_sse2.h
@@ -2,7 +2,7 @@
* SHA-160
* (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_SHA_160_SSE2_H__
diff --git a/src/lib/hash/sha1_x86_32/sha1_x86_32.cpp b/src/lib/hash/sha1_x86_32/sha1_x86_32.cpp
index 6a4dc2a1d..521b055ad 100644
--- a/src/lib/hash/sha1_x86_32/sha1_x86_32.cpp
+++ b/src/lib/hash/sha1_x86_32/sha1_x86_32.cpp
@@ -2,7 +2,7 @@
* SHA-160 in x86-32
* (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/sha1_x86_32.h>
diff --git a/src/lib/hash/sha1_x86_32/sha1_x86_32.h b/src/lib/hash/sha1_x86_32/sha1_x86_32.h
index b344d4ae2..738000744 100644
--- a/src/lib/hash/sha1_x86_32/sha1_x86_32.h
+++ b/src/lib/hash/sha1_x86_32/sha1_x86_32.h
@@ -2,7 +2,7 @@
* SHA-160 in x86-32 asm
* (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_SHA_160_X86_32_H__
diff --git a/src/lib/hash/sha1_x86_32/sha1_x86_32_imp.S b/src/lib/hash/sha1_x86_32/sha1_x86_32_imp.S
index 775ef6854..6ab5ed78d 100644
--- a/src/lib/hash/sha1_x86_32/sha1_x86_32_imp.S
+++ b/src/lib/hash/sha1_x86_32/sha1_x86_32_imp.S
@@ -2,7 +2,7 @@
* SHA-1 in x86-32 asm
* (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/internal/asm_x86_32.h>
diff --git a/src/lib/hash/sha1_x86_64/sha1_x86_64.cpp b/src/lib/hash/sha1_x86_64/sha1_x86_64.cpp
index a3e92e313..8c8b1c9cf 100644
--- a/src/lib/hash/sha1_x86_64/sha1_x86_64.cpp
+++ b/src/lib/hash/sha1_x86_64/sha1_x86_64.cpp
@@ -2,7 +2,7 @@
* SHA-160
* (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/sha1_x86_64.h>
diff --git a/src/lib/hash/sha1_x86_64/sha1_x86_64.h b/src/lib/hash/sha1_x86_64/sha1_x86_64.h
index 068a94595..10bb8bd16 100644
--- a/src/lib/hash/sha1_x86_64/sha1_x86_64.h
+++ b/src/lib/hash/sha1_x86_64/sha1_x86_64.h
@@ -2,7 +2,7 @@
* SHA-160 (x86-64)
* (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_SHA_160_X86_64_H__
diff --git a/src/lib/hash/sha1_x86_64/sha1_x86_64_imp.S b/src/lib/hash/sha1_x86_64/sha1_x86_64_imp.S
index ee35f0d85..dd46a9e56 100644
--- a/src/lib/hash/sha1_x86_64/sha1_x86_64_imp.S
+++ b/src/lib/hash/sha1_x86_64/sha1_x86_64_imp.S
@@ -2,7 +2,7 @@
* SHA-1 in x86-64 assembler
* (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/internal/asm_x86_64.h>
diff --git a/src/lib/hash/sha2_32/sha2_32.cpp b/src/lib/hash/sha2_32/sha2_32.cpp
index 8e649771f..cfdb574d3 100644
--- a/src/lib/hash/sha2_32/sha2_32.cpp
+++ b/src/lib/hash/sha2_32/sha2_32.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2007 FlexSecure GmbH
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/sha2_32.h>
diff --git a/src/lib/hash/sha2_32/sha2_32.h b/src/lib/hash/sha2_32/sha2_32.h
index ccb8e07f2..2ea12860d 100644
--- a/src/lib/hash/sha2_32/sha2_32.h
+++ b/src/lib/hash/sha2_32/sha2_32.h
@@ -3,7 +3,7 @@
* (C) 1999-2011 Jack Lloyd
* 2007 FlexSecure GmbH
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SHA_224_256_H__
diff --git a/src/lib/hash/sha2_64/sha2_64.cpp b/src/lib/hash/sha2_64/sha2_64.cpp
index 7d32c8ef1..6f42974d6 100644
--- a/src/lib/hash/sha2_64/sha2_64.cpp
+++ b/src/lib/hash/sha2_64/sha2_64.cpp
@@ -2,7 +2,7 @@
* SHA-{384,512}
* (C) 1999-2011,2015 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/sha2_64.h>
diff --git a/src/lib/hash/sha2_64/sha2_64.h b/src/lib/hash/sha2_64/sha2_64.h
index 33bcb1100..2956d94e8 100644
--- a/src/lib/hash/sha2_64/sha2_64.h
+++ b/src/lib/hash/sha2_64/sha2_64.h
@@ -2,7 +2,7 @@
* SHA-{384,512}
* (C) 1999-2010,2015 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SHA_64BIT_H__
diff --git a/src/lib/hash/skein/skein_512.cpp b/src/lib/hash/skein/skein_512.cpp
index aac481648..7d7d876fc 100644
--- a/src/lib/hash/skein/skein_512.cpp
+++ b/src/lib/hash/skein/skein_512.cpp
@@ -2,7 +2,7 @@
* The Skein-512 hash function
* (C) 2009,2010,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/skein_512.h>
diff --git a/src/lib/hash/skein/skein_512.h b/src/lib/hash/skein/skein_512.h
index 1fd514cf5..06e2e6ccb 100644
--- a/src/lib/hash/skein/skein_512.h
+++ b/src/lib/hash/skein/skein_512.h
@@ -2,7 +2,7 @@
* The Skein-512 hash function
* (C) 2009,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SKEIN_512_H__
diff --git a/src/lib/hash/tiger/tig_tab.cpp b/src/lib/hash/tiger/tig_tab.cpp
index b76501d74..4d0bea5ee 100644
--- a/src/lib/hash/tiger/tig_tab.cpp
+++ b/src/lib/hash/tiger/tig_tab.cpp
@@ -2,7 +2,7 @@
* S-Box Tables for Tiger
* (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/tiger.h>
diff --git a/src/lib/hash/tiger/tiger.cpp b/src/lib/hash/tiger/tiger.cpp
index b6d796f29..db4d38f0a 100644
--- a/src/lib/hash/tiger/tiger.cpp
+++ b/src/lib/hash/tiger/tiger.cpp
@@ -2,7 +2,7 @@
* Tiger
* (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/tiger.h>
diff --git a/src/lib/hash/tiger/tiger.h b/src/lib/hash/tiger/tiger.h
index 70c70958b..df3b869fb 100644
--- a/src/lib/hash/tiger/tiger.h
+++ b/src/lib/hash/tiger/tiger.h
@@ -2,7 +2,7 @@
* Tiger
* (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_TIGER_H__
diff --git a/src/lib/hash/whirlpool/whirlpool.cpp b/src/lib/hash/whirlpool/whirlpool.cpp
index 736de0e1d..cd4715e57 100644
--- a/src/lib/hash/whirlpool/whirlpool.cpp
+++ b/src/lib/hash/whirlpool/whirlpool.cpp
@@ -2,7 +2,7 @@
* Whirlpool
* (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/whrlpool.h>
diff --git a/src/lib/hash/whirlpool/whrl_tab.cpp b/src/lib/hash/whirlpool/whrl_tab.cpp
index cf670f308..7289a0560 100644
--- a/src/lib/hash/whirlpool/whrl_tab.cpp
+++ b/src/lib/hash/whirlpool/whrl_tab.cpp
@@ -2,7 +2,7 @@
* Diffusion Tables for Whirlpool
* (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/whrlpool.h>
diff --git a/src/lib/hash/whirlpool/whrlpool.h b/src/lib/hash/whirlpool/whrlpool.h
index d4ad805e1..4f067f18d 100644
--- a/src/lib/hash/whirlpool/whrlpool.h
+++ b/src/lib/hash/whirlpool/whrlpool.h
@@ -2,7 +2,7 @@
* Whirlpool
* (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_WHIRLPOOL_H__
diff --git a/src/lib/kdf/kdf.cpp b/src/lib/kdf/kdf.cpp
index 39ef9db13..0d963e9a2 100644
--- a/src/lib/kdf/kdf.cpp
+++ b/src/lib/kdf/kdf.cpp
@@ -2,7 +2,7 @@
* KDF Retrieval
* (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/kdf.h>
diff --git a/src/lib/kdf/kdf.h b/src/lib/kdf/kdf.h
index 2321f85ca..7b417fcd9 100644
--- a/src/lib/kdf/kdf.h
+++ b/src/lib/kdf/kdf.h
@@ -2,7 +2,7 @@
* Key Derivation Function interfaces
* (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_KDF_BASE_H__
diff --git a/src/lib/kdf/kdf1/kdf1.cpp b/src/lib/kdf/kdf1/kdf1.cpp
index f00f71010..b0fa97443 100644
--- a/src/lib/kdf/kdf1/kdf1.cpp
+++ b/src/lib/kdf/kdf1/kdf1.cpp
@@ -2,7 +2,7 @@
* KDF1
* (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/kdf1.h>
diff --git a/src/lib/kdf/kdf1/kdf1.h b/src/lib/kdf/kdf1/kdf1.h
index 638d2a3eb..9f617878b 100644
--- a/src/lib/kdf/kdf1/kdf1.h
+++ b/src/lib/kdf/kdf1/kdf1.h
@@ -2,7 +2,7 @@
* KDF1
* (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_KDF1_H__
diff --git a/src/lib/kdf/kdf2/kdf2.cpp b/src/lib/kdf/kdf2/kdf2.cpp
index 39a929b58..052df0b6a 100644
--- a/src/lib/kdf/kdf2/kdf2.cpp
+++ b/src/lib/kdf/kdf2/kdf2.cpp
@@ -2,7 +2,7 @@
* KDF2
* (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/kdf2.h>
diff --git a/src/lib/kdf/kdf2/kdf2.h b/src/lib/kdf/kdf2/kdf2.h
index e0e3630da..c574336b6 100644
--- a/src/lib/kdf/kdf2/kdf2.h
+++ b/src/lib/kdf/kdf2/kdf2.h
@@ -2,7 +2,7 @@
* KDF2
* (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_KDF2_H__
diff --git a/src/lib/kdf/prf_ssl3/prf_ssl3.cpp b/src/lib/kdf/prf_ssl3/prf_ssl3.cpp
index 73001e502..40bce53b0 100644
--- a/src/lib/kdf/prf_ssl3/prf_ssl3.cpp
+++ b/src/lib/kdf/prf_ssl3/prf_ssl3.cpp
@@ -2,7 +2,7 @@
* SSLv3 PRF
* (C) 2004-2006 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/prf_ssl3.h>
diff --git a/src/lib/kdf/prf_ssl3/prf_ssl3.h b/src/lib/kdf/prf_ssl3/prf_ssl3.h
index bae8badb8..9679f744e 100644
--- a/src/lib/kdf/prf_ssl3/prf_ssl3.h
+++ b/src/lib/kdf/prf_ssl3/prf_ssl3.h
@@ -2,7 +2,7 @@
* SSLv3 PRF
* (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_SSLV3_PRF_H__
diff --git a/src/lib/kdf/prf_tls/prf_tls.cpp b/src/lib/kdf/prf_tls/prf_tls.cpp
index 6437932a8..79292922c 100644
--- a/src/lib/kdf/prf_tls/prf_tls.cpp
+++ b/src/lib/kdf/prf_tls/prf_tls.cpp
@@ -2,7 +2,7 @@
* TLS v1.0 and v1.2 PRFs
* (C) 2004-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/prf_tls.h>
diff --git a/src/lib/kdf/prf_tls/prf_tls.h b/src/lib/kdf/prf_tls/prf_tls.h
index a442ca8f0..71b4d55e9 100644
--- a/src/lib/kdf/prf_tls/prf_tls.h
+++ b/src/lib/kdf/prf_tls/prf_tls.h
@@ -2,7 +2,7 @@
* TLS v1.0 and v1.2 PRFs
* (C) 2004-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_PRF_H__
diff --git a/src/lib/kdf/prf_x942/prf_x942.cpp b/src/lib/kdf/prf_x942/prf_x942.cpp
index a1ab6bc92..a5ee1f3e4 100644
--- a/src/lib/kdf/prf_x942/prf_x942.cpp
+++ b/src/lib/kdf/prf_x942/prf_x942.cpp
@@ -2,7 +2,7 @@
* X9.42 PRF
* (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/prf_x942.h>
diff --git a/src/lib/kdf/prf_x942/prf_x942.h b/src/lib/kdf/prf_x942/prf_x942.h
index f86b1bdd5..d2678c127 100644
--- a/src/lib/kdf/prf_x942/prf_x942.h
+++ b/src/lib/kdf/prf_x942/prf_x942.h
@@ -2,7 +2,7 @@
* X9.42 PRF
* (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_ANSI_X942_PRF_H__
diff --git a/src/lib/libstate/botan.h b/src/lib/libstate/botan.h
index 42d3dc392..d586f5a21 100644
--- a/src/lib/libstate/botan.h
+++ b/src/lib/libstate/botan.h
@@ -2,7 +2,7 @@
* A vague catch all include file for Botan
* (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_BOTAN_H__
diff --git a/src/lib/libstate/entropy_srcs.cpp b/src/lib/libstate/entropy_srcs.cpp
index 1f36a945d..de146d0ba 100644
--- a/src/lib/libstate/entropy_srcs.cpp
+++ b/src/lib/libstate/entropy_srcs.cpp
@@ -2,7 +2,7 @@
* Global PRNG
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/libstate.h>
diff --git a/src/lib/libstate/global_state.cpp b/src/lib/libstate/global_state.cpp
index 6a846d9b0..3fd202d5f 100644
--- a/src/lib/libstate/global_state.cpp
+++ b/src/lib/libstate/global_state.cpp
@@ -2,7 +2,7 @@
* Global State Management
* (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/global_state.h>
diff --git a/src/lib/libstate/global_state.h b/src/lib/libstate/global_state.h
index 486aed17e..6597b6606 100644
--- a/src/lib/libstate/global_state.h
+++ b/src/lib/libstate/global_state.h
@@ -2,7 +2,7 @@
* Global State Management
* (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_GLOBAL_STATE_H__
diff --git a/src/lib/libstate/init.cpp b/src/lib/libstate/init.cpp
index 2d724f366..09ecca5a1 100644
--- a/src/lib/libstate/init.cpp
+++ b/src/lib/libstate/init.cpp
@@ -2,7 +2,7 @@
* Default Initialization Function
* (C) 1999-2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/init.h>
diff --git a/src/lib/libstate/init.h b/src/lib/libstate/init.h
index 2d70e4370..6f061df03 100644
--- a/src/lib/libstate/init.h
+++ b/src/lib/libstate/init.h
@@ -2,7 +2,7 @@
* Library Initialization
* (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_LIBRARY_INITIALIZER_H__
diff --git a/src/lib/libstate/libstate.cpp b/src/lib/libstate/libstate.cpp
index 649dcc9b4..87cffd318 100644
--- a/src/lib/libstate/libstate.cpp
+++ b/src/lib/libstate/libstate.cpp
@@ -2,7 +2,7 @@
* Library Internal/Global State
* (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/libstate.h>
diff --git a/src/lib/libstate/libstate.h b/src/lib/libstate/libstate.h
index d45c045ec..a85fc7e5a 100644
--- a/src/lib/libstate/libstate.h
+++ b/src/lib/libstate/libstate.h
@@ -2,7 +2,7 @@
* Library Internal/Global State
* (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_LIB_STATE_H__
diff --git a/src/lib/libstate/lookup.cpp b/src/lib/libstate/lookup.cpp
index 85f93bb95..290c266a3 100644
--- a/src/lib/libstate/lookup.cpp
+++ b/src/lib/libstate/lookup.cpp
@@ -2,7 +2,7 @@
* Algorithm Retrieval
* (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/lookup.h>
diff --git a/src/lib/libstate/lookup.h b/src/lib/libstate/lookup.h
index e0024c224..b716c03bb 100644
--- a/src/lib/libstate/lookup.h
+++ b/src/lib/libstate/lookup.h
@@ -2,7 +2,7 @@
* Algorithm Lookup
* (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_LOOKUP_H__
diff --git a/src/lib/mac/cbc_mac/cbc_mac.cpp b/src/lib/mac/cbc_mac/cbc_mac.cpp
index 7d9a55e28..e8fc394fa 100644
--- a/src/lib/mac/cbc_mac/cbc_mac.cpp
+++ b/src/lib/mac/cbc_mac/cbc_mac.cpp
@@ -2,7 +2,7 @@
* CBC-MAC
* (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/cbc_mac.h>
diff --git a/src/lib/mac/cbc_mac/cbc_mac.h b/src/lib/mac/cbc_mac/cbc_mac.h
index d7cb5893c..10c8a0da4 100644
--- a/src/lib/mac/cbc_mac/cbc_mac.h
+++ b/src/lib/mac/cbc_mac/cbc_mac.h
@@ -2,7 +2,7 @@
* CBC-MAC
* (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_CBC_MAC_H__
diff --git a/src/lib/mac/cmac/cmac.cpp b/src/lib/mac/cmac/cmac.cpp
index daa320a36..2e90e9002 100644
--- a/src/lib/mac/cmac/cmac.cpp
+++ b/src/lib/mac/cmac/cmac.cpp
@@ -2,7 +2,7 @@
* CMAC
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/cmac.h>
diff --git a/src/lib/mac/cmac/cmac.h b/src/lib/mac/cmac/cmac.h
index eb633c168..491a081a4 100644
--- a/src/lib/mac/cmac/cmac.h
+++ b/src/lib/mac/cmac/cmac.h
@@ -2,7 +2,7 @@
* CMAC
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_CMAC_H__
diff --git a/src/lib/mac/hmac/hmac.cpp b/src/lib/mac/hmac/hmac.cpp
index 6d8e393ae..625fd122e 100644
--- a/src/lib/mac/hmac/hmac.cpp
+++ b/src/lib/mac/hmac/hmac.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2007,2014 Jack Lloyd
* 2007 Yves Jerschow
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/hmac.h>
diff --git a/src/lib/mac/hmac/hmac.h b/src/lib/mac/hmac/hmac.h
index b08502db4..b6311d741 100644
--- a/src/lib/mac/hmac/hmac.h
+++ b/src/lib/mac/hmac/hmac.h
@@ -2,7 +2,7 @@
* HMAC
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_HMAC_H__
diff --git a/src/lib/mac/mac.cpp b/src/lib/mac/mac.cpp
index 094aa1b4a..cd1951639 100644
--- a/src/lib/mac/mac.cpp
+++ b/src/lib/mac/mac.cpp
@@ -2,7 +2,7 @@
* Message Authentication Code base class
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/mac.h>
diff --git a/src/lib/mac/mac.h b/src/lib/mac/mac.h
index d42092908..e472e4d0b 100644
--- a/src/lib/mac/mac.h
+++ b/src/lib/mac/mac.h
@@ -2,7 +2,7 @@
* Base class for message authentiction codes
* (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_MESSAGE_AUTH_CODE_BASE_H__
diff --git a/src/lib/mac/poly1305/poly1305.cpp b/src/lib/mac/poly1305/poly1305.cpp
index 11ce0fe41..8000ebbd8 100644
--- a/src/lib/mac/poly1305/poly1305.cpp
+++ b/src/lib/mac/poly1305/poly1305.cpp
@@ -2,7 +2,7 @@
* Poly1305
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/poly1305.h>
diff --git a/src/lib/mac/poly1305/poly1305.h b/src/lib/mac/poly1305/poly1305.h
index 8334edb03..1c7fbf7fd 100644
--- a/src/lib/mac/poly1305/poly1305.h
+++ b/src/lib/mac/poly1305/poly1305.h
@@ -2,7 +2,7 @@
* Poly1305
* (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_MAC_POLY1305_H__
diff --git a/src/lib/mac/poly1305/poly1305_donna.h b/src/lib/mac/poly1305/poly1305_donna.h
index f0f3fe387..fa190baa5 100644
--- a/src/lib/mac/poly1305/poly1305_donna.h
+++ b/src/lib/mac/poly1305/poly1305_donna.h
@@ -4,7 +4,7 @@
*
* (C) 2014 Andrew Moon
* (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_POLY1305_DONNA_H__
diff --git a/src/lib/mac/ssl3mac/ssl3_mac.cpp b/src/lib/mac/ssl3mac/ssl3_mac.cpp
index 82a26cfaf..5ab5ff727 100644
--- a/src/lib/mac/ssl3mac/ssl3_mac.cpp
+++ b/src/lib/mac/ssl3mac/ssl3_mac.cpp
@@ -2,7 +2,7 @@
* SSL3-MAC
* (C) 1999-2004 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ssl3_mac.h>
diff --git a/src/lib/mac/ssl3mac/ssl3_mac.h b/src/lib/mac/ssl3mac/ssl3_mac.h
index 3fb08e7b1..290fffd01 100644
--- a/src/lib/mac/ssl3mac/ssl3_mac.h
+++ b/src/lib/mac/ssl3mac/ssl3_mac.h
@@ -2,7 +2,7 @@
* SSL3-MAC
* (C) 1999-2004 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SSL3_MAC_H__
diff --git a/src/lib/mac/x919_mac/x919_mac.cpp b/src/lib/mac/x919_mac/x919_mac.cpp
index 1a6d03761..4378a432f 100644
--- a/src/lib/mac/x919_mac/x919_mac.cpp
+++ b/src/lib/mac/x919_mac/x919_mac.cpp
@@ -2,7 +2,7 @@
* ANSI X9.19 MAC
* (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/x919_mac.h>
diff --git a/src/lib/mac/x919_mac/x919_mac.h b/src/lib/mac/x919_mac/x919_mac.h
index 97f1e9f89..35553c544 100644
--- a/src/lib/mac/x919_mac/x919_mac.h
+++ b/src/lib/mac/x919_mac/x919_mac.h
@@ -2,7 +2,7 @@
* ANSI X9.19 MAC
* (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_ANSI_X919_MAC_H__
diff --git a/src/lib/math/bigint/big_code.cpp b/src/lib/math/bigint/big_code.cpp
index 972312cdb..228edb51a 100644
--- a/src/lib/math/bigint/big_code.cpp
+++ b/src/lib/math/bigint/big_code.cpp
@@ -2,7 +2,7 @@
* BigInt Encoding/Decoding
* (C) 1999-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/bigint.h>
diff --git a/src/lib/math/bigint/big_io.cpp b/src/lib/math/bigint/big_io.cpp
index b561c218f..9cd0a2cef 100644
--- a/src/lib/math/bigint/big_io.cpp
+++ b/src/lib/math/bigint/big_io.cpp
@@ -2,7 +2,7 @@
* BigInt Input/Output
* (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/bigint.h>
diff --git a/src/lib/math/bigint/big_ops2.cpp b/src/lib/math/bigint/big_ops2.cpp
index 37b6a5df1..bd74b8b0d 100644
--- a/src/lib/math/bigint/big_ops2.cpp
+++ b/src/lib/math/bigint/big_ops2.cpp
@@ -2,7 +2,7 @@
* BigInt Assignment Operators
* (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/bigint.h>
diff --git a/src/lib/math/bigint/big_ops3.cpp b/src/lib/math/bigint/big_ops3.cpp
index cad730197..35633ee27 100644
--- a/src/lib/math/bigint/big_ops3.cpp
+++ b/src/lib/math/bigint/big_ops3.cpp
@@ -2,7 +2,7 @@
* BigInt Binary Operators
* (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/bigint.h>
diff --git a/src/lib/math/bigint/big_rand.cpp b/src/lib/math/bigint/big_rand.cpp
index 78b9ee244..7a843acd5 100644
--- a/src/lib/math/bigint/big_rand.cpp
+++ b/src/lib/math/bigint/big_rand.cpp
@@ -2,7 +2,7 @@
* BigInt Random Generation
* (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/bigint.h>
diff --git a/src/lib/math/bigint/bigint.cpp b/src/lib/math/bigint/bigint.cpp
index bb4b86f6b..6acd04f00 100644
--- a/src/lib/math/bigint/bigint.cpp
+++ b/src/lib/math/bigint/bigint.cpp
@@ -2,7 +2,7 @@
* BigInt Base
* (C) 1999-2011,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/bigint.h>
diff --git a/src/lib/math/bigint/bigint.h b/src/lib/math/bigint/bigint.h
index b14805a40..4993f5d0c 100644
--- a/src/lib/math/bigint/bigint.h
+++ b/src/lib/math/bigint/bigint.h
@@ -3,7 +3,7 @@
* (C) 1999-2008,2012 Jack Lloyd
* 2007 FlexSecure
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_BIGINT_H__
diff --git a/src/lib/math/bigint/divide.cpp b/src/lib/math/bigint/divide.cpp
index 8b21bce13..ec4ba3f9f 100644
--- a/src/lib/math/bigint/divide.cpp
+++ b/src/lib/math/bigint/divide.cpp
@@ -2,7 +2,7 @@
* Division Algorithm
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/divide.h>
diff --git a/src/lib/math/bigint/divide.h b/src/lib/math/bigint/divide.h
index 36aed7854..a160e64dc 100644
--- a/src/lib/math/bigint/divide.h
+++ b/src/lib/math/bigint/divide.h
@@ -2,7 +2,7 @@
* Division
* (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_DIVISON_ALGORITHM_H__
diff --git a/src/lib/math/ec_gfp/curve_gfp.cpp b/src/lib/math/ec_gfp/curve_gfp.cpp
index 2ee4ae41e..02265b53a 100644
--- a/src/lib/math/ec_gfp/curve_gfp.cpp
+++ b/src/lib/math/ec_gfp/curve_gfp.cpp
@@ -2,7 +2,7 @@
* Elliptic curves over GF(p) Montgomery Representation
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/curve_gfp.h>
diff --git a/src/lib/math/ec_gfp/curve_gfp.h b/src/lib/math/ec_gfp/curve_gfp.h
index 59639d537..4acbd4004 100644
--- a/src/lib/math/ec_gfp/curve_gfp.h
+++ b/src/lib/math/ec_gfp/curve_gfp.h
@@ -4,7 +4,7 @@
* (C) 2007 Martin Doering, Christoph Ludwig, Falko Strenzke
* 2010-2011,2012,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_GFP_CURVE_H__
diff --git a/src/lib/math/ec_gfp/curve_nistp.cpp b/src/lib/math/ec_gfp/curve_nistp.cpp
index 1aac01f56..d0ccf929a 100644
--- a/src/lib/math/ec_gfp/curve_nistp.cpp
+++ b/src/lib/math/ec_gfp/curve_nistp.cpp
@@ -2,7 +2,7 @@
* NIST curve reduction
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/curve_nistp.h>
diff --git a/src/lib/math/ec_gfp/curve_nistp.h b/src/lib/math/ec_gfp/curve_nistp.h
index ffa32d377..3a1a603c8 100644
--- a/src/lib/math/ec_gfp/curve_nistp.h
+++ b/src/lib/math/ec_gfp/curve_nistp.h
@@ -2,7 +2,7 @@
* NIST elliptic curves over GF(p)
* (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_GFP_CURVE_NIST_H__
diff --git a/src/lib/math/ec_gfp/point_gfp.cpp b/src/lib/math/ec_gfp/point_gfp.cpp
index a4856cef8..551407faf 100644
--- a/src/lib/math/ec_gfp/point_gfp.cpp
+++ b/src/lib/math/ec_gfp/point_gfp.cpp
@@ -4,7 +4,7 @@
* (C) 2007 Martin Doering, Christoph Ludwig, Falko Strenzke
* 2008-2011,2012,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/point_gfp.h>
diff --git a/src/lib/math/ec_gfp/point_gfp.h b/src/lib/math/ec_gfp/point_gfp.h
index c91b0513f..8cbb59370 100644
--- a/src/lib/math/ec_gfp/point_gfp.h
+++ b/src/lib/math/ec_gfp/point_gfp.h
@@ -4,7 +4,7 @@
* (C) 2007 Martin Doering, Christoph Ludwig, Falko Strenzke
* 2008-2011,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_POINT_GFP_H__
diff --git a/src/lib/math/mp/mp_asm.cpp b/src/lib/math/mp/mp_asm.cpp
index 78fbba3d8..6941a22e9 100644
--- a/src/lib/math/mp/mp_asm.cpp
+++ b/src/lib/math/mp/mp_asm.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/mp_core.h>
diff --git a/src/lib/math/mp/mp_comba.cpp b/src/lib/math/mp/mp_comba.cpp
index b56a59291..a21b25ed6 100644
--- a/src/lib/math/mp/mp_comba.cpp
+++ b/src/lib/math/mp/mp_comba.cpp
@@ -2,7 +2,7 @@
* Comba Multiplication and Squaring
* (C) 1999-2007,2011,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/mp_core.h>
diff --git a/src/lib/math/mp/mp_core.h b/src/lib/math/mp/mp_core.h
index 64b29b869..06f1d4a2d 100644
--- a/src/lib/math/mp/mp_core.h
+++ b/src/lib/math/mp/mp_core.h
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_CORE_OPS_H__
diff --git a/src/lib/math/mp/mp_generic/mp_asmi.h b/src/lib/math/mp/mp_generic/mp_asmi.h
index 018055696..c094436f6 100644
--- a/src/lib/math/mp/mp_generic/mp_asmi.h
+++ b/src/lib/math/mp/mp_generic/mp_asmi.h
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_ASM_INTERNAL_H__
diff --git a/src/lib/math/mp/mp_generic/mp_madd.h b/src/lib/math/mp/mp_generic/mp_madd.h
index 17713f55f..d0d56c23f 100644
--- a/src/lib/math/mp/mp_generic/mp_madd.h
+++ b/src/lib/math/mp/mp_generic/mp_madd.h
@@ -3,7 +3,7 @@
* (C) 1999-2008,2013 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_WORD_MULADD_H__
diff --git a/src/lib/math/mp/mp_karat.cpp b/src/lib/math/mp/mp_karat.cpp
index f576ff612..faa91040c 100644
--- a/src/lib/math/mp/mp_karat.cpp
+++ b/src/lib/math/mp/mp_karat.cpp
@@ -2,7 +2,7 @@
* Karatsuba Multiplication/Squaring
* (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/internal/mp_core.h>
diff --git a/src/lib/math/mp/mp_misc.cpp b/src/lib/math/mp/mp_misc.cpp
index 0efd5fd19..4f24765bb 100644
--- a/src/lib/math/mp/mp_misc.cpp
+++ b/src/lib/math/mp/mp_misc.cpp
@@ -2,7 +2,7 @@
* MP Misc Functions
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/mp_core.h>
diff --git a/src/lib/math/mp/mp_monty.cpp b/src/lib/math/mp/mp_monty.cpp
index 331153f06..ffceaab9b 100644
--- a/src/lib/math/mp/mp_monty.cpp
+++ b/src/lib/math/mp/mp_monty.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2011 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/mp_core.h>
diff --git a/src/lib/math/mp/mp_mulop.cpp b/src/lib/math/mp/mp_mulop.cpp
index 0c79cc2ef..95a0e015e 100644
--- a/src/lib/math/mp/mp_mulop.cpp
+++ b/src/lib/math/mp/mp_mulop.cpp
@@ -2,7 +2,7 @@
* Simple O(N^2) Multiplication and Squaring
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/mp_core.h>
diff --git a/src/lib/math/mp/mp_shift.cpp b/src/lib/math/mp/mp_shift.cpp
index b35f3a00b..d58a0c809 100644
--- a/src/lib/math/mp/mp_shift.cpp
+++ b/src/lib/math/mp/mp_shift.cpp
@@ -2,7 +2,7 @@
* MP Shift Algorithms
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/mp_core.h>
diff --git a/src/lib/math/mp/mp_types.h b/src/lib/math/mp/mp_types.h
index 60282fb83..eab0d0c6c 100644
--- a/src/lib/math/mp/mp_types.h
+++ b/src/lib/math/mp/mp_types.h
@@ -2,7 +2,7 @@
* Low Level MPI 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_MPI_TYPES_H__
diff --git a/src/lib/math/mp/mp_x86_32/mp_asmi.h b/src/lib/math/mp/mp_x86_32/mp_asmi.h
index 9b858c8d5..49ca428d6 100644
--- a/src/lib/math/mp/mp_x86_32/mp_asmi.h
+++ b/src/lib/math/mp/mp_x86_32/mp_asmi.h
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_ASM_INTERNAL_H__
diff --git a/src/lib/math/mp/mp_x86_32/mp_madd.h b/src/lib/math/mp/mp_x86_32/mp_madd.h
index 9d60c721d..b6a60aecd 100644
--- a/src/lib/math/mp/mp_x86_32/mp_madd.h
+++ b/src/lib/math/mp/mp_x86_32/mp_madd.h
@@ -3,7 +3,7 @@
* (C) 1999-2008 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_WORD_MULADD_H__
diff --git a/src/lib/math/mp/mp_x86_32_msvc/mp_asmi.h b/src/lib/math/mp/mp_x86_32_msvc/mp_asmi.h
index ef149c920..b4a9af1e3 100644
--- a/src/lib/math/mp/mp_x86_32_msvc/mp_asmi.h
+++ b/src/lib/math/mp/mp_x86_32_msvc/mp_asmi.h
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_ASM_INTERNAL_H__
diff --git a/src/lib/math/mp/mp_x86_64/mp_asmi.h b/src/lib/math/mp/mp_x86_64/mp_asmi.h
index b2f1202e3..2c7683650 100644
--- a/src/lib/math/mp/mp_x86_64/mp_asmi.h
+++ b/src/lib/math/mp/mp_x86_64/mp_asmi.h
@@ -3,7 +3,7 @@
* (C) 1999-2010 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_ASM_INTERNAL_H__
diff --git a/src/lib/math/mp/mp_x86_64/mp_madd.h b/src/lib/math/mp/mp_x86_64/mp_madd.h
index 4c0d79931..25f791da4 100644
--- a/src/lib/math/mp/mp_x86_64/mp_madd.h
+++ b/src/lib/math/mp/mp_x86_64/mp_madd.h
@@ -3,7 +3,7 @@
* (C) 1999-2008 Jack Lloyd
* 2006 Luca Piccarreta
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MP_WORD_MULADD_H__
diff --git a/src/lib/math/numbertheory/def_powm.h b/src/lib/math/numbertheory/def_powm.h
index 6ceee7bb6..3a56a1693 100644
--- a/src/lib/math/numbertheory/def_powm.h
+++ b/src/lib/math/numbertheory/def_powm.h
@@ -2,7 +2,7 @@
* Modular Exponentiation
* (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_DEFAULT_MODEXP_H__
diff --git a/src/lib/math/numbertheory/dsa_gen.cpp b/src/lib/math/numbertheory/dsa_gen.cpp
index 796fb6ec2..6524ad7d8 100644
--- a/src/lib/math/numbertheory/dsa_gen.cpp
+++ b/src/lib/math/numbertheory/dsa_gen.cpp
@@ -2,7 +2,7 @@
* DSA Parameter Generation
* (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/numthry.h>
diff --git a/src/lib/math/numbertheory/jacobi.cpp b/src/lib/math/numbertheory/jacobi.cpp
index fcccc80e5..0077fb10e 100644
--- a/src/lib/math/numbertheory/jacobi.cpp
+++ b/src/lib/math/numbertheory/jacobi.cpp
@@ -2,7 +2,7 @@
* Jacobi Function
* (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/numthry.h>
diff --git a/src/lib/math/numbertheory/make_prm.cpp b/src/lib/math/numbertheory/make_prm.cpp
index 2c8cd086d..1333fdf04 100644
--- a/src/lib/math/numbertheory/make_prm.cpp
+++ b/src/lib/math/numbertheory/make_prm.cpp
@@ -2,7 +2,7 @@
* Prime Generation
* (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/numthry.h>
diff --git a/src/lib/math/numbertheory/mp_numth.cpp b/src/lib/math/numbertheory/mp_numth.cpp
index e6826b9dd..724f0c774 100644
--- a/src/lib/math/numbertheory/mp_numth.cpp
+++ b/src/lib/math/numbertheory/mp_numth.cpp
@@ -2,7 +2,7 @@
* Fused and Important MP Algorithms
* (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/numthry.h>
diff --git a/src/lib/math/numbertheory/numthry.cpp b/src/lib/math/numbertheory/numthry.cpp
index ce25b5047..565cc543a 100644
--- a/src/lib/math/numbertheory/numthry.cpp
+++ b/src/lib/math/numbertheory/numthry.cpp
@@ -2,7 +2,7 @@
* Number Theory Functions
* (C) 1999-2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/numthry.h>
diff --git a/src/lib/math/numbertheory/numthry.h b/src/lib/math/numbertheory/numthry.h
index 5499ff76f..b7a77d4da 100644
--- a/src/lib/math/numbertheory/numthry.h
+++ b/src/lib/math/numbertheory/numthry.h
@@ -2,7 +2,7 @@
* Number Theory 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_NUMBER_THEORY_H__
diff --git a/src/lib/math/numbertheory/pow_mod.cpp b/src/lib/math/numbertheory/pow_mod.cpp
index c7d7fe70e..b5fc3747e 100644
--- a/src/lib/math/numbertheory/pow_mod.cpp
+++ b/src/lib/math/numbertheory/pow_mod.cpp
@@ -2,7 +2,7 @@
* Modular Exponentiation Proxy
* (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/pow_mod.h>
diff --git a/src/lib/math/numbertheory/pow_mod.h b/src/lib/math/numbertheory/pow_mod.h
index 388006dd5..9a827562e 100644
--- a/src/lib/math/numbertheory/pow_mod.h
+++ b/src/lib/math/numbertheory/pow_mod.h
@@ -2,7 +2,7 @@
* Modular Exponentiator
* (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_POWER_MOD_H__
diff --git a/src/lib/math/numbertheory/powm_fw.cpp b/src/lib/math/numbertheory/powm_fw.cpp
index 16a48a5b0..14474104e 100644
--- a/src/lib/math/numbertheory/powm_fw.cpp
+++ b/src/lib/math/numbertheory/powm_fw.cpp
@@ -2,7 +2,7 @@
* Fixed Window Exponentiation
* (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/internal/def_powm.h>
diff --git a/src/lib/math/numbertheory/powm_mnt.cpp b/src/lib/math/numbertheory/powm_mnt.cpp
index a3eac1f83..c8bf0928c 100644
--- a/src/lib/math/numbertheory/powm_mnt.cpp
+++ b/src/lib/math/numbertheory/powm_mnt.cpp
@@ -2,7 +2,7 @@
* Montgomery Exponentiation
* (C) 1999-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/internal/def_powm.h>
diff --git a/src/lib/math/numbertheory/primes.cpp b/src/lib/math/numbertheory/primes.cpp
index a0c0f0093..50229ad15 100644
--- a/src/lib/math/numbertheory/primes.cpp
+++ b/src/lib/math/numbertheory/primes.cpp
@@ -2,7 +2,7 @@
* Small Primes Table
* (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/numthry.h>
diff --git a/src/lib/math/numbertheory/reducer.cpp b/src/lib/math/numbertheory/reducer.cpp
index 8e8951c46..332895d63 100644
--- a/src/lib/math/numbertheory/reducer.cpp
+++ b/src/lib/math/numbertheory/reducer.cpp
@@ -2,7 +2,7 @@
* Modular Reducer
* (C) 1999-2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/reducer.h>
diff --git a/src/lib/math/numbertheory/reducer.h b/src/lib/math/numbertheory/reducer.h
index 76712074c..b45e0e186 100644
--- a/src/lib/math/numbertheory/reducer.h
+++ b/src/lib/math/numbertheory/reducer.h
@@ -2,7 +2,7 @@
* Modular Reducer
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MODULAR_REDUCER_H__
diff --git a/src/lib/math/numbertheory/ressol.cpp b/src/lib/math/numbertheory/ressol.cpp
index 9c48187f4..834dd94ce 100644
--- a/src/lib/math/numbertheory/ressol.cpp
+++ b/src/lib/math/numbertheory/ressol.cpp
@@ -3,7 +3,7 @@
* (C) 2007-2008 Falko Strenzke, FlexSecure GmbH
* (C) 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/numthry.h>
diff --git a/src/lib/modes/aead/aead.cpp b/src/lib/modes/aead/aead.cpp
index ee410f031..b1cce73e0 100644
--- a/src/lib/modes/aead/aead.cpp
+++ b/src/lib/modes/aead/aead.cpp
@@ -2,7 +2,7 @@
* Interface for AEAD modes
* (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/aead.h>
diff --git a/src/lib/modes/aead/aead.h b/src/lib/modes/aead/aead.h
index 5f6c1583d..41fc605ba 100644
--- a/src/lib/modes/aead/aead.h
+++ b/src/lib/modes/aead/aead.h
@@ -2,7 +2,7 @@
* Interface for AEAD modes
* (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_AEAD_MODE_H__
diff --git a/src/lib/modes/aead/ccm/ccm.cpp b/src/lib/modes/aead/ccm/ccm.cpp
index 2ae58c990..e0b247ddb 100644
--- a/src/lib/modes/aead/ccm/ccm.cpp
+++ b/src/lib/modes/aead/ccm/ccm.cpp
@@ -2,7 +2,7 @@
* CCM Mode Encryption
* (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/ccm.h>
diff --git a/src/lib/modes/aead/ccm/ccm.h b/src/lib/modes/aead/ccm/ccm.h
index 9db377827..5af5f984d 100644
--- a/src/lib/modes/aead/ccm/ccm.h
+++ b/src/lib/modes/aead/ccm/ccm.h
@@ -2,7 +2,7 @@
* CCM Mode
* (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_AEAD_CCM_H__
diff --git a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp
index db215b66b..38c2c2813 100644
--- a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp
+++ b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.cpp
@@ -2,7 +2,7 @@
* ChaCha20Poly1305 AEAD
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/chacha20poly1305.h>
diff --git a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
index fbeecba05..a3b83dc63 100644
--- a/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
+++ b/src/lib/modes/aead/chacha20poly1305/chacha20poly1305.h
@@ -2,7 +2,7 @@
* ChaCha20Poly1305 AEAD
* (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_AEAD_CHACHA20_POLY1305_H__
diff --git a/src/lib/modes/aead/eax/eax.cpp b/src/lib/modes/aead/eax/eax.cpp
index c1d55d0e4..289278a52 100644
--- a/src/lib/modes/aead/eax/eax.cpp
+++ b/src/lib/modes/aead/eax/eax.cpp
@@ -2,7 +2,7 @@
* EAX Mode Encryption
* (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/eax.h>
diff --git a/src/lib/modes/aead/eax/eax.h b/src/lib/modes/aead/eax/eax.h
index 9e721c303..970bb9d43 100644
--- a/src/lib/modes/aead/eax/eax.h
+++ b/src/lib/modes/aead/eax/eax.h
@@ -2,7 +2,7 @@
* EAX Mode
* (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_AEAD_EAX_H__
diff --git a/src/lib/modes/aead/gcm/clmul/clmul.cpp b/src/lib/modes/aead/gcm/clmul/clmul.cpp
index 87a0a98ca..4f7eb8dc0 100644
--- a/src/lib/modes/aead/gcm/clmul/clmul.cpp
+++ b/src/lib/modes/aead/gcm/clmul/clmul.cpp
@@ -2,7 +2,7 @@
* CLMUL hook
* (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/internal/clmul.h>
diff --git a/src/lib/modes/aead/gcm/clmul/clmul.h b/src/lib/modes/aead/gcm/clmul/clmul.h
index 6bcc0e2a0..a3d8d9851 100644
--- a/src/lib/modes/aead/gcm/clmul/clmul.h
+++ b/src/lib/modes/aead/gcm/clmul/clmul.h
@@ -2,7 +2,7 @@
* CLMUL hook
* (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_GCM_CLMUL_H__
diff --git a/src/lib/modes/aead/gcm/gcm.cpp b/src/lib/modes/aead/gcm/gcm.cpp
index 2b60f332e..0acaa57e9 100644
--- a/src/lib/modes/aead/gcm/gcm.cpp
+++ b/src/lib/modes/aead/gcm/gcm.cpp
@@ -2,7 +2,7 @@
* GCM Mode Encryption
* (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/gcm.h>
diff --git a/src/lib/modes/aead/gcm/gcm.h b/src/lib/modes/aead/gcm/gcm.h
index 918f3c7c7..ea3263c0a 100644
--- a/src/lib/modes/aead/gcm/gcm.h
+++ b/src/lib/modes/aead/gcm/gcm.h
@@ -2,7 +2,7 @@
* GCM Mode
* (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_AEAD_GCM_H__
diff --git a/src/lib/modes/aead/ocb/ocb.cpp b/src/lib/modes/aead/ocb/ocb.cpp
index f3aa8e06c..2ba30b2f9 100644
--- a/src/lib/modes/aead/ocb/ocb.cpp
+++ b/src/lib/modes/aead/ocb/ocb.cpp
@@ -2,7 +2,7 @@
* OCB Mode
* (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/ocb.h>
diff --git a/src/lib/modes/aead/ocb/ocb.h b/src/lib/modes/aead/ocb/ocb.h
index 02ea0b0a1..995870967 100644
--- a/src/lib/modes/aead/ocb/ocb.h
+++ b/src/lib/modes/aead/ocb/ocb.h
@@ -2,7 +2,7 @@
* OCB Mode
* (C) 2013,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_AEAD_OCB_H__
diff --git a/src/lib/modes/aead/siv/siv.cpp b/src/lib/modes/aead/siv/siv.cpp
index 827be1ef7..b183bd6a0 100644
--- a/src/lib/modes/aead/siv/siv.cpp
+++ b/src/lib/modes/aead/siv/siv.cpp
@@ -2,7 +2,7 @@
* SIV Mode Encryption
* (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/siv.h>
diff --git a/src/lib/modes/aead/siv/siv.h b/src/lib/modes/aead/siv/siv.h
index 433771696..8336026cb 100644
--- a/src/lib/modes/aead/siv/siv.h
+++ b/src/lib/modes/aead/siv/siv.h
@@ -2,7 +2,7 @@
* SIV Mode
* (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_AEAD_SIV_H__
diff --git a/src/lib/modes/cbc/cbc.cpp b/src/lib/modes/cbc/cbc.cpp
index c527014f4..e89635a5d 100644
--- a/src/lib/modes/cbc/cbc.cpp
+++ b/src/lib/modes/cbc/cbc.cpp
@@ -2,7 +2,7 @@
* CBC Mode
* (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)
*/
#include <botan/cbc.h>
diff --git a/src/lib/modes/cbc/cbc.h b/src/lib/modes/cbc/cbc.h
index 833cceb7c..2de303da9 100644
--- a/src/lib/modes/cbc/cbc.h
+++ b/src/lib/modes/cbc/cbc.h
@@ -2,7 +2,7 @@
* CBC mode
* (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_MODE_CBC_H__
diff --git a/src/lib/modes/cfb/cfb.cpp b/src/lib/modes/cfb/cfb.cpp
index 4b0c210f9..5c33ee3cb 100644
--- a/src/lib/modes/cfb/cfb.cpp
+++ b/src/lib/modes/cfb/cfb.cpp
@@ -2,7 +2,7 @@
* CFB Mode
* (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)
*/
#include <botan/cfb.h>
diff --git a/src/lib/modes/cfb/cfb.h b/src/lib/modes/cfb/cfb.h
index 7e616f94e..6d16ba708 100644
--- a/src/lib/modes/cfb/cfb.h
+++ b/src/lib/modes/cfb/cfb.h
@@ -2,7 +2,7 @@
* CFB mode
* (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_MODE_CFB_H__
diff --git a/src/lib/modes/cipher_mode.h b/src/lib/modes/cipher_mode.h
index ce5427ad9..2f75fad1c 100644
--- a/src/lib/modes/cipher_mode.h
+++ b/src/lib/modes/cipher_mode.h
@@ -2,7 +2,7 @@
* Cipher Modes
* (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_CIPHER_MODE_H__
diff --git a/src/lib/modes/ecb/ecb.cpp b/src/lib/modes/ecb/ecb.cpp
index 93e70cf49..53f54da99 100644
--- a/src/lib/modes/ecb/ecb.cpp
+++ b/src/lib/modes/ecb/ecb.cpp
@@ -2,7 +2,7 @@
* ECB Mode
* (C) 1999-2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ecb.h>
diff --git a/src/lib/modes/ecb/ecb.h b/src/lib/modes/ecb/ecb.h
index 1e95e00a8..e885e8890 100644
--- a/src/lib/modes/ecb/ecb.h
+++ b/src/lib/modes/ecb/ecb.h
@@ -2,7 +2,7 @@
* ECB Mode
* (C) 1999-2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MODE_ECB_H__
diff --git a/src/lib/modes/mode_pad/mode_pad.cpp b/src/lib/modes/mode_pad/mode_pad.cpp
index 918964c74..946cd92c7 100644
--- a/src/lib/modes/mode_pad/mode_pad.cpp
+++ b/src/lib/modes/mode_pad/mode_pad.cpp
@@ -2,7 +2,7 @@
* CBC Padding Methods
* (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)
*/
#include <botan/mode_pad.h>
diff --git a/src/lib/modes/mode_pad/mode_pad.h b/src/lib/modes/mode_pad/mode_pad.h
index e7c38a196..c60e25849 100644
--- a/src/lib/modes/mode_pad/mode_pad.h
+++ b/src/lib/modes/mode_pad/mode_pad.h
@@ -2,7 +2,7 @@
* ECB/CBC Padding Methods
* (C) 1999-2008,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MODE_PADDING_H__
diff --git a/src/lib/modes/xts/xts.cpp b/src/lib/modes/xts/xts.cpp
index d0680d4d9..cd3a0c653 100644
--- a/src/lib/modes/xts/xts.cpp
+++ b/src/lib/modes/xts/xts.cpp
@@ -2,7 +2,7 @@
* XTS Mode
* (C) 2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/xts.h>
diff --git a/src/lib/modes/xts/xts.h b/src/lib/modes/xts/xts.h
index bdc52b79e..7e0a1f5c4 100644
--- a/src/lib/modes/xts/xts.h
+++ b/src/lib/modes/xts/xts.h
@@ -2,7 +2,7 @@
* XTS mode, from IEEE P1619
* (C) 2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MODE_XTS_H__
diff --git a/src/lib/passhash/bcrypt/bcrypt.cpp b/src/lib/passhash/bcrypt/bcrypt.cpp
index 5ee75f4ed..6766dc0d1 100644
--- a/src/lib/passhash/bcrypt/bcrypt.cpp
+++ b/src/lib/passhash/bcrypt/bcrypt.cpp
@@ -2,7 +2,7 @@
* Bcrypt Password Hashing
* (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/bcrypt.h>
diff --git a/src/lib/passhash/bcrypt/bcrypt.h b/src/lib/passhash/bcrypt/bcrypt.h
index 8a6ab58ea..a460356d4 100644
--- a/src/lib/passhash/bcrypt/bcrypt.h
+++ b/src/lib/passhash/bcrypt/bcrypt.h
@@ -2,7 +2,7 @@
* Bcrypt Password Hashing
* (C) 2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_BCRYPT_H__
diff --git a/src/lib/passhash/passhash9/passhash9.cpp b/src/lib/passhash/passhash9/passhash9.cpp
index b293885c2..2680ac3c4 100644
--- a/src/lib/passhash/passhash9/passhash9.cpp
+++ b/src/lib/passhash/passhash9/passhash9.cpp
@@ -2,7 +2,7 @@
* Passhash9 Password Hashing
* (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/passhash9.h>
diff --git a/src/lib/passhash/passhash9/passhash9.h b/src/lib/passhash/passhash9/passhash9.h
index 5fd0a1bf8..8e8293600 100644
--- a/src/lib/passhash/passhash9/passhash9.h
+++ b/src/lib/passhash/passhash9/passhash9.h
@@ -2,7 +2,7 @@
* Passhash9 Password Hashing
* (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_PASSHASH9_H__
diff --git a/src/lib/pbkdf/pbkdf.cpp b/src/lib/pbkdf/pbkdf.cpp
index ccd203dbd..973805f65 100644
--- a/src/lib/pbkdf/pbkdf.cpp
+++ b/src/lib/pbkdf/pbkdf.cpp
@@ -2,7 +2,7 @@
* PBKDF
* (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/pbkdf.h>
diff --git a/src/lib/pbkdf/pbkdf.h b/src/lib/pbkdf/pbkdf.h
index 2e27a1da8..e86ad265d 100644
--- a/src/lib/pbkdf/pbkdf.h
+++ b/src/lib/pbkdf/pbkdf.h
@@ -2,7 +2,7 @@
* PBKDF
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_PBKDF_H__
diff --git a/src/lib/pbkdf/pbkdf1/pbkdf1.cpp b/src/lib/pbkdf/pbkdf1/pbkdf1.cpp
index 9d1672529..b21530f0c 100644
--- a/src/lib/pbkdf/pbkdf1/pbkdf1.cpp
+++ b/src/lib/pbkdf/pbkdf1/pbkdf1.cpp
@@ -2,7 +2,7 @@
* PBKDF1
* (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/pbkdf1.h>
diff --git a/src/lib/pbkdf/pbkdf1/pbkdf1.h b/src/lib/pbkdf/pbkdf1/pbkdf1.h
index f14691dbd..4c2f3888c 100644
--- a/src/lib/pbkdf/pbkdf1/pbkdf1.h
+++ b/src/lib/pbkdf/pbkdf1/pbkdf1.h
@@ -2,7 +2,7 @@
* PBKDF1
* (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_PBKDF1_H__
diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.cpp b/src/lib/pbkdf/pbkdf2/pbkdf2.cpp
index c24bcaff8..8ca0cbb0c 100644
--- a/src/lib/pbkdf/pbkdf2/pbkdf2.cpp
+++ b/src/lib/pbkdf/pbkdf2/pbkdf2.cpp
@@ -2,7 +2,7 @@
* PBKDF2
* (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/pbkdf2.h>
diff --git a/src/lib/pbkdf/pbkdf2/pbkdf2.h b/src/lib/pbkdf/pbkdf2/pbkdf2.h
index 00f8992d2..d2ed6a08c 100644
--- a/src/lib/pbkdf/pbkdf2/pbkdf2.h
+++ b/src/lib/pbkdf/pbkdf2/pbkdf2.h
@@ -2,7 +2,7 @@
* PBKDF2
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_PBKDF2_H__
diff --git a/src/lib/pk_pad/eme.cpp b/src/lib/pk_pad/eme.cpp
index f90239d8c..dc4c36082 100644
--- a/src/lib/pk_pad/eme.cpp
+++ b/src/lib/pk_pad/eme.cpp
@@ -2,7 +2,7 @@
* EME Base Class
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/eme.h>
diff --git a/src/lib/pk_pad/eme.h b/src/lib/pk_pad/eme.h
index 358b4f144..3c82a8b69 100644
--- a/src/lib/pk_pad/eme.h
+++ b/src/lib/pk_pad/eme.h
@@ -2,7 +2,7 @@
* EME Classes
* (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_PUBKEY_EME_ENCRYPTION_PAD_H__
diff --git a/src/lib/pk_pad/eme_oaep/oaep.cpp b/src/lib/pk_pad/eme_oaep/oaep.cpp
index 9d567f5a9..0922b8d5a 100644
--- a/src/lib/pk_pad/eme_oaep/oaep.cpp
+++ b/src/lib/pk_pad/eme_oaep/oaep.cpp
@@ -2,7 +2,7 @@
* OAEP
* (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/oaep.h>
diff --git a/src/lib/pk_pad/eme_oaep/oaep.h b/src/lib/pk_pad/eme_oaep/oaep.h
index 8d758fcfb..293b4a45d 100644
--- a/src/lib/pk_pad/eme_oaep/oaep.h
+++ b/src/lib/pk_pad/eme_oaep/oaep.h
@@ -2,7 +2,7 @@
* OAEP
* (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_OAEP_H__
diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
index 0e7d1fc30..beec40532 100644
--- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
+++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.cpp
@@ -2,7 +2,7 @@
* PKCS1 EME
* (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/eme_pkcs.h>
diff --git a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h
index 2808e18d6..b7261433c 100644
--- a/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h
+++ b/src/lib/pk_pad/eme_pkcs1/eme_pkcs.h
@@ -2,7 +2,7 @@
* EME PKCS#1 v1.5
* (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_EME_PKCS1_H__
diff --git a/src/lib/pk_pad/emsa.h b/src/lib/pk_pad/emsa.h
index 5db01ec12..8d09e2c89 100644
--- a/src/lib/pk_pad/emsa.h
+++ b/src/lib/pk_pad/emsa.h
@@ -2,7 +2,7 @@
* EMSA Classes
* (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_PUBKEY_EMSA_H__
diff --git a/src/lib/pk_pad/emsa1/emsa1.cpp b/src/lib/pk_pad/emsa1/emsa1.cpp
index 2da38f12f..0031bf263 100644
--- a/src/lib/pk_pad/emsa1/emsa1.cpp
+++ b/src/lib/pk_pad/emsa1/emsa1.cpp
@@ -2,7 +2,7 @@
* EMSA1
* (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/emsa1.h>
diff --git a/src/lib/pk_pad/emsa1/emsa1.h b/src/lib/pk_pad/emsa1/emsa1.h
index 8df53f789..e81a746fc 100644
--- a/src/lib/pk_pad/emsa1/emsa1.h
+++ b/src/lib/pk_pad/emsa1/emsa1.h
@@ -2,7 +2,7 @@
* EMSA1
* (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_EMSA1_H__
diff --git a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp
index 235dfb91b..5fc96da8d 100644
--- a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp
+++ b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.cpp
@@ -3,7 +3,7 @@
* (C) 1999-2008 Jack Lloyd
* 2008 Falko Strenzke, FlexSecure GmbH
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/emsa1_bsi.h>
diff --git a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h
index a2b0c7432..591af2f7d 100644
--- a/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h
+++ b/src/lib/pk_pad/emsa1_bsi/emsa1_bsi.h
@@ -3,7 +3,7 @@
* (C) 1999-2008 Jack Lloyd
* 2007 FlexSecure GmbH
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_EMSA1_BSI_H__
diff --git a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp
index 3ba236784..6ce3d4e73 100644
--- a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp
+++ b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.cpp
@@ -2,7 +2,7 @@
* PKCS #1 v1.5 signature padding
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/emsa_pkcs1.h>
diff --git a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h
index 5c7b38c0c..21ee7c1a2 100644
--- a/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h
+++ b/src/lib/pk_pad/emsa_pkcs1/emsa_pkcs1.h
@@ -2,7 +2,7 @@
* PKCS #1 v1.5 signature padding
* (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_EMSA_PKCS1_H__
diff --git a/src/lib/pk_pad/emsa_pssr/pssr.cpp b/src/lib/pk_pad/emsa_pssr/pssr.cpp
index fa3748732..a7e5de6f1 100644
--- a/src/lib/pk_pad/emsa_pssr/pssr.cpp
+++ b/src/lib/pk_pad/emsa_pssr/pssr.cpp
@@ -2,7 +2,7 @@
* PSSR
* (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/pssr.h>
diff --git a/src/lib/pk_pad/emsa_pssr/pssr.h b/src/lib/pk_pad/emsa_pssr/pssr.h
index 688fd2114..b5a4e393f 100644
--- a/src/lib/pk_pad/emsa_pssr/pssr.h
+++ b/src/lib/pk_pad/emsa_pssr/pssr.h
@@ -2,7 +2,7 @@
* PSSR
* (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_PSSR_H__
diff --git a/src/lib/pk_pad/emsa_raw/emsa_raw.cpp b/src/lib/pk_pad/emsa_raw/emsa_raw.cpp
index cb0f99e9c..66a5a55d5 100644
--- a/src/lib/pk_pad/emsa_raw/emsa_raw.cpp
+++ b/src/lib/pk_pad/emsa_raw/emsa_raw.cpp
@@ -2,7 +2,7 @@
* EMSA-Raw
* (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/emsa_raw.h>
diff --git a/src/lib/pk_pad/emsa_raw/emsa_raw.h b/src/lib/pk_pad/emsa_raw/emsa_raw.h
index 8ab763575..731405fde 100644
--- a/src/lib/pk_pad/emsa_raw/emsa_raw.h
+++ b/src/lib/pk_pad/emsa_raw/emsa_raw.h
@@ -2,7 +2,7 @@
* EMSA-Raw
* (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_EMSA_RAW_H__
diff --git a/src/lib/pk_pad/emsa_x931/emsa_x931.cpp b/src/lib/pk_pad/emsa_x931/emsa_x931.cpp
index 20571fe61..f78bcd430 100644
--- a/src/lib/pk_pad/emsa_x931/emsa_x931.cpp
+++ b/src/lib/pk_pad/emsa_x931/emsa_x931.cpp
@@ -2,7 +2,7 @@
* EMSA_X931
* (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/emsa_x931.h>
diff --git a/src/lib/pk_pad/emsa_x931/emsa_x931.h b/src/lib/pk_pad/emsa_x931/emsa_x931.h
index b3a1a3501..ee57a14ff 100644
--- a/src/lib/pk_pad/emsa_x931/emsa_x931.h
+++ b/src/lib/pk_pad/emsa_x931/emsa_x931.h
@@ -2,7 +2,7 @@
* X9.31 EMSA
* (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_EMSA_X931_H__
diff --git a/src/lib/pk_pad/get_pk_pad.cpp b/src/lib/pk_pad/get_pk_pad.cpp
index cac24730d..0cb533084 100644
--- a/src/lib/pk_pad/get_pk_pad.cpp
+++ b/src/lib/pk_pad/get_pk_pad.cpp
@@ -2,7 +2,7 @@
* EMSA/EME Retrieval
* (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/emsa.h>
diff --git a/src/lib/pk_pad/hash_id/hash_id.cpp b/src/lib/pk_pad/hash_id/hash_id.cpp
index a60e53352..28bbea346 100644
--- a/src/lib/pk_pad/hash_id/hash_id.cpp
+++ b/src/lib/pk_pad/hash_id/hash_id.cpp
@@ -2,7 +2,7 @@
* Hash Function Identification
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/hash_id.h>
diff --git a/src/lib/pk_pad/hash_id/hash_id.h b/src/lib/pk_pad/hash_id/hash_id.h
index 070e7ddb9..5eab8bc2b 100644
--- a/src/lib/pk_pad/hash_id/hash_id.h
+++ b/src/lib/pk_pad/hash_id/hash_id.h
@@ -2,7 +2,7 @@
* Hash Function Identification
* (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_HASHID_H__
diff --git a/src/lib/pk_pad/mgf1/mgf1.cpp b/src/lib/pk_pad/mgf1/mgf1.cpp
index eae2fed59..f947c5dd2 100644
--- a/src/lib/pk_pad/mgf1/mgf1.cpp
+++ b/src/lib/pk_pad/mgf1/mgf1.cpp
@@ -2,7 +2,7 @@
* MGF1
* (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/mgf1.h>
diff --git a/src/lib/pk_pad/mgf1/mgf1.h b/src/lib/pk_pad/mgf1/mgf1.h
index bceaf0857..3fec898c2 100644
--- a/src/lib/pk_pad/mgf1/mgf1.h
+++ b/src/lib/pk_pad/mgf1/mgf1.h
@@ -2,7 +2,7 @@
* MGF1
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MGF1_H__
diff --git a/src/lib/prf/hkdf/hkdf.cpp b/src/lib/prf/hkdf/hkdf.cpp
index 0a1f7cb31..49fa7e256 100644
--- a/src/lib/prf/hkdf/hkdf.cpp
+++ b/src/lib/prf/hkdf/hkdf.cpp
@@ -2,7 +2,7 @@
* HKDF
* (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/hkdf.h>
diff --git a/src/lib/prf/hkdf/hkdf.h b/src/lib/prf/hkdf/hkdf.h
index 6d1c41bec..6bc68796b 100644
--- a/src/lib/prf/hkdf/hkdf.h
+++ b/src/lib/prf/hkdf/hkdf.h
@@ -2,7 +2,7 @@
* HKDF
* (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_HKDF_H__
diff --git a/src/lib/pubkey/blinding.cpp b/src/lib/pubkey/blinding.cpp
index c4c0e3b6e..61da26a04 100644
--- a/src/lib/pubkey/blinding.cpp
+++ b/src/lib/pubkey/blinding.cpp
@@ -2,7 +2,7 @@
* Blinding for public key operations
* (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/blinding.h>
diff --git a/src/lib/pubkey/blinding.h b/src/lib/pubkey/blinding.h
index 712030e4d..1aa7687a9 100644
--- a/src/lib/pubkey/blinding.h
+++ b/src/lib/pubkey/blinding.h
@@ -2,7 +2,7 @@
* Blinding for public key operations
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_BLINDER_H__
diff --git a/src/lib/pubkey/curve25519/curve25519.cpp b/src/lib/pubkey/curve25519/curve25519.cpp
index fe30e37d9..7a39db134 100644
--- a/src/lib/pubkey/curve25519/curve25519.cpp
+++ b/src/lib/pubkey/curve25519/curve25519.cpp
@@ -2,7 +2,7 @@
* Curve25519
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/curve25519.h>
diff --git a/src/lib/pubkey/curve25519/curve25519.h b/src/lib/pubkey/curve25519/curve25519.h
index 718ebf05d..2baf0af26 100644
--- a/src/lib/pubkey/curve25519/curve25519.h
+++ b/src/lib/pubkey/curve25519/curve25519.h
@@ -2,7 +2,7 @@
* Curve25519
* (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_CURVE_25519_H__
diff --git a/src/lib/pubkey/dh/dh.cpp b/src/lib/pubkey/dh/dh.cpp
index 55d53518a..b5fd4e643 100644
--- a/src/lib/pubkey/dh/dh.cpp
+++ b/src/lib/pubkey/dh/dh.cpp
@@ -2,7 +2,7 @@
* Diffie-Hellman
* (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/dh.h>
diff --git a/src/lib/pubkey/dh/dh.h b/src/lib/pubkey/dh/dh.h
index c670399d8..3fa4fe694 100644
--- a/src/lib/pubkey/dh/dh.h
+++ b/src/lib/pubkey/dh/dh.h
@@ -2,7 +2,7 @@
* Diffie-Hellman
* (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_DIFFIE_HELLMAN_H__
diff --git a/src/lib/pubkey/dl_algo/dl_algo.cpp b/src/lib/pubkey/dl_algo/dl_algo.cpp
index 92c78ac79..4d179fe50 100644
--- a/src/lib/pubkey/dl_algo/dl_algo.cpp
+++ b/src/lib/pubkey/dl_algo/dl_algo.cpp
@@ -2,7 +2,7 @@
* DL Scheme
* (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/dl_algo.h>
diff --git a/src/lib/pubkey/dl_algo/dl_algo.h b/src/lib/pubkey/dl_algo/dl_algo.h
index abd2acba4..5d2386e56 100644
--- a/src/lib/pubkey/dl_algo/dl_algo.h
+++ b/src/lib/pubkey/dl_algo/dl_algo.h
@@ -2,7 +2,7 @@
* DL Scheme
* (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_DL_ALGO_H__
diff --git a/src/lib/pubkey/dl_group/dl_group.cpp b/src/lib/pubkey/dl_group/dl_group.cpp
index 77516bc60..5cb5feae9 100644
--- a/src/lib/pubkey/dl_group/dl_group.cpp
+++ b/src/lib/pubkey/dl_group/dl_group.cpp
@@ -2,7 +2,7 @@
* Discrete Logarithm Parameters
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/dl_group.h>
diff --git a/src/lib/pubkey/dl_group/dl_group.h b/src/lib/pubkey/dl_group/dl_group.h
index e219bdcbd..7201054f2 100644
--- a/src/lib/pubkey/dl_group/dl_group.h
+++ b/src/lib/pubkey/dl_group/dl_group.h
@@ -2,7 +2,7 @@
* Discrete Logarithm Group
* (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_DL_PARAM_H__
diff --git a/src/lib/pubkey/dl_group/named.cpp b/src/lib/pubkey/dl_group/named.cpp
index df44f026b..9c084c80b 100644
--- a/src/lib/pubkey/dl_group/named.cpp
+++ b/src/lib/pubkey/dl_group/named.cpp
@@ -2,7 +2,7 @@
* List of discrete log groups
* (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/dl_group.h>
diff --git a/src/lib/pubkey/dlies/dlies.cpp b/src/lib/pubkey/dlies/dlies.cpp
index a969eaec7..42ecfb561 100644
--- a/src/lib/pubkey/dlies/dlies.cpp
+++ b/src/lib/pubkey/dlies/dlies.cpp
@@ -2,7 +2,7 @@
* DLIES
* (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/dlies.h>
diff --git a/src/lib/pubkey/dlies/dlies.h b/src/lib/pubkey/dlies/dlies.h
index 615c560ea..3f0647aeb 100644
--- a/src/lib/pubkey/dlies/dlies.h
+++ b/src/lib/pubkey/dlies/dlies.h
@@ -2,7 +2,7 @@
* DLIES
* (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_DLIES_H__
diff --git a/src/lib/pubkey/dsa/dsa.cpp b/src/lib/pubkey/dsa/dsa.cpp
index c301ddf39..dcb8f2a64 100644
--- a/src/lib/pubkey/dsa/dsa.cpp
+++ b/src/lib/pubkey/dsa/dsa.cpp
@@ -2,7 +2,7 @@
* DSA
* (C) 1999-2010,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/dsa.h>
diff --git a/src/lib/pubkey/dsa/dsa.h b/src/lib/pubkey/dsa/dsa.h
index 19c6c22d6..67ac26dec 100644
--- a/src/lib/pubkey/dsa/dsa.h
+++ b/src/lib/pubkey/dsa/dsa.h
@@ -2,7 +2,7 @@
* DSA
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_DSA_H__
diff --git a/src/lib/pubkey/ec_group/ec_group.cpp b/src/lib/pubkey/ec_group/ec_group.cpp
index 9143543e4..d024480bb 100644
--- a/src/lib/pubkey/ec_group/ec_group.cpp
+++ b/src/lib/pubkey/ec_group/ec_group.cpp
@@ -4,7 +4,7 @@
* (C) 2007 Falko Strenzke, FlexSecure GmbH
* 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ec_group.h>
diff --git a/src/lib/pubkey/ec_group/ec_group.h b/src/lib/pubkey/ec_group/ec_group.h
index f835acca6..5e2800dc5 100644
--- a/src/lib/pubkey/ec_group/ec_group.h
+++ b/src/lib/pubkey/ec_group/ec_group.h
@@ -4,7 +4,7 @@
* (C) 2007 Falko Strenzke, FlexSecure GmbH
* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ECC_DOMAIN_PARAMETERS_H__
diff --git a/src/lib/pubkey/ec_group/named.cpp b/src/lib/pubkey/ec_group/named.cpp
index 86e99db6d..9a2497c27 100644
--- a/src/lib/pubkey/ec_group/named.cpp
+++ b/src/lib/pubkey/ec_group/named.cpp
@@ -2,7 +2,7 @@
* List of ECC groups
* (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/ec_group.h>
diff --git a/src/lib/pubkey/ecc_key/ecc_key.cpp b/src/lib/pubkey/ecc_key/ecc_key.cpp
index 7f82af4f5..b0c053688 100644
--- a/src/lib/pubkey/ecc_key/ecc_key.cpp
+++ b/src/lib/pubkey/ecc_key/ecc_key.cpp
@@ -4,7 +4,7 @@
* Falko Strenzke, FlexSecure GmbH
* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ecc_key.h>
diff --git a/src/lib/pubkey/ecc_key/ecc_key.h b/src/lib/pubkey/ecc_key/ecc_key.h
index de980608a..efc4b02da 100644
--- a/src/lib/pubkey/ecc_key/ecc_key.h
+++ b/src/lib/pubkey/ecc_key/ecc_key.h
@@ -4,7 +4,7 @@
* Manuel Hartl, FlexSecure GmbH
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ECC_PUBLIC_KEY_BASE_H__
diff --git a/src/lib/pubkey/ecdh/ecdh.cpp b/src/lib/pubkey/ecdh/ecdh.cpp
index 0f93a0f97..418240a4c 100644
--- a/src/lib/pubkey/ecdh/ecdh.cpp
+++ b/src/lib/pubkey/ecdh/ecdh.cpp
@@ -4,7 +4,7 @@
* 2007 Falko Strenzke, FlexSecure GmbH
* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ecdh.h>
diff --git a/src/lib/pubkey/ecdh/ecdh.h b/src/lib/pubkey/ecdh/ecdh.h
index 0c5d4e010..6dfa4efe6 100644
--- a/src/lib/pubkey/ecdh/ecdh.h
+++ b/src/lib/pubkey/ecdh/ecdh.h
@@ -4,7 +4,7 @@
* Manuel Hartl, FlexSecure GmbH
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ECDH_KEY_H__
diff --git a/src/lib/pubkey/ecdsa/ecdsa.cpp b/src/lib/pubkey/ecdsa/ecdsa.cpp
index b83a41e68..1b7318f1b 100644
--- a/src/lib/pubkey/ecdsa/ecdsa.cpp
+++ b/src/lib/pubkey/ecdsa/ecdsa.cpp
@@ -4,7 +4,7 @@
* 2007 Falko Strenzke, FlexSecure GmbH
* 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ecdsa.h>
diff --git a/src/lib/pubkey/ecdsa/ecdsa.h b/src/lib/pubkey/ecdsa/ecdsa.h
index 40eb9c7a7..c0245e8bc 100644
--- a/src/lib/pubkey/ecdsa/ecdsa.h
+++ b/src/lib/pubkey/ecdsa/ecdsa.h
@@ -4,7 +4,7 @@
* Manuel Hartl, FlexSecure GmbH
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_ECDSA_KEY_H__
diff --git a/src/lib/pubkey/elgamal/elgamal.cpp b/src/lib/pubkey/elgamal/elgamal.cpp
index c8a9ba9d0..b3bd23c48 100644
--- a/src/lib/pubkey/elgamal/elgamal.cpp
+++ b/src/lib/pubkey/elgamal/elgamal.cpp
@@ -2,7 +2,7 @@
* ElGamal
* (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/elgamal.h>
diff --git a/src/lib/pubkey/elgamal/elgamal.h b/src/lib/pubkey/elgamal/elgamal.h
index 9566bcca6..1bef91579 100644
--- a/src/lib/pubkey/elgamal/elgamal.h
+++ b/src/lib/pubkey/elgamal/elgamal.h
@@ -2,7 +2,7 @@
* ElGamal
* (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_ELGAMAL_H__
diff --git a/src/lib/pubkey/gost_3410/gost_3410.cpp b/src/lib/pubkey/gost_3410/gost_3410.cpp
index 9a1e6d85b..aeaa5735e 100644
--- a/src/lib/pubkey/gost_3410/gost_3410.cpp
+++ b/src/lib/pubkey/gost_3410/gost_3410.cpp
@@ -4,7 +4,7 @@
* Manuel Hartl, FlexSecure GmbH
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/gost_3410.h>
diff --git a/src/lib/pubkey/gost_3410/gost_3410.h b/src/lib/pubkey/gost_3410/gost_3410.h
index 6b1506b10..d74ea08d7 100644
--- a/src/lib/pubkey/gost_3410/gost_3410.h
+++ b/src/lib/pubkey/gost_3410/gost_3410.h
@@ -4,7 +4,7 @@
* Manuel Hartl, FlexSecure GmbH
* (C) 2008-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_GOST_3410_KEY_H__
diff --git a/src/lib/pubkey/if_algo/if_algo.cpp b/src/lib/pubkey/if_algo/if_algo.cpp
index 339c4e317..d8430b40c 100644
--- a/src/lib/pubkey/if_algo/if_algo.cpp
+++ b/src/lib/pubkey/if_algo/if_algo.cpp
@@ -2,7 +2,7 @@
* IF Scheme
* (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/if_algo.h>
diff --git a/src/lib/pubkey/if_algo/if_algo.h b/src/lib/pubkey/if_algo/if_algo.h
index 7dd6d19f0..7fa266aaa 100644
--- a/src/lib/pubkey/if_algo/if_algo.h
+++ b/src/lib/pubkey/if_algo/if_algo.h
@@ -2,7 +2,7 @@
* IF Scheme
* (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_IF_ALGO_H__
diff --git a/src/lib/pubkey/keypair/keypair.cpp b/src/lib/pubkey/keypair/keypair.cpp
index a8631062d..ef211ffd4 100644
--- a/src/lib/pubkey/keypair/keypair.cpp
+++ b/src/lib/pubkey/keypair/keypair.cpp
@@ -2,7 +2,7 @@
* Keypair Checks
* (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/keypair.h>
diff --git a/src/lib/pubkey/keypair/keypair.h b/src/lib/pubkey/keypair/keypair.h
index c7b128e53..7fcde3216 100644
--- a/src/lib/pubkey/keypair/keypair.h
+++ b/src/lib/pubkey/keypair/keypair.h
@@ -2,7 +2,7 @@
* Keypair Checks
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_KEYPAIR_CHECKS_H__
diff --git a/src/lib/pubkey/mce/binary_matrix.cpp b/src/lib/pubkey/mce/binary_matrix.cpp
index 4670a75c4..30d04b987 100644
--- a/src/lib/pubkey/mce/binary_matrix.cpp
+++ b/src/lib/pubkey/mce/binary_matrix.cpp
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/binary_matrix.h b/src/lib/pubkey/mce/binary_matrix.h
index a5438666d..29d09cf45 100644
--- a/src/lib/pubkey/mce/binary_matrix.h
+++ b/src/lib/pubkey/mce/binary_matrix.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/code_based_key_gen.cpp b/src/lib/pubkey/mce/code_based_key_gen.cpp
index 997e51685..3936e6960 100644
--- a/src/lib/pubkey/mce/code_based_key_gen.cpp
+++ b/src/lib/pubkey/mce/code_based_key_gen.cpp
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/code_based_key_gen.h b/src/lib/pubkey/mce/code_based_key_gen.h
index 15b417fb6..6764e13d6 100644
--- a/src/lib/pubkey/mce/code_based_key_gen.h
+++ b/src/lib/pubkey/mce/code_based_key_gen.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/code_based_util.h b/src/lib/pubkey/mce/code_based_util.h
index fd8bcaa49..6b567dbff 100644
--- a/src/lib/pubkey/mce/code_based_util.h
+++ b/src/lib/pubkey/mce/code_based_util.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/gf2m_rootfind_dcmp.cpp b/src/lib/pubkey/mce/gf2m_rootfind_dcmp.cpp
index 5782f5e4c..4f47de815 100644
--- a/src/lib/pubkey/mce/gf2m_rootfind_dcmp.cpp
+++ b/src/lib/pubkey/mce/gf2m_rootfind_dcmp.cpp
@@ -2,7 +2,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)
*
*/
diff --git a/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h b/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h
index 79874fe7e..5914ad3ae 100644
--- a/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h
+++ b/src/lib/pubkey/mce/gf2m_rootfind_dcmp.h
@@ -2,7 +2,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_GF2M_ROOTFIND_DCMP_H__
diff --git a/src/lib/pubkey/mce/gf2m_small_m.cpp b/src/lib/pubkey/mce/gf2m_small_m.cpp
index 76e5b0efd..d5007a082 100644
--- a/src/lib/pubkey/mce/gf2m_small_m.cpp
+++ b/src/lib/pubkey/mce/gf2m_small_m.cpp
@@ -1,11 +1,12 @@
-/**
- * (C) Copyright Projet SECRET, INRIA, Rocquencourt
- * (C) Bhaskar Biswas and Nicolas Sendrier
- *
- * (C) 2014 cryptosource GmbH
- * (C) 2014 Falko Strenzke [email protected]
- */
-
+/*
+* (C) Copyright Projet SECRET, INRIA, Rocquencourt
+* (C) Bhaskar Biswas and Nicolas Sendrier
+*
+* (C) 2014 cryptosource GmbH
+* (C) 2014 Falko Strenzke [email protected]
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
#include <botan/gf2m_small_m.h>
#include <botan/code_based_util.h>
diff --git a/src/lib/pubkey/mce/gf2m_small_m.h b/src/lib/pubkey/mce/gf2m_small_m.h
index 9fc42f1fc..223dfd511 100644
--- a/src/lib/pubkey/mce/gf2m_small_m.h
+++ b/src/lib/pubkey/mce/gf2m_small_m.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/goppa_code.cpp b/src/lib/pubkey/mce/goppa_code.cpp
index bc8fb7b32..bb335e994 100644
--- a/src/lib/pubkey/mce/goppa_code.cpp
+++ b/src/lib/pubkey/mce/goppa_code.cpp
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/goppa_code.h b/src/lib/pubkey/mce/goppa_code.h
index 463a2eb72..377cd9b3d 100644
--- a/src/lib/pubkey/mce/goppa_code.h
+++ b/src/lib/pubkey/mce/goppa_code.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/mce_kem.cpp b/src/lib/pubkey/mce/mce_kem.cpp
index 31dc2cfe2..dd4af4acc 100644
--- a/src/lib/pubkey/mce/mce_kem.cpp
+++ b/src/lib/pubkey/mce/mce_kem.cpp
@@ -2,7 +2,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)
*
*/
diff --git a/src/lib/pubkey/mce/mce_kem.h b/src/lib/pubkey/mce/mce_kem.h
index 2bb1edba5..14d5cd678 100644
--- a/src/lib/pubkey/mce/mce_kem.h
+++ b/src/lib/pubkey/mce/mce_kem.h
@@ -2,7 +2,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)
*
*/
diff --git a/src/lib/pubkey/mce/mceliece.cpp b/src/lib/pubkey/mce/mceliece.cpp
index 69d5eb008..d0c36a92e 100644
--- a/src/lib/pubkey/mce/mceliece.cpp
+++ b/src/lib/pubkey/mce/mceliece.cpp
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/mceliece.h b/src/lib/pubkey/mce/mceliece.h
index 6e6dffe02..b0246ac88 100644
--- a/src/lib/pubkey/mce/mceliece.h
+++ b/src/lib/pubkey/mce/mceliece.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/mceliece_key.cpp b/src/lib/pubkey/mce/mceliece_key.cpp
index 15fba67e2..e0f8b4cd6 100644
--- a/src/lib/pubkey/mce/mceliece_key.cpp
+++ b/src/lib/pubkey/mce/mceliece_key.cpp
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/mceliece_key.h b/src/lib/pubkey/mce/mceliece_key.h
index d8b4b59ce..3a0d0eea8 100644
--- a/src/lib/pubkey/mce/mceliece_key.h
+++ b/src/lib/pubkey/mce/mceliece_key.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/polyn_gf2m.cpp b/src/lib/pubkey/mce/polyn_gf2m.cpp
index a0da9b479..e340e29e8 100644
--- a/src/lib/pubkey/mce/polyn_gf2m.cpp
+++ b/src/lib/pubkey/mce/polyn_gf2m.cpp
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/polyn_gf2m.h b/src/lib/pubkey/mce/polyn_gf2m.h
index 9dff549e0..6ec028a25 100644
--- a/src/lib/pubkey/mce/polyn_gf2m.h
+++ b/src/lib/pubkey/mce/polyn_gf2m.h
@@ -5,7 +5,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)
*
*/
diff --git a/src/lib/pubkey/mce/workfactor.cpp b/src/lib/pubkey/mce/workfactor.cpp
index 18eaf65e5..b0a990a3a 100644
--- a/src/lib/pubkey/mce/workfactor.cpp
+++ b/src/lib/pubkey/mce/workfactor.cpp
@@ -1,8 +1,9 @@
/**
* (C) Copyright Projet SECRET, INRIA, Rocquencourt
* (C) Bhaskar Biswas and Nicolas Sendrier
+ * (C) 2014 Jack Lloyd
*
- * Distributed under the terms of the Botan license
+ * Botan is released under the Simplified BSD License (see license.txt)
*
*/
diff --git a/src/lib/pubkey/mceies/mceies.cpp b/src/lib/pubkey/mceies/mceies.cpp
index 0ceda2dda..3fec1fd48 100644
--- a/src/lib/pubkey/mceies/mceies.cpp
+++ b/src/lib/pubkey/mceies/mceies.cpp
@@ -2,7 +2,7 @@
* McEliece Integrated Encryption System
* (C) 2014,2015 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/mceies.h>
diff --git a/src/lib/pubkey/mceies/mceies.h b/src/lib/pubkey/mceies/mceies.h
index 7a03ca580..9ead21a17 100644
--- a/src/lib/pubkey/mceies/mceies.h
+++ b/src/lib/pubkey/mceies/mceies.h
@@ -2,7 +2,7 @@
* McEliece Integrated Encryption System
* (C) 2014,2015 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_MCEIES_H__
diff --git a/src/lib/pubkey/nr/nr.cpp b/src/lib/pubkey/nr/nr.cpp
index 87cf3d038..f100efb26 100644
--- a/src/lib/pubkey/nr/nr.cpp
+++ b/src/lib/pubkey/nr/nr.cpp
@@ -2,7 +2,7 @@
* Nyberg-Rueppel
* (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/nr.h>
diff --git a/src/lib/pubkey/nr/nr.h b/src/lib/pubkey/nr/nr.h
index 5be336a21..76f689079 100644
--- a/src/lib/pubkey/nr/nr.h
+++ b/src/lib/pubkey/nr/nr.h
@@ -2,7 +2,7 @@
* Nyberg-Rueppel
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_NYBERG_RUEPPEL_H__
diff --git a/src/lib/pubkey/pk_algs.cpp b/src/lib/pubkey/pk_algs.cpp
index e1784dd9f..61380e68d 100644
--- a/src/lib/pubkey/pk_algs.cpp
+++ b/src/lib/pubkey/pk_algs.cpp
@@ -2,7 +2,7 @@
* PK Key
* (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/internal/pk_algs.h>
diff --git a/src/lib/pubkey/pk_algs.h b/src/lib/pubkey/pk_algs.h
index d8f24a1b8..804860ed1 100644
--- a/src/lib/pubkey/pk_algs.h
+++ b/src/lib/pubkey/pk_algs.h
@@ -2,7 +2,7 @@
* PK Key Factory
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_PK_KEY_FACTORY_H__
diff --git a/src/lib/pubkey/pk_keys.cpp b/src/lib/pubkey/pk_keys.cpp
index c19c676ab..f92492fa9 100644
--- a/src/lib/pubkey/pk_keys.cpp
+++ b/src/lib/pubkey/pk_keys.cpp
@@ -2,7 +2,7 @@
* PK Key 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)
*/
#include <botan/pk_keys.h>
diff --git a/src/lib/pubkey/pk_keys.h b/src/lib/pubkey/pk_keys.h
index a8585c154..66811de86 100644
--- a/src/lib/pubkey/pk_keys.h
+++ b/src/lib/pubkey/pk_keys.h
@@ -2,7 +2,7 @@
* PK Key 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_PK_KEYS_H__
diff --git a/src/lib/pubkey/pk_ops.h b/src/lib/pubkey/pk_ops.h
index 8a08ef430..7965e7464 100644
--- a/src/lib/pubkey/pk_ops.h
+++ b/src/lib/pubkey/pk_ops.h
@@ -2,7 +2,7 @@
* PK Operation Types
* (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_PK_OPERATIONS_H__
diff --git a/src/lib/pubkey/pkcs8.cpp b/src/lib/pubkey/pkcs8.cpp
index 298cea064..3cfb48c3a 100644
--- a/src/lib/pubkey/pkcs8.cpp
+++ b/src/lib/pubkey/pkcs8.cpp
@@ -2,7 +2,7 @@
* PKCS #8
* (C) 1999-2010,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/pkcs8.h>
diff --git a/src/lib/pubkey/pkcs8.h b/src/lib/pubkey/pkcs8.h
index 302003ad4..0840f4a46 100644
--- a/src/lib/pubkey/pkcs8.h
+++ b/src/lib/pubkey/pkcs8.h
@@ -2,7 +2,7 @@
* PKCS #8
* (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_PKCS8_H__
diff --git a/src/lib/pubkey/pubkey.cpp b/src/lib/pubkey/pubkey.cpp
index a6fc7b2c9..07f02d3e0 100644
--- a/src/lib/pubkey/pubkey.cpp
+++ b/src/lib/pubkey/pubkey.cpp
@@ -2,7 +2,7 @@
* Public Key Base
* (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/pubkey.h>
diff --git a/src/lib/pubkey/pubkey.h b/src/lib/pubkey/pubkey.h
index 0dc676325..55afbf0fa 100644
--- a/src/lib/pubkey/pubkey.h
+++ b/src/lib/pubkey/pubkey.h
@@ -2,7 +2,7 @@
* Public Key Interface
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_PUBKEY_H__
diff --git a/src/lib/pubkey/rfc6979/rfc6979.cpp b/src/lib/pubkey/rfc6979/rfc6979.cpp
index 21d6c356a..a691e6e8c 100644
--- a/src/lib/pubkey/rfc6979/rfc6979.cpp
+++ b/src/lib/pubkey/rfc6979/rfc6979.cpp
@@ -2,7 +2,7 @@
* RFC 6979 Deterministic Nonce Generator
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/rfc6979.h>
diff --git a/src/lib/pubkey/rfc6979/rfc6979.h b/src/lib/pubkey/rfc6979/rfc6979.h
index 6e6073154..8e2940578 100644
--- a/src/lib/pubkey/rfc6979/rfc6979.h
+++ b/src/lib/pubkey/rfc6979/rfc6979.h
@@ -2,7 +2,7 @@
* RFC 6979 Deterministic Nonce Generator
* (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_RFC6979_GENERATOR_H__
diff --git a/src/lib/pubkey/rsa/rsa.cpp b/src/lib/pubkey/rsa/rsa.cpp
index 199ce6ad8..2a0e8253e 100644
--- a/src/lib/pubkey/rsa/rsa.cpp
+++ b/src/lib/pubkey/rsa/rsa.cpp
@@ -2,7 +2,7 @@
* RSA
* (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/rsa.h>
diff --git a/src/lib/pubkey/rsa/rsa.h b/src/lib/pubkey/rsa/rsa.h
index 4d9189d20..8a599d2ab 100644
--- a/src/lib/pubkey/rsa/rsa.h
+++ b/src/lib/pubkey/rsa/rsa.h
@@ -2,7 +2,7 @@
* RSA
* (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_RSA_H__
diff --git a/src/lib/pubkey/rw/rw.cpp b/src/lib/pubkey/rw/rw.cpp
index 63e7977d8..a2f21ecb8 100644
--- a/src/lib/pubkey/rw/rw.cpp
+++ b/src/lib/pubkey/rw/rw.cpp
@@ -2,7 +2,7 @@
* Rabin-Williams
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/rw.h>
diff --git a/src/lib/pubkey/rw/rw.h b/src/lib/pubkey/rw/rw.h
index 1e918e70c..b42d26b64 100644
--- a/src/lib/pubkey/rw/rw.h
+++ b/src/lib/pubkey/rw/rw.h
@@ -2,7 +2,7 @@
* Rabin-Williams
* (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_RW_H__
diff --git a/src/lib/pubkey/workfactor.cpp b/src/lib/pubkey/workfactor.cpp
index 5665c5269..46a7be507 100644
--- a/src/lib/pubkey/workfactor.cpp
+++ b/src/lib/pubkey/workfactor.cpp
@@ -2,7 +2,7 @@
* Public Key Work Factor Functions
* (C) 1999-2007,2012 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/workfactor.h>
diff --git a/src/lib/pubkey/workfactor.h b/src/lib/pubkey/workfactor.h
index ba81d61b4..ab7f6b051 100644
--- a/src/lib/pubkey/workfactor.h
+++ b/src/lib/pubkey/workfactor.h
@@ -2,7 +2,7 @@
* Public Key Work Factor 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_WORKFACTOR_H__
diff --git a/src/lib/pubkey/x509_key.cpp b/src/lib/pubkey/x509_key.cpp
index 010d24771..cd3da7a53 100644
--- a/src/lib/pubkey/x509_key.cpp
+++ b/src/lib/pubkey/x509_key.cpp
@@ -2,7 +2,7 @@
* X.509 Public Key
* (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/x509_key.h>
diff --git a/src/lib/pubkey/x509_key.h b/src/lib/pubkey/x509_key.h
index 14e5c9699..1bfa248ff 100644
--- a/src/lib/pubkey/x509_key.h
+++ b/src/lib/pubkey/x509_key.h
@@ -2,7 +2,7 @@
* X.509 Public Key
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_X509_PUBLIC_KEY_H__
diff --git a/src/lib/rng/auto_rng/auto_rng.h b/src/lib/rng/auto_rng/auto_rng.h
index 2ddd136c6..bb36f672e 100644
--- a/src/lib/rng/auto_rng/auto_rng.h
+++ b/src/lib/rng/auto_rng/auto_rng.h
@@ -2,7 +2,7 @@
* Auto Seeded RNG
* (C) 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_AUTO_SEEDING_RNG_H__
diff --git a/src/lib/rng/hmac_drbg/hmac_drbg.cpp b/src/lib/rng/hmac_drbg/hmac_drbg.cpp
index 03b617af3..064088c59 100644
--- a/src/lib/rng/hmac_drbg/hmac_drbg.cpp
+++ b/src/lib/rng/hmac_drbg/hmac_drbg.cpp
@@ -2,7 +2,7 @@
* HMAC_DRBG
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/hmac_drbg.h>
diff --git a/src/lib/rng/hmac_drbg/hmac_drbg.h b/src/lib/rng/hmac_drbg/hmac_drbg.h
index c3629aa15..b56e90fc4 100644
--- a/src/lib/rng/hmac_drbg/hmac_drbg.h
+++ b/src/lib/rng/hmac_drbg/hmac_drbg.h
@@ -2,7 +2,7 @@
* HMAC_DRBG (SP800-90A)
* (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_HMAC_DRBG_H__
diff --git a/src/lib/rng/hmac_rng/hmac_rng.cpp b/src/lib/rng/hmac_rng/hmac_rng.cpp
index 153f85c80..d9a5a8d16 100644
--- a/src/lib/rng/hmac_rng/hmac_rng.cpp
+++ b/src/lib/rng/hmac_rng/hmac_rng.cpp
@@ -2,7 +2,7 @@
* HMAC_RNG
* (C) 2008-2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/hmac_rng.h>
diff --git a/src/lib/rng/hmac_rng/hmac_rng.h b/src/lib/rng/hmac_rng/hmac_rng.h
index 8fee5be5a..85a411b16 100644
--- a/src/lib/rng/hmac_rng/hmac_rng.h
+++ b/src/lib/rng/hmac_rng/hmac_rng.h
@@ -2,7 +2,7 @@
* HMAC RNG
* (C) 2008,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_HMAC_RNG_H__
diff --git a/src/lib/rng/rng.cpp b/src/lib/rng/rng.cpp
index 12a6c163e..14c7196d1 100644
--- a/src/lib/rng/rng.cpp
+++ b/src/lib/rng/rng.cpp
@@ -2,7 +2,7 @@
* Random Number Generator Base
* (C) 1999-2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/rng.h>
diff --git a/src/lib/rng/rng.h b/src/lib/rng/rng.h
index c69c147e6..9621fb3da 100644
--- a/src/lib/rng/rng.h
+++ b/src/lib/rng/rng.h
@@ -2,7 +2,7 @@
* RandomNumberGenerator
* (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_RANDOM_NUMBER_GENERATOR_H__
diff --git a/src/lib/rng/system_rng/system_rng.cpp b/src/lib/rng/system_rng/system_rng.cpp
index caaa3968a..2f7c0f168 100644
--- a/src/lib/rng/system_rng/system_rng.cpp
+++ b/src/lib/rng/system_rng/system_rng.cpp
@@ -2,7 +2,7 @@
* System RNG
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/system_rng.h>
diff --git a/src/lib/rng/system_rng/system_rng.h b/src/lib/rng/system_rng/system_rng.h
index db91b4ad3..cac861618 100644
--- a/src/lib/rng/system_rng/system_rng.h
+++ b/src/lib/rng/system_rng/system_rng.h
@@ -2,7 +2,7 @@
* System RNG interface
* (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_SYSTEM_RNG_H__
diff --git a/src/lib/rng/x931_rng/x931_rng.cpp b/src/lib/rng/x931_rng/x931_rng.cpp
index a77ac2ca8..3793f546e 100644
--- a/src/lib/rng/x931_rng/x931_rng.cpp
+++ b/src/lib/rng/x931_rng/x931_rng.cpp
@@ -2,7 +2,7 @@
* ANSI X9.31 RNG
* (C) 1999-2009,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/x931_rng.h>
diff --git a/src/lib/rng/x931_rng/x931_rng.h b/src/lib/rng/x931_rng/x931_rng.h
index 63ade67ff..8b1513035 100644
--- a/src/lib/rng/x931_rng/x931_rng.h
+++ b/src/lib/rng/x931_rng/x931_rng.h
@@ -2,7 +2,7 @@
* ANSI X9.31 RNG
* (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_ANSI_X931_RNG_H__
diff --git a/src/lib/selftest/selftest.cpp b/src/lib/selftest/selftest.cpp
index 1a84677c7..f40a31fda 100644
--- a/src/lib/selftest/selftest.cpp
+++ b/src/lib/selftest/selftest.cpp
@@ -2,7 +2,7 @@
* Startup Self Tests
* (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)
*/
#include <botan/selftest.h>
diff --git a/src/lib/selftest/selftest.h b/src/lib/selftest/selftest.h
index 2ceadd0d4..6ed552dc3 100644
--- a/src/lib/selftest/selftest.h
+++ b/src/lib/selftest/selftest.h
@@ -2,7 +2,7 @@
* Startup Self Test
* (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_SELF_TESTS_H__
diff --git a/src/lib/simd/simd_32.h b/src/lib/simd/simd_32.h
index 15f882fea..265e347a9 100644
--- a/src/lib/simd/simd_32.h
+++ b/src/lib/simd/simd_32.h
@@ -2,7 +2,7 @@
* Lightweight wrappers for SIMD operations
* (C) 2009,2011 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SIMD_32_H__
diff --git a/src/lib/simd/simd_altivec/simd_altivec.h b/src/lib/simd/simd_altivec/simd_altivec.h
index 133061b97..32533aafb 100644
--- a/src/lib/simd/simd_altivec/simd_altivec.h
+++ b/src/lib/simd/simd_altivec/simd_altivec.h
@@ -2,7 +2,7 @@
* Lightweight wrappers around AltiVec for 32-bit 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_SIMD_ALTIVEC_H__
diff --git a/src/lib/simd/simd_scalar/simd_scalar.h b/src/lib/simd/simd_scalar/simd_scalar.h
index 55dd26d6f..379e2d6a8 100644
--- a/src/lib/simd/simd_scalar/simd_scalar.h
+++ b/src/lib/simd/simd_scalar/simd_scalar.h
@@ -2,7 +2,7 @@
* Scalar emulation of SIMD
* (C) 2009,2013 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SIMD_SCALAR_H__
diff --git a/src/lib/simd/simd_sse2/simd_sse2.h b/src/lib/simd/simd_sse2/simd_sse2.h
index 6cbed1df8..61989eb8e 100644
--- a/src/lib/simd/simd_sse2/simd_sse2.h
+++ b/src/lib/simd/simd_sse2/simd_sse2.h
@@ -2,7 +2,7 @@
* Lightweight wrappers for SSE2 intrinsics for 32-bit 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_SIMD_SSE_H__
diff --git a/src/lib/stream/chacha/chacha.cpp b/src/lib/stream/chacha/chacha.cpp
index f404b3933..7aac66b3d 100644
--- a/src/lib/stream/chacha/chacha.cpp
+++ b/src/lib/stream/chacha/chacha.cpp
@@ -2,7 +2,7 @@
* ChaCha
* (C) 2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/chacha.h>
diff --git a/src/lib/stream/chacha/chacha.h b/src/lib/stream/chacha/chacha.h
index 635da2af4..7e4e2b461 100644
--- a/src/lib/stream/chacha/chacha.h
+++ b/src/lib/stream/chacha/chacha.h
@@ -2,7 +2,7 @@
* ChaCha20
* (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_CHACHA_H__
diff --git a/src/lib/stream/ctr/ctr.cpp b/src/lib/stream/ctr/ctr.cpp
index ad0fd363a..27118ee64 100644
--- a/src/lib/stream/ctr/ctr.cpp
+++ b/src/lib/stream/ctr/ctr.cpp
@@ -2,7 +2,7 @@
* Counter mode
* (C) 1999-2011,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ctr.h>
diff --git a/src/lib/stream/ctr/ctr.h b/src/lib/stream/ctr/ctr.h
index b7af388da..52b6b66fa 100644
--- a/src/lib/stream/ctr/ctr.h
+++ b/src/lib/stream/ctr/ctr.h
@@ -2,7 +2,7 @@
* CTR-BE Mode
* (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_CTR_BE_H__
diff --git a/src/lib/stream/ofb/ofb.cpp b/src/lib/stream/ofb/ofb.cpp
index 9d01c7712..986e6bf71 100644
--- a/src/lib/stream/ofb/ofb.cpp
+++ b/src/lib/stream/ofb/ofb.cpp
@@ -2,7 +2,7 @@
* OFB Mode
* (C) 1999-2007,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/ofb.h>
diff --git a/src/lib/stream/ofb/ofb.h b/src/lib/stream/ofb/ofb.h
index 5c288d4bd..925e7a773 100644
--- a/src/lib/stream/ofb/ofb.h
+++ b/src/lib/stream/ofb/ofb.h
@@ -2,7 +2,7 @@
* OFB Mode
* (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_OUTPUT_FEEDBACK_MODE_H__
diff --git a/src/lib/stream/rc4/rc4.cpp b/src/lib/stream/rc4/rc4.cpp
index df6976235..1a5ad80e9 100644
--- a/src/lib/stream/rc4/rc4.cpp
+++ b/src/lib/stream/rc4/rc4.cpp
@@ -2,7 +2,7 @@
* RC4
* (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/rc4.h>
diff --git a/src/lib/stream/rc4/rc4.h b/src/lib/stream/rc4/rc4.h
index c23f8c853..f72e2e75d 100644
--- a/src/lib/stream/rc4/rc4.h
+++ b/src/lib/stream/rc4/rc4.h
@@ -2,7 +2,7 @@
* RC4
* (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_RC4_H__
diff --git a/src/lib/stream/salsa20/salsa20.cpp b/src/lib/stream/salsa20/salsa20.cpp
index 4475a93a2..a307110b3 100644
--- a/src/lib/stream/salsa20/salsa20.cpp
+++ b/src/lib/stream/salsa20/salsa20.cpp
@@ -2,7 +2,7 @@
* Salsa20 / XSalsa20
* (C) 1999-2010,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/salsa20.h>
diff --git a/src/lib/stream/salsa20/salsa20.h b/src/lib/stream/salsa20/salsa20.h
index 69a9ea62f..d9f67bd24 100644
--- a/src/lib/stream/salsa20/salsa20.h
+++ b/src/lib/stream/salsa20/salsa20.h
@@ -2,7 +2,7 @@
* Salsa20 / XSalsa20
* (C) 1999-2010 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_SALSA20_H__
diff --git a/src/lib/stream/stream_cipher.cpp b/src/lib/stream/stream_cipher.cpp
index 7dbd3e2e3..72eb63b7c 100644
--- a/src/lib/stream/stream_cipher.cpp
+++ b/src/lib/stream/stream_cipher.cpp
@@ -2,7 +2,7 @@
* Stream Cipher
* (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/stream_cipher.h>
diff --git a/src/lib/stream/stream_cipher.h b/src/lib/stream/stream_cipher.h
index f3d3999f0..5708c2ab6 100644
--- a/src/lib/stream/stream_cipher.h
+++ b/src/lib/stream/stream_cipher.h
@@ -2,7 +2,7 @@
* Stream Cipher
* (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_STREAM_CIPHER_H__
diff --git a/src/lib/tls/msg_cert_req.cpp b/src/lib/tls/msg_cert_req.cpp
index 619502f4f..eacdcacac 100644
--- a/src/lib/tls/msg_cert_req.cpp
+++ b/src/lib/tls/msg_cert_req.cpp
@@ -2,7 +2,7 @@
* Certificate Request Message
* (C) 2004-2006,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_cert_verify.cpp b/src/lib/tls/msg_cert_verify.cpp
index adf74b2e1..769a8687e 100644
--- a/src/lib/tls/msg_cert_verify.cpp
+++ b/src/lib/tls/msg_cert_verify.cpp
@@ -2,7 +2,7 @@
* Certificate Verify Message
* (C) 2004,2006,2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_certificate.cpp b/src/lib/tls/msg_certificate.cpp
index 417ad34ce..99722c306 100644
--- a/src/lib/tls/msg_certificate.cpp
+++ b/src/lib/tls/msg_certificate.cpp
@@ -2,7 +2,7 @@
* Certificate Message
* (C) 2004-2006,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_client_hello.cpp b/src/lib/tls/msg_client_hello.cpp
index 02e28b5c9..cebe8ac9e 100644
--- a/src/lib/tls/msg_client_hello.cpp
+++ b/src/lib/tls/msg_client_hello.cpp
@@ -2,7 +2,7 @@
* TLS Hello Request and Client Hello Messages
* (C) 2004-2011 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_client_kex.cpp b/src/lib/tls/msg_client_kex.cpp
index 3ca455b6b..4bdd9983c 100644
--- a/src/lib/tls/msg_client_kex.cpp
+++ b/src/lib/tls/msg_client_kex.cpp
@@ -2,7 +2,7 @@
* Client Key Exchange Message
* (C) 2004-2010 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_finished.cpp b/src/lib/tls/msg_finished.cpp
index 0d3d0df0b..c6c097c0d 100644
--- a/src/lib/tls/msg_finished.cpp
+++ b/src/lib/tls/msg_finished.cpp
@@ -2,7 +2,7 @@
* Finished Message
* (C) 2004-2006,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_hello_verify.cpp b/src/lib/tls/msg_hello_verify.cpp
index 5a8976ae0..8f209998f 100644
--- a/src/lib/tls/msg_hello_verify.cpp
+++ b/src/lib/tls/msg_hello_verify.cpp
@@ -2,7 +2,7 @@
* DTLS Hello Verify Request
* (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/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_next_protocol.cpp b/src/lib/tls/msg_next_protocol.cpp
index 4371ce33c..6e56917d6 100644
--- a/src/lib/tls/msg_next_protocol.cpp
+++ b/src/lib/tls/msg_next_protocol.cpp
@@ -2,7 +2,7 @@
* Next Protocol Negotiation
* (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/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_server_hello.cpp b/src/lib/tls/msg_server_hello.cpp
index 8dd7d3595..a0fc008e8 100644
--- a/src/lib/tls/msg_server_hello.cpp
+++ b/src/lib/tls/msg_server_hello.cpp
@@ -2,7 +2,7 @@
* TLS Server Hello and Server Hello Done
* (C) 2004-2011,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_server_kex.cpp b/src/lib/tls/msg_server_kex.cpp
index 1c169877c..2950f1906 100644
--- a/src/lib/tls/msg_server_kex.cpp
+++ b/src/lib/tls/msg_server_kex.cpp
@@ -2,7 +2,7 @@
* Server Key Exchange Message
* (C) 2004-2010,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_messages.h>
diff --git a/src/lib/tls/msg_session_ticket.cpp b/src/lib/tls/msg_session_ticket.cpp
index 2d5411a86..26dc250c3 100644
--- a/src/lib/tls/msg_session_ticket.cpp
+++ b/src/lib/tls/msg_session_ticket.cpp
@@ -2,7 +2,7 @@
* Session Tickets
* (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/internal/tls_messages.h>
diff --git a/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp b/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp
index 561939def..665a2ded6 100644
--- a/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp
+++ b/src/lib/tls/sessions_sql/tls_session_manager_sql.cpp
@@ -2,7 +2,7 @@
* SQL TLS Session Manager
* (C) 2012,2014 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_session_manager_sql.h>
diff --git a/src/lib/tls/sessions_sql/tls_session_manager_sql.h b/src/lib/tls/sessions_sql/tls_session_manager_sql.h
index 0935b73ac..081c42e74 100644
--- a/src/lib/tls/sessions_sql/tls_session_manager_sql.h
+++ b/src/lib/tls/sessions_sql/tls_session_manager_sql.h
@@ -2,7 +2,7 @@
* TLS Session Manager storing to encrypted SQL db table
* (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_TLS_SQL_SESSION_MANAGER_H__
diff --git a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.cpp b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.cpp
index 30af3699f..aa163be8a 100644
--- a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.cpp
+++ b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.cpp
@@ -2,7 +2,7 @@
* SQLite TLS Session Manager
* (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/tls_session_manager_sqlite.h>
diff --git a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h
index 67c1c9e53..4a7c175cc 100644
--- a/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h
+++ b/src/lib/tls/sessions_sqlite3/tls_session_manager_sqlite.h
@@ -2,7 +2,7 @@
* SQLite3 TLS Session Manager
* (C) 2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_SQLITE3_SESSION_MANAGER_H__
diff --git a/src/lib/tls/tls_alert.cpp b/src/lib/tls/tls_alert.cpp
index 47e1730ea..ecda5055c 100644
--- a/src/lib/tls/tls_alert.cpp
+++ b/src/lib/tls/tls_alert.cpp
@@ -2,7 +2,7 @@
* Alert Message
* (C) 2004-2006,2011 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_alert.h>
diff --git a/src/lib/tls/tls_alert.h b/src/lib/tls/tls_alert.h
index 089fe8ba3..90bc80d45 100644
--- a/src/lib/tls/tls_alert.h
+++ b/src/lib/tls/tls_alert.h
@@ -2,7 +2,7 @@
* Alert Message
* (C) 2004-2006,2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_ALERT_H__
diff --git a/src/lib/tls/tls_blocking.cpp b/src/lib/tls/tls_blocking.cpp
index 4b33ba926..dc5769e2c 100644
--- a/src/lib/tls/tls_blocking.cpp
+++ b/src/lib/tls/tls_blocking.cpp
@@ -2,7 +2,7 @@
* TLS Blocking API
* (C) 2013 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_blocking.h>
diff --git a/src/lib/tls/tls_blocking.h b/src/lib/tls/tls_blocking.h
index cfa96ce8d..1226d9364 100644
--- a/src/lib/tls/tls_blocking.h
+++ b/src/lib/tls/tls_blocking.h
@@ -2,7 +2,7 @@
* TLS Blocking API
* (C) 2013 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_BLOCKING_CHANNELS_H__
diff --git a/src/lib/tls/tls_channel.cpp b/src/lib/tls/tls_channel.cpp
index 4b42016fa..a5e504f8b 100644
--- a/src/lib/tls/tls_channel.cpp
+++ b/src/lib/tls/tls_channel.cpp
@@ -2,7 +2,7 @@
* TLS Channels
* (C) 2011,2012,2014,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_channel.h>
diff --git a/src/lib/tls/tls_channel.h b/src/lib/tls/tls_channel.h
index c5da583a1..5b5a5d530 100644
--- a/src/lib/tls/tls_channel.h
+++ b/src/lib/tls/tls_channel.h
@@ -2,7 +2,7 @@
* TLS Channel
* (C) 2011,2012,2014,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_CHANNEL_H__
diff --git a/src/lib/tls/tls_ciphersuite.cpp b/src/lib/tls/tls_ciphersuite.cpp
index 2ed5d24e6..c912965c6 100644
--- a/src/lib/tls/tls_ciphersuite.cpp
+++ b/src/lib/tls/tls_ciphersuite.cpp
@@ -2,7 +2,7 @@
* TLS Cipher Suite
* (C) 2004-2010,2012,2013 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_ciphersuite.h>
diff --git a/src/lib/tls/tls_ciphersuite.h b/src/lib/tls/tls_ciphersuite.h
index bff5b0d9d..26faca11b 100644
--- a/src/lib/tls/tls_ciphersuite.h
+++ b/src/lib/tls/tls_ciphersuite.h
@@ -2,7 +2,7 @@
* TLS Cipher Suites
* (C) 2004-2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_CIPHER_SUITES_H__
diff --git a/src/lib/tls/tls_client.cpp b/src/lib/tls/tls_client.cpp
index 1e858a0b0..f68c9c614 100644
--- a/src/lib/tls/tls_client.cpp
+++ b/src/lib/tls/tls_client.cpp
@@ -2,7 +2,7 @@
* TLS Client
* (C) 2004-2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_client.h>
diff --git a/src/lib/tls/tls_client.h b/src/lib/tls/tls_client.h
index c4440c7ac..126dbb935 100644
--- a/src/lib/tls/tls_client.h
+++ b/src/lib/tls/tls_client.h
@@ -2,7 +2,7 @@
* TLS Client
* (C) 2004-2011 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_CLIENT_H__
diff --git a/src/lib/tls/tls_exceptn.h b/src/lib/tls/tls_exceptn.h
index 529d1f315..ae601b60b 100644
--- a/src/lib/tls/tls_exceptn.h
+++ b/src/lib/tls/tls_exceptn.h
@@ -2,7 +2,7 @@
* Exceptions
* (C) 2004-2006 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_EXCEPTION_H__
diff --git a/src/lib/tls/tls_extensions.cpp b/src/lib/tls/tls_extensions.cpp
index 29bf68b80..2c3056d9f 100644
--- a/src/lib/tls/tls_extensions.cpp
+++ b/src/lib/tls/tls_extensions.cpp
@@ -2,7 +2,7 @@
* TLS Extensions
* (C) 2011,2012,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_extensions.h>
diff --git a/src/lib/tls/tls_extensions.h b/src/lib/tls/tls_extensions.h
index f26970b47..393cada12 100644
--- a/src/lib/tls/tls_extensions.h
+++ b/src/lib/tls/tls_extensions.h
@@ -2,7 +2,7 @@
* TLS Extensions
* (C) 2011-2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_EXTENSIONS_H__
diff --git a/src/lib/tls/tls_handshake_hash.cpp b/src/lib/tls/tls_handshake_hash.cpp
index ed8bee5a3..77605309c 100644
--- a/src/lib/tls/tls_handshake_hash.cpp
+++ b/src/lib/tls/tls_handshake_hash.cpp
@@ -2,7 +2,7 @@
* TLS Handshake Hash
* (C) 2004-2006,2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_handshake_hash.h>
diff --git a/src/lib/tls/tls_handshake_hash.h b/src/lib/tls/tls_handshake_hash.h
index 840895963..0b4fa7120 100644
--- a/src/lib/tls/tls_handshake_hash.h
+++ b/src/lib/tls/tls_handshake_hash.h
@@ -2,7 +2,7 @@
* TLS Handshake Hash
* (C) 2004-2006,2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_HANDSHAKE_HASH_H__
diff --git a/src/lib/tls/tls_handshake_io.cpp b/src/lib/tls/tls_handshake_io.cpp
index da27cc4ce..ef766679f 100644
--- a/src/lib/tls/tls_handshake_io.cpp
+++ b/src/lib/tls/tls_handshake_io.cpp
@@ -2,7 +2,7 @@
* TLS Handshake IO
* (C) 2012,2014 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_handshake_io.h>
diff --git a/src/lib/tls/tls_handshake_io.h b/src/lib/tls/tls_handshake_io.h
index b13a81700..34873c3a6 100644
--- a/src/lib/tls/tls_handshake_io.h
+++ b/src/lib/tls/tls_handshake_io.h
@@ -2,7 +2,7 @@
* TLS Handshake Serialization
* (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_TLS_HANDSHAKE_IO_H__
diff --git a/src/lib/tls/tls_handshake_msg.h b/src/lib/tls/tls_handshake_msg.h
index 1c44554d3..6937d4f2c 100644
--- a/src/lib/tls/tls_handshake_msg.h
+++ b/src/lib/tls/tls_handshake_msg.h
@@ -2,7 +2,7 @@
* TLS Handshake Message
* (C) 2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_HANDSHAKE_MSG_H__
diff --git a/src/lib/tls/tls_handshake_state.cpp b/src/lib/tls/tls_handshake_state.cpp
index a7317a333..4a6714f15 100644
--- a/src/lib/tls/tls_handshake_state.cpp
+++ b/src/lib/tls/tls_handshake_state.cpp
@@ -2,7 +2,7 @@
* TLS Handshaking
* (C) 2004-2006,2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_handshake_state.h>
diff --git a/src/lib/tls/tls_handshake_state.h b/src/lib/tls/tls_handshake_state.h
index 205d0d8b9..3c8d856d7 100644
--- a/src/lib/tls/tls_handshake_state.h
+++ b/src/lib/tls/tls_handshake_state.h
@@ -2,7 +2,7 @@
* TLS Handshake State
* (C) 2004-2006,2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_HANDSHAKE_STATE_H__
diff --git a/src/lib/tls/tls_heartbeats.cpp b/src/lib/tls/tls_heartbeats.cpp
index a8bcc0189..11c9a355f 100644
--- a/src/lib/tls/tls_heartbeats.cpp
+++ b/src/lib/tls/tls_heartbeats.cpp
@@ -2,7 +2,7 @@
* TLS Heartbeats
* (C) 2012,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_heartbeats.h>
diff --git a/src/lib/tls/tls_heartbeats.h b/src/lib/tls/tls_heartbeats.h
index c17c5606f..dcb63babe 100644
--- a/src/lib/tls/tls_heartbeats.h
+++ b/src/lib/tls/tls_heartbeats.h
@@ -2,7 +2,7 @@
* TLS Heartbeats
* (C) 2012,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_HEARTBEATS_H__
diff --git a/src/lib/tls/tls_magic.h b/src/lib/tls/tls_magic.h
index e22ab7248..6a29ea0a1 100644
--- a/src/lib/tls/tls_magic.h
+++ b/src/lib/tls/tls_magic.h
@@ -2,7 +2,7 @@
* SSL/TLS Protocol Constants
* (C) 2004-2010 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_PROTOCOL_MAGIC_H__
diff --git a/src/lib/tls/tls_messages.h b/src/lib/tls/tls_messages.h
index 59bf296f4..4fb3d2535 100644
--- a/src/lib/tls/tls_messages.h
+++ b/src/lib/tls/tls_messages.h
@@ -2,7 +2,7 @@
* TLS Messages
* (C) 2004-2011,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_MESSAGES_H__
diff --git a/src/lib/tls/tls_policy.cpp b/src/lib/tls/tls_policy.cpp
index 39ac25940..d8d241a2a 100644
--- a/src/lib/tls/tls_policy.cpp
+++ b/src/lib/tls/tls_policy.cpp
@@ -2,7 +2,7 @@
* Policies for TLS
* (C) 2004-2010,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_policy.h>
diff --git a/src/lib/tls/tls_policy.h b/src/lib/tls/tls_policy.h
index e08714df8..0e81dd7f7 100644
--- a/src/lib/tls/tls_policy.h
+++ b/src/lib/tls/tls_policy.h
@@ -2,7 +2,7 @@
* Hooks for application level policies on TLS connections
* (C) 2004-2006,2013 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_POLICY_H__
diff --git a/src/lib/tls/tls_reader.h b/src/lib/tls/tls_reader.h
index f80e494f4..f24543edb 100644
--- a/src/lib/tls/tls_reader.h
+++ b/src/lib/tls/tls_reader.h
@@ -2,7 +2,7 @@
* TLS Data Reader
* (C) 2010-2011,2014 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_READER_H__
diff --git a/src/lib/tls/tls_record.cpp b/src/lib/tls/tls_record.cpp
index 5f3801024..b2653c54a 100644
--- a/src/lib/tls/tls_record.cpp
+++ b/src/lib/tls/tls_record.cpp
@@ -2,7 +2,7 @@
* TLS Record Handling
* (C) 2012,2013,2014 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_record.h>
diff --git a/src/lib/tls/tls_record.h b/src/lib/tls/tls_record.h
index d7e85dcab..5ed3ed6ea 100644
--- a/src/lib/tls/tls_record.h
+++ b/src/lib/tls/tls_record.h
@@ -2,7 +2,7 @@
* TLS Record Handling
* (C) 2004-2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_RECORDS_H__
diff --git a/src/lib/tls/tls_seq_numbers.h b/src/lib/tls/tls_seq_numbers.h
index d7b8c919c..2feef33a9 100644
--- a/src/lib/tls/tls_seq_numbers.h
+++ b/src/lib/tls/tls_seq_numbers.h
@@ -2,7 +2,7 @@
* TLS Sequence Number Handling
* (C) 2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_SEQ_NUMBERS_H__
diff --git a/src/lib/tls/tls_server.cpp b/src/lib/tls/tls_server.cpp
index 228668943..43be3788d 100644
--- a/src/lib/tls/tls_server.cpp
+++ b/src/lib/tls/tls_server.cpp
@@ -2,7 +2,7 @@
* TLS Server
* (C) 2004-2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_server.h>
diff --git a/src/lib/tls/tls_server.h b/src/lib/tls/tls_server.h
index c0646bdbc..ce82e001d 100644
--- a/src/lib/tls/tls_server.h
+++ b/src/lib/tls/tls_server.h
@@ -2,7 +2,7 @@
* TLS Server
* (C) 2004-2011 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_SERVER_H__
diff --git a/src/lib/tls/tls_server_info.h b/src/lib/tls/tls_server_info.h
index 773296eaf..4ae291d3a 100644
--- a/src/lib/tls/tls_server_info.h
+++ b/src/lib/tls/tls_server_info.h
@@ -2,7 +2,7 @@
* TLS Server Information
* (C) 2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_SERVER_INFO_H__
diff --git a/src/lib/tls/tls_session.cpp b/src/lib/tls/tls_session.cpp
index 1891e6e4e..6ce25349c 100644
--- a/src/lib/tls/tls_session.cpp
+++ b/src/lib/tls/tls_session.cpp
@@ -2,7 +2,7 @@
* TLS Session State
* (C) 2011-2012,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_session.h>
diff --git a/src/lib/tls/tls_session.h b/src/lib/tls/tls_session.h
index c3824237a..31691f078 100644
--- a/src/lib/tls/tls_session.h
+++ b/src/lib/tls/tls_session.h
@@ -2,7 +2,7 @@
* TLS Session
* (C) 2011-2012,2015 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_SESSION_STATE_H__
diff --git a/src/lib/tls/tls_session_key.cpp b/src/lib/tls/tls_session_key.cpp
index 3ea80ecb0..570470732 100644
--- a/src/lib/tls/tls_session_key.cpp
+++ b/src/lib/tls/tls_session_key.cpp
@@ -2,7 +2,7 @@
* TLS Session Key
* (C) 2004-2006,2011 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/tls_session_key.h>
diff --git a/src/lib/tls/tls_session_key.h b/src/lib/tls/tls_session_key.h
index d62e3400d..6b74f907d 100644
--- a/src/lib/tls/tls_session_key.h
+++ b/src/lib/tls/tls_session_key.h
@@ -2,7 +2,7 @@
* TLS Session Key
* (C) 2004-2006,2011 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_SESSION_KEYS_H__
diff --git a/src/lib/tls/tls_session_manager.h b/src/lib/tls/tls_session_manager.h
index e6eacc88c..c7aa1960b 100644
--- a/src/lib/tls/tls_session_manager.h
+++ b/src/lib/tls/tls_session_manager.h
@@ -2,7 +2,7 @@
* TLS Session Manager
* (C) 2011 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_SESSION_MANAGER_H__
diff --git a/src/lib/tls/tls_session_manager_memory.cpp b/src/lib/tls/tls_session_manager_memory.cpp
index 24ede276c..2c836290b 100644
--- a/src/lib/tls/tls_session_manager_memory.cpp
+++ b/src/lib/tls/tls_session_manager_memory.cpp
@@ -2,7 +2,7 @@
* TLS Session Management
* (C) 2011,2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_session_manager.h>
diff --git a/src/lib/tls/tls_suite_info.cpp b/src/lib/tls/tls_suite_info.cpp
index 90ff2ae61..a8862c3b2 100644
--- a/src/lib/tls/tls_suite_info.cpp
+++ b/src/lib/tls/tls_suite_info.cpp
@@ -5,7 +5,7 @@
* (tls-parameters.txt hash 4bc98b6f75ad5b63952b5f457fa7adbfef60f095)
* by ./src/scripts/tls_suite_info.py on 2014-12-31
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/tls_ciphersuite.h>
diff --git a/src/lib/tls/tls_version.cpp b/src/lib/tls/tls_version.cpp
index 71dac4048..67069c738 100644
--- a/src/lib/tls/tls_version.cpp
+++ b/src/lib/tls/tls_version.cpp
@@ -2,7 +2,7 @@
* TLS Protocol Version Management
* (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/tls_version.h>
diff --git a/src/lib/tls/tls_version.h b/src/lib/tls/tls_version.h
index 2e2969fbf..8e686e8e4 100644
--- a/src/lib/tls/tls_version.h
+++ b/src/lib/tls/tls_version.h
@@ -2,7 +2,7 @@
* TLS Protocol Version Management
* (C) 2012 Jack Lloyd
*
-* Released under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#ifndef BOTAN_TLS_PROTOCOL_VERSION_H__
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>
diff --git a/src/python/core.cpp b/src/python/core.cpp
index 6dcceee74..d3c314374 100644
--- a/src/python/core.cpp
+++ b/src/python/core.cpp
@@ -1,6 +1,8 @@
/*
* Boost.Python module definition
* (C) 1999-2007 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/init.h>
diff --git a/src/python/filter.cpp b/src/python/filter.cpp
index e329ed708..dc02a05e1 100644
--- a/src/python/filter.cpp
+++ b/src/python/filter.cpp
@@ -2,7 +2,7 @@
* Boost.Python module definition
* (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 <boost/python.hpp>
diff --git a/src/python/python_botan.h b/src/python/python_botan.h
index 501f4b9eb..c4ee6a9e0 100644
--- a/src/python/python_botan.h
+++ b/src/python/python_botan.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_BOOST_PYTHON_COMMON_H__
diff --git a/src/python/rsa.cpp b/src/python/rsa.cpp
index 770082945..4ba19991c 100644
--- a/src/python/rsa.cpp
+++ b/src/python/rsa.cpp
@@ -2,7 +2,7 @@
* Boost.Python module definition
* (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/rsa.h>
diff --git a/src/python/x509.cpp b/src/python/x509.cpp
index 57beb7e4a..48cfca2c7 100644
--- a/src/python/x509.cpp
+++ b/src/python/x509.cpp
@@ -2,7 +2,7 @@
* Boost.Python module definition
* (C) 2009 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/oids.h>
diff --git a/src/scripts/comba.py b/src/scripts/comba.py
index 4d3befa26..fe588f7bc 100755
--- a/src/scripts/comba.py
+++ b/src/scripts/comba.py
@@ -80,7 +80,7 @@ def main(args = None):
* Comba Multiplication and Squaring
* (C) 1999-2007,2011,2014 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include <botan/internal/mp_core.h>
diff --git a/src/scripts/combine_relnotes.py b/src/scripts/combine_relnotes.py
index 9b6c4f304..cf9a78ad7 100755
--- a/src/scripts/combine_relnotes.py
+++ b/src/scripts/combine_relnotes.py
@@ -3,7 +3,7 @@
"""
(C) 2014 Jack Lloyd
-Distributed under the terms of the Botan license
+Botan is released under the Simplified BSD License (see license.txt)
"""
import re
diff --git a/src/scripts/dist.py b/src/scripts/dist.py
index 96be44158..d0c042b2a 100755
--- a/src/scripts/dist.py
+++ b/src/scripts/dist.py
@@ -5,7 +5,7 @@ Release script for botan (http://botan.randombit.net/)
(C) 2011, 2012, 2013 Jack Lloyd
-Distributed under the terms of the Botan license
+Botan is released under the Simplified BSD License (see license.txt)
"""
import errno
diff --git a/src/scripts/install.py b/src/scripts/install.py
index ec22e7abc..70718bd22 100755
--- a/src/scripts/install.py
+++ b/src/scripts/install.py
@@ -4,7 +4,7 @@
Botan install script
(C) 2014,2015 Jack Lloyd
-Distributed under the terms of the Botan license
+Botan is released under the Simplified BSD License (see license.txt)
"""
import errno
diff --git a/src/scripts/tls_suite_info.py b/src/scripts/tls_suite_info.py
index 89e1dae5b..5f06f503f 100755
--- a/src/scripts/tls_suite_info.py
+++ b/src/scripts/tls_suite_info.py
@@ -5,7 +5,7 @@ Used to generate lib/tls/tls_suite_info.cpp from IANA params
(C) 2011, 2012, 2013, 2014 Jack Lloyd
-Distributed under the terms of the Botan license
+Botan is released under the Simplified BSD License (see license.txt)
"""
import sys
diff --git a/src/tests/nist_x509.cpp b/src/tests/nist_x509.cpp
index 48483d46a..8c1f0d696 100644
--- a/src/tests/nist_x509.cpp
+++ b/src/tests/nist_x509.cpp
@@ -1,14 +1,16 @@
/*
- Code to run the X.509v3 processing tests described in "Conformance
- Testing of Relying Party Client Certificate Path Proccessing Logic",
- which is available on NIST's web site.
-
-Known Failures/Problems
-
-Policy extensions are not implemented, so we skip tests #34-#53.
-
-Tests #75 and #76 are skipped as they make use of relatively obscure CRL
-extensions which are not supported.
+* (C) 2006,2011,2012,2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*
+* Code to run the X.509v3 processing tests described in "Conformance
+* Testing of Relying Party Client Certificate Path Proccessing Logic",
+* which is available on NIST's web site.
+*
+* Known Failures/Problems:
+* - Policy extensions are not implemented, so we skip tests #34-#53.
+* - Tests #75 and #76 are skipped as they make use of relatively
+* obscure CRL extensions which are not supported.
*/
#include "tests.h"
diff --git a/src/tests/test_aead.cpp b/src/tests/test_aead.cpp
index 2cc7a0c50..f5445f8e2 100644
--- a/src/tests/test_aead.cpp
+++ b/src/tests/test_aead.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/hex.h>
diff --git a/src/tests/test_bigint.cpp b/src/tests/test_bigint.cpp
index 7504a30d9..99114a422 100644
--- a/src/tests/test_bigint.cpp
+++ b/src/tests/test_bigint.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 "tests.h"
diff --git a/src/tests/test_block.cpp b/src/tests/test_block.cpp
index 450e5f7fd..eb4ea58bf 100644
--- a/src/tests/test_block.cpp
+++ b/src/tests/test_block.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/libstate.h>
diff --git a/src/tests/test_c25519.cpp b/src/tests/test_c25519.cpp
index cb03ebf69..3dbc92492 100644
--- a/src/tests/test_c25519.cpp
+++ b/src/tests/test_c25519.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_cryptobox.cpp b/src/tests/test_cryptobox.cpp
index f5ae4ce86..433d64d50 100644
--- a/src/tests/test_cryptobox.cpp
+++ b/src/tests/test_cryptobox.cpp
@@ -1,5 +1,10 @@
-#include "tests.h"
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+#include "tests.h"
#include <iostream>
diff --git a/src/tests/test_cvc.cpp b/src/tests/test_cvc.cpp
index 929f541e5..669aaa07a 100644
--- a/src/tests/test_cvc.cpp
+++ b/src/tests/test_cvc.cpp
@@ -3,6 +3,8 @@
*
* (C) 2008 Falko Strenzke ([email protected])
* 2008 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include "tests.h"
diff --git a/src/tests/test_dh.cpp b/src/tests/test_dh.cpp
index f01005dc6..afafd222a 100644
--- a/src/tests/test_dh.cpp
+++ b/src/tests/test_dh.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_dlies.cpp b/src/tests/test_dlies.cpp
index f5fecc6d3..ee37f33e2 100644
--- a/src/tests/test_dlies.cpp
+++ b/src/tests/test_dlies.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_dsa.cpp b/src/tests/test_dsa.cpp
index 0bb75e277..b31bda9fe 100644
--- a/src/tests/test_dsa.cpp
+++ b/src/tests/test_dsa.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_ecdsa.cpp b/src/tests/test_ecdsa.cpp
index fa7e03001..e8962b748 100644
--- a/src/tests/test_ecdsa.cpp
+++ b/src/tests/test_ecdsa.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_elg.cpp b/src/tests/test_elg.cpp
index 15a1ee452..cfe6375fb 100644
--- a/src/tests/test_elg.cpp
+++ b/src/tests/test_elg.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_gost_3410.cpp b/src/tests/test_gost_3410.cpp
index ccf2ed771..08dc1555b 100644
--- a/src/tests/test_gost_3410.cpp
+++ b/src/tests/test_gost_3410.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_hash.cpp b/src/tests/test_hash.cpp
index ec14d6dd4..242988c80 100644
--- a/src/tests/test_hash.cpp
+++ b/src/tests/test_hash.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/libstate.h>
diff --git a/src/tests/test_hkdf.cpp b/src/tests/test_hkdf.cpp
index 8bd25829a..74a4ce4c7 100644
--- a/src/tests/test_hkdf.cpp
+++ b/src/tests/test_hkdf.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/hex.h>
#include <iostream>
diff --git a/src/tests/test_kdf.cpp b/src/tests/test_kdf.cpp
index 0fc627673..b08da5c26 100644
--- a/src/tests/test_kdf.cpp
+++ b/src/tests/test_kdf.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/lookup.h>
diff --git a/src/tests/test_keywrap.cpp b/src/tests/test_keywrap.cpp
index a7dcbfe75..4a133412a 100644
--- a/src/tests/test_keywrap.cpp
+++ b/src/tests/test_keywrap.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/libstate.h>
diff --git a/src/tests/test_mac.cpp b/src/tests/test_mac.cpp
index 90d501233..45092d4f3 100644
--- a/src/tests/test_mac.cpp
+++ b/src/tests/test_mac.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/libstate.h>
diff --git a/src/tests/test_mceliece.cpp b/src/tests/test_mceliece.cpp
index 69494f5fc..ca497f542 100644
--- a/src/tests/test_mceliece.cpp
+++ b/src/tests/test_mceliece.cpp
@@ -1,3 +1,11 @@
+/*
+* (C) 2014 cryptosource GmbH
+* (C) 2014 Falko Strenzke [email protected]
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/pubkey.h>
diff --git a/src/tests/test_modes.cpp b/src/tests/test_modes.cpp
index 018efd3bd..5ff6c03dc 100644
--- a/src/tests/test_modes.cpp
+++ b/src/tests/test_modes.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/hex.h>
diff --git a/src/tests/test_nr.cpp b/src/tests/test_nr.cpp
index 0a16c452e..25d84606c 100644
--- a/src/tests/test_nr.cpp
+++ b/src/tests/test_nr.cpp
@@ -1,9 +1,14 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
#if defined(BOTAN_HAS_NYBERG_RUEPPEL)
#include <botan/nr.h>
-
#include <botan/pubkey.h>
#include <botan/dl_group.h>
#endif
diff --git a/src/tests/test_ocb.cpp b/src/tests/test_ocb.cpp
index fbbad8caf..0e31941cb 100644
--- a/src/tests/test_ocb.cpp
+++ b/src/tests/test_ocb.cpp
@@ -1,3 +1,8 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
#include "tests.h"
#include <iostream>
diff --git a/src/tests/test_passhash.cpp b/src/tests/test_passhash.cpp
index 57b9f6452..17aef2204 100644
--- a/src/tests/test_passhash.cpp
+++ b/src/tests/test_passhash.cpp
@@ -1,5 +1,10 @@
-#include "tests.h"
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+#include "tests.h"
#include <iostream>
diff --git a/src/tests/test_pbkdf.cpp b/src/tests/test_pbkdf.cpp
index 5d97bf0e9..bf9741e21 100644
--- a/src/tests/test_pbkdf.cpp
+++ b/src/tests/test_pbkdf.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/lookup.h>
diff --git a/src/tests/test_pubkey.cpp b/src/tests/test_pubkey.cpp
index 9de9a6f9d..9f46e5398 100644
--- a/src/tests/test_pubkey.cpp
+++ b/src/tests/test_pubkey.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 "tests.h"
diff --git a/src/tests/test_pubkey.h b/src/tests/test_pubkey.h
index fd9394fa6..e1197a61b 100644
--- a/src/tests/test_pubkey.h
+++ b/src/tests/test_pubkey.h
@@ -1,3 +1,8 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
#ifndef BOTAN_TEST_PUBKEY_H__
#define BOTAN_TEST_PUBKEY_H__
diff --git a/src/tests/test_rfc6979.cpp b/src/tests/test_rfc6979.cpp
index 9552b1b18..8ecc04fa3 100644
--- a/src/tests/test_rfc6979.cpp
+++ b/src/tests/test_rfc6979.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#if defined(BOTAN_HAS_RFC6979_GENERATOR)
diff --git a/src/tests/test_rng.cpp b/src/tests/test_rng.cpp
index 6d10de9a7..48c1fe863 100644
--- a/src/tests/test_rng.cpp
+++ b/src/tests/test_rng.cpp
@@ -1,5 +1,11 @@
-#include "tests.h"
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "test_rng.h"
+#include "tests.h"
#include <botan/libstate.h>
#include <botan/hex.h>
diff --git a/src/tests/test_rng.h b/src/tests/test_rng.h
index 6a5052973..bf4032699 100644
--- a/src/tests/test_rng.h
+++ b/src/tests/test_rng.h
@@ -1,3 +1,8 @@
+/*
+* (C) 2009 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
#ifndef BOTAN_TESTS_FIXED_RNG_H__
#define BOTAN_TESTS_FIXED_RNG_H__
diff --git a/src/tests/test_rsa.cpp b/src/tests/test_rsa.cpp
index f1ec8e603..4133d13c0 100644
--- a/src/tests/test_rsa.cpp
+++ b/src/tests/test_rsa.cpp
@@ -1,7 +1,12 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
-
#include <botan/pubkey.h>
#include <botan/rsa.h>
#include <botan/hex.h>
diff --git a/src/tests/test_rw.cpp b/src/tests/test_rw.cpp
index 9db811433..f5a4f8cdb 100644
--- a/src/tests/test_rw.cpp
+++ b/src/tests/test_rw.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include "test_pubkey.h"
diff --git a/src/tests/test_stream.cpp b/src/tests/test_stream.cpp
index ef186e982..3144e9f47 100644
--- a/src/tests/test_stream.cpp
+++ b/src/tests/test_stream.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/libstate.h>
diff --git a/src/tests/test_transform.cpp b/src/tests/test_transform.cpp
index aba0e32c9..41d992944 100644
--- a/src/tests/test_transform.cpp
+++ b/src/tests/test_transform.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/transform.h>
diff --git a/src/tests/test_tss.cpp b/src/tests/test_tss.cpp
index 646ebe415..3bb54e4f6 100644
--- a/src/tests/test_tss.cpp
+++ b/src/tests/test_tss.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 "tests.h"
diff --git a/src/tests/tests.cpp b/src/tests/tests.cpp
index 9ed6785bc..88ff4171d 100644
--- a/src/tests/tests.cpp
+++ b/src/tests/tests.cpp
@@ -1,3 +1,9 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
+
#include "tests.h"
#include <botan/init.h>
#include <iostream>
diff --git a/src/tests/tests.h b/src/tests/tests.h
index 9d39fdc19..20f373805 100644
--- a/src/tests/tests.h
+++ b/src/tests/tests.h
@@ -1,3 +1,8 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
#ifndef BOTAN_TESTS_H__
#define BOTAN_TESTS_H__
diff --git a/src/tests/unit_ecc.cpp b/src/tests/unit_ecc.cpp
index f7723fb12..d198c25d8 100644
--- a/src/tests/unit_ecc.cpp
+++ b/src/tests/unit_ecc.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 "tests.h"
diff --git a/src/tests/unit_ecdh.cpp b/src/tests/unit_ecdh.cpp
index 3dc6227e8..fafb61b46 100644
--- a/src/tests/unit_ecdh.cpp
+++ b/src/tests/unit_ecdh.cpp
@@ -4,7 +4,7 @@
* (C) 2007 Manuel Hartl ([email protected])
* 2008 Jack Lloyd
*
-* Distributed under the terms of the Botan license
+* Botan is released under the Simplified BSD License (see license.txt)
*/
#include "tests.h"
diff --git a/src/tests/unit_ecdsa.cpp b/src/tests/unit_ecdsa.cpp
index f0107c55d..fb421cad8 100644
--- a/src/tests/unit_ecdsa.cpp
+++ b/src/tests/unit_ecdsa.cpp
@@ -1,10 +1,12 @@
-/******************************************************
-* ECDSA tests *
-* *
-* (C) 2007 Falko Strenzke *
-* Manuel Hartl *
-* 2008 Jack Lloyd *
-******************************************************/
+/*
+* ECDSA Tests
+*
+* (C) 2007 Falko Strenzke
+* 2007 Manuel Hartl
+* 2008 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
#include "tests.h"
diff --git a/src/tests/unit_tls.cpp b/src/tests/unit_tls.cpp
index 91cd094f2..ef445c99a 100644
--- a/src/tests/unit_tls.cpp
+++ b/src/tests/unit_tls.cpp
@@ -1,3 +1,8 @@
+/*
+* (C) 2014,2015 Jack Lloyd
+*
+* Botan is released under the Simplified BSD License (see license.txt)
+*/
#include "tests.h"
diff --git a/src/tests/unit_x509.cpp b/src/tests/unit_x509.cpp
index 0c469d319..1e66cd655 100644
--- a/src/tests/unit_x509.cpp
+++ b/src/tests/unit_x509.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 "tests.h"