From 3f16815c9e6349c4a0eeb6a6ecfe004e5d31e287 Mon Sep 17 00:00:00 2001 From: lloyd Date: Sat, 10 Jan 2015 04:15:52 +0000 Subject: Ensure all files have copyright and license info. Update license header line to specify the terms and refer to the file, neither of which it included before. --- src/tests/nist_x509.cpp | 22 ++++++++++++---------- src/tests/test_aead.cpp | 6 ++++++ src/tests/test_bigint.cpp | 2 +- src/tests/test_block.cpp | 6 ++++++ src/tests/test_c25519.cpp | 6 ++++++ src/tests/test_cryptobox.cpp | 7 ++++++- src/tests/test_cvc.cpp | 2 ++ src/tests/test_dh.cpp | 6 ++++++ src/tests/test_dlies.cpp | 6 ++++++ src/tests/test_dsa.cpp | 6 ++++++ src/tests/test_ecdsa.cpp | 6 ++++++ src/tests/test_elg.cpp | 6 ++++++ src/tests/test_gost_3410.cpp | 6 ++++++ src/tests/test_hash.cpp | 6 ++++++ src/tests/test_hkdf.cpp | 6 ++++++ src/tests/test_kdf.cpp | 6 ++++++ src/tests/test_keywrap.cpp | 6 ++++++ src/tests/test_mac.cpp | 6 ++++++ src/tests/test_mceliece.cpp | 8 ++++++++ src/tests/test_modes.cpp | 6 ++++++ src/tests/test_nr.cpp | 7 ++++++- src/tests/test_ocb.cpp | 5 +++++ src/tests/test_passhash.cpp | 7 ++++++- src/tests/test_pbkdf.cpp | 6 ++++++ src/tests/test_pubkey.cpp | 2 +- src/tests/test_pubkey.h | 5 +++++ src/tests/test_rfc6979.cpp | 6 ++++++ src/tests/test_rng.cpp | 8 +++++++- src/tests/test_rng.h | 5 +++++ src/tests/test_rsa.cpp | 7 ++++++- src/tests/test_rw.cpp | 6 ++++++ src/tests/test_stream.cpp | 6 ++++++ src/tests/test_transform.cpp | 6 ++++++ src/tests/test_tss.cpp | 2 +- src/tests/tests.cpp | 6 ++++++ src/tests/tests.h | 5 +++++ src/tests/unit_ecc.cpp | 2 +- src/tests/unit_ecdh.cpp | 2 +- src/tests/unit_ecdsa.cpp | 16 +++++++++------- src/tests/unit_tls.cpp | 5 +++++ src/tests/unit_x509.cpp | 2 +- 41 files changed, 219 insertions(+), 28 deletions(-) (limited to 'src/tests') 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 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 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 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 (strenzke@flexsecure.de) * 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 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 #include 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 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 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 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 fstrenzke@cryptosource.de +* (C) 2014,2015 Jack Lloyd +* +* Botan is released under the Simplified BSD License (see license.txt) +*/ + #include "tests.h" #include 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 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 - #include #include #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 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 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 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 #include 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 #include #include 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 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 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 #include 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 (hartl@flexsecure.de) * 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" -- cgit v1.2.3