diff options
Diffstat (limited to 'include')
162 files changed, 174 insertions, 168 deletions
diff --git a/include/adler32.h b/include/adler32.h index 4beb3bdb6..e2071ad1c 100644 --- a/include/adler32.h +++ b/include/adler32.h @@ -1,6 +1,6 @@ /************************************************* * Adler32 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ADLER32_H__ diff --git a/include/aes.h b/include/aes.h index 485b6ccae..6e336f026 100644 --- a/include/aes.h +++ b/include/aes.h @@ -1,6 +1,6 @@ /************************************************* * AES Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_AES_H__ diff --git a/include/alg_id.h b/include/alg_id.h index c16173be1..ffa311a35 100644 --- a/include/alg_id.h +++ b/include/alg_id.h @@ -1,6 +1,6 @@ /************************************************* * Algorithm Identifier Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ALGORITHM_IDENTIFIER_H__ diff --git a/include/allocate.h b/include/allocate.h index eabfe1c79..350858f42 100644 --- a/include/allocate.h +++ b/include/allocate.h @@ -1,6 +1,6 @@ /************************************************* * Allocator Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ALLOCATOR_H__ diff --git a/include/arc4.h b/include/arc4.h index 14ed290bc..39582dda8 100644 --- a/include/arc4.h +++ b/include/arc4.h @@ -1,6 +1,6 @@ /************************************************* * ARC4 Header File * -* (C) 1999-2008 The Botan Project * +* (C) 1999-2008 Jack Lloyd * *************************************************/ #ifndef BOTAN_ARC4_H__ diff --git a/include/asn1_int.h b/include/asn1_int.h index 020c3af1f..0206a5196 100644 --- a/include/asn1_int.h +++ b/include/asn1_int.h @@ -1,6 +1,6 @@ /************************************************* * ASN.1 Internals Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ASN1_H__ diff --git a/include/asn1_obj.h b/include/asn1_obj.h index 99aefbca3..d7ff332c9 100644 --- a/include/asn1_obj.h +++ b/include/asn1_obj.h @@ -1,6 +1,7 @@ /************************************************* * Common ASN.1 Objects Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * +* 2007 Yves Jerschow * *************************************************/ #ifndef BOTAN_ASN1_OBJ_H__ diff --git a/include/asn1_oid.h b/include/asn1_oid.h index 43630ad2d..92dbbecc0 100644 --- a/include/asn1_oid.h +++ b/include/asn1_oid.h @@ -1,6 +1,6 @@ /************************************************* * ASN.1 OID Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ASN1_OID_H__ diff --git a/include/base.h b/include/base.h index ba36cf943..2ad71af70 100644 --- a/include/base.h +++ b/include/base.h @@ -1,6 +1,6 @@ /************************************************* * Base Classes Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BASE_H__ diff --git a/include/base64.h b/include/base64.h index 161aa58eb..c0bbff0d1 100644 --- a/include/base64.h +++ b/include/base64.h @@ -1,6 +1,6 @@ /************************************************* * Base64 Encoder/Decoder Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BASE64_H__ diff --git a/include/basefilt.h b/include/basefilt.h index 2dccdf542..d8df06f4f 100644 --- a/include/basefilt.h +++ b/include/basefilt.h @@ -1,6 +1,6 @@ /************************************************* * Basic Filters Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BASEFILT_H__ diff --git a/include/ber_dec.h b/include/ber_dec.h index e00d47ae7..6eeaffc63 100644 --- a/include/ber_dec.h +++ b/include/ber_dec.h @@ -1,6 +1,6 @@ /************************************************* * BER Decoder Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BER_DECODER_H__ diff --git a/include/bigint.h b/include/bigint.h index 1772f1e51..04d8001b4 100644 --- a/include/bigint.h +++ b/include/bigint.h @@ -1,6 +1,6 @@ /************************************************* * BigInt Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BIGINT_H__ diff --git a/include/bit_ops.h b/include/bit_ops.h index 82cd69afa..0b2e85db5 100644 --- a/include/bit_ops.h +++ b/include/bit_ops.h @@ -1,6 +1,6 @@ /************************************************* * Bit/Word Operations Header File * -* (C) 1999-2008 The Botan Project * +* (C) 1999-2008 Jack Lloyd * *************************************************/ #ifndef BOTAN_BIT_OPS_H__ diff --git a/include/blinding.h b/include/blinding.h index 269f36b3e..49e0ee61b 100644 --- a/include/blinding.h +++ b/include/blinding.h @@ -1,6 +1,6 @@ /************************************************* * Blinder Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BLINDER_H__ diff --git a/include/blowfish.h b/include/blowfish.h index 46d44d7b1..4541a716c 100644 --- a/include/blowfish.h +++ b/include/blowfish.h @@ -1,6 +1,6 @@ /************************************************* * Blowfish Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BLOWFISH_H__ diff --git a/include/botan.h b/include/botan.h index bdd591569..a7b124da4 100644 --- a/include/botan.h +++ b/include/botan.h @@ -1,6 +1,6 @@ /************************************************* * Botan Core Interface Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #include <botan/base.h> diff --git a/include/buf_es.h b/include/buf_es.h index 8c0312c77..4bf178ae7 100644 --- a/include/buf_es.h +++ b/include/buf_es.h @@ -1,6 +1,6 @@ /************************************************* * Buffered EntropySource Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BUFFERED_ES_H__ diff --git a/include/buf_filt.h b/include/buf_filt.h index 8a521b4ea..4e55d4d52 100644 --- a/include/buf_filt.h +++ b/include/buf_filt.h @@ -1,6 +1,6 @@ /************************************************* * Buffering Filter Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BUFFERING_FILTER_H__ diff --git a/include/cast128.h b/include/cast128.h index 145edd635..58fc62c8b 100644 --- a/include/cast128.h +++ b/include/cast128.h @@ -1,6 +1,6 @@ /************************************************* * CAST-128 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CAST128_H__ diff --git a/include/cast256.h b/include/cast256.h index 152580cc5..85a844d04 100644 --- a/include/cast256.h +++ b/include/cast256.h @@ -1,6 +1,6 @@ /************************************************* * CAST-256 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CAST256_H__ diff --git a/include/cbc.h b/include/cbc.h index 607c3b059..38afe5426 100644 --- a/include/cbc.h +++ b/include/cbc.h @@ -1,6 +1,6 @@ /************************************************* * CBC Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CBC_H__ diff --git a/include/cbc_mac.h b/include/cbc_mac.h index aec1c42f1..2ec9b1645 100644 --- a/include/cbc_mac.h +++ b/include/cbc_mac.h @@ -1,6 +1,6 @@ /************************************************* * CBC-MAC Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CBC_MAC__ diff --git a/include/certstor.h b/include/certstor.h index 23484a020..ac5ea9236 100644 --- a/include/certstor.h +++ b/include/certstor.h @@ -1,6 +1,6 @@ /************************************************* * Certificate Store Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CERT_STORE_H__ diff --git a/include/cfb.h b/include/cfb.h index d1c00913d..caa4789c5 100644 --- a/include/cfb.h +++ b/include/cfb.h @@ -1,6 +1,6 @@ /************************************************* * CFB Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CFB_H__ diff --git a/include/charset.h b/include/charset.h index 2cd0b6e3f..ac9f501a0 100644 --- a/include/charset.h +++ b/include/charset.h @@ -1,6 +1,6 @@ /************************************************* * Character Set Handling Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CHARSET_H__ diff --git a/include/cmac.h b/include/cmac.h index 15f5a817c..bc0e00a73 100644 --- a/include/cmac.h +++ b/include/cmac.h @@ -1,6 +1,6 @@ /************************************************* * CMAC Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CMAC_H__ diff --git a/include/config.h b/include/config.h index ad6eafcac..67766dcb7 100644 --- a/include/config.h +++ b/include/config.h @@ -1,6 +1,6 @@ /************************************************* * Configuration Handling Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_POLICY_CONF_H__ @@ -33,7 +33,6 @@ class Config std::string option(const std::string&) const; u32bit option_as_u32bit(const std::string&) const; u32bit option_as_time(const std::string&) const; - bool option_as_bool(const std::string&) const; std::vector<std::string> option_as_list(const std::string&) const; void set_option(const std::string, const std::string&); diff --git a/include/crc24.h b/include/crc24.h index 801c3dd91..82a6b6156 100644 --- a/include/crc24.h +++ b/include/crc24.h @@ -1,6 +1,6 @@ /************************************************* * CRC24 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CRC24_H__ diff --git a/include/crc32.h b/include/crc32.h index d4df4737e..a8467044f 100644 --- a/include/crc32.h +++ b/include/crc32.h @@ -1,6 +1,6 @@ /************************************************* * CRC32 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CRC32_H__ diff --git a/include/crl_ent.h b/include/crl_ent.h index 9c3f5a5a7..8cee60736 100644 --- a/include/crl_ent.h +++ b/include/crl_ent.h @@ -1,6 +1,6 @@ /************************************************* * CRL Entry Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CRL_ENTRY_H__ diff --git a/include/ctr.h b/include/ctr.h index 9d3ebcef8..073ad57b1 100644 --- a/include/ctr.h +++ b/include/ctr.h @@ -1,6 +1,6 @@ /************************************************* * CTR Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CTR_H__ diff --git a/include/cts.h b/include/cts.h index c3218cb87..2245b2b9d 100644 --- a/include/cts.h +++ b/include/cts.h @@ -1,6 +1,6 @@ /************************************************* * CTS Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CTS_H__ diff --git a/include/data_snk.h b/include/data_snk.h index 34bdaa35e..f9011ad95 100644 --- a/include/data_snk.h +++ b/include/data_snk.h @@ -1,6 +1,6 @@ /************************************************* * DataSink Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DATA_SINK_H__ diff --git a/include/data_src.h b/include/data_src.h index 87a7b9128..a64141ef9 100644 --- a/include/data_src.h +++ b/include/data_src.h @@ -1,6 +1,6 @@ /************************************************* * DataSource Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DATA_SRC_H__ diff --git a/include/datastor.h b/include/datastor.h index 8814b10c3..0f887c08e 100644 --- a/include/datastor.h +++ b/include/datastor.h @@ -1,6 +1,6 @@ /************************************************* * Data Store Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DATA_STORE_H__ diff --git a/include/def_powm.h b/include/def_powm.h index b8df02dfe..3fc13e6c7 100644 --- a/include/def_powm.h +++ b/include/def_powm.h @@ -1,6 +1,6 @@ /************************************************* * Modular Exponentiation Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DEFAULT_MODEXP_H__ diff --git a/include/defalloc.h b/include/defalloc.h index c663116d0..69c162ac4 100644 --- a/include/defalloc.h +++ b/include/defalloc.h @@ -1,6 +1,6 @@ /************************************************* * Basic Allocators Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_BASIC_ALLOC_H__ diff --git a/include/der_enc.h b/include/der_enc.h index 27831b635..4bdcff4eb 100644 --- a/include/der_enc.h +++ b/include/der_enc.h @@ -1,6 +1,6 @@ /************************************************* * DER Encoder Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DER_ENCODER_H__ diff --git a/include/des.h b/include/des.h index 8c8ff90d8..f07d4c049 100644 --- a/include/des.h +++ b/include/des.h @@ -1,6 +1,6 @@ /************************************************* * DES Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DES_H__ diff --git a/include/dh.h b/include/dh.h index 8a679cd52..735514e6e 100644 --- a/include/dh.h +++ b/include/dh.h @@ -1,6 +1,6 @@ /************************************************* * Diffie-Hellman Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DIFFIE_HELLMAN_H__ diff --git a/include/dl_algo.h b/include/dl_algo.h index 538dfac38..3ae468cd0 100644 --- a/include/dl_algo.h +++ b/include/dl_algo.h @@ -1,6 +1,6 @@ /************************************************* * DL Scheme Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DL_ALGO_H__ diff --git a/include/dl_group.h b/include/dl_group.h index 9c503b5f3..0dc2dac5f 100644 --- a/include/dl_group.h +++ b/include/dl_group.h @@ -1,6 +1,6 @@ /************************************************* * Discrete Logarithm Group Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DL_PARAM_H__ diff --git a/include/dlies.h b/include/dlies.h index 88eb17e9e..d2f6b08e5 100644 --- a/include/dlies.h +++ b/include/dlies.h @@ -1,6 +1,6 @@ /************************************************* * DLIES Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DLIES_H__ diff --git a/include/dsa.h b/include/dsa.h index ea6ca97d9..542e325b7 100644 --- a/include/dsa.h +++ b/include/dsa.h @@ -1,6 +1,6 @@ /************************************************* * DSA Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DSA_H__ diff --git a/include/eax.h b/include/eax.h index 3eb33c576..5840151c5 100644 --- a/include/eax.h +++ b/include/eax.h @@ -1,6 +1,6 @@ /************************************************* * EAX Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_EAX_H__ diff --git a/include/ecb.h b/include/ecb.h index 4f678fa74..6e4a4312a 100644 --- a/include/ecb.h +++ b/include/ecb.h @@ -1,6 +1,6 @@ /************************************************* * ECB Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ECB_H__ diff --git a/include/elgamal.h b/include/elgamal.h index cdd6cde93..e5507ef3f 100644 --- a/include/elgamal.h +++ b/include/elgamal.h @@ -1,6 +1,6 @@ /************************************************* * ElGamal Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ELGAMAL_H__ diff --git a/include/eme.h b/include/eme.h index 29fea2eb2..fca4f5009 100644 --- a/include/eme.h +++ b/include/eme.h @@ -1,6 +1,6 @@ /************************************************* * EME Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_EME_H__ diff --git a/include/emsa.h b/include/emsa.h index 6c98114dc..026d3b210 100644 --- a/include/emsa.h +++ b/include/emsa.h @@ -1,6 +1,6 @@ /************************************************* * EMSA Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_EMSA_H__ diff --git a/include/eng_def.h b/include/eng_def.h index 22b00db7d..bfc57941f 100644 --- a/include/eng_def.h +++ b/include/eng_def.h @@ -1,6 +1,6 @@ /************************************************* * Default Engine Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_DEFAULT_ENGINE_H__ diff --git a/include/engine.h b/include/engine.h index 76147f347..55b76895a 100644 --- a/include/engine.h +++ b/include/engine.h @@ -1,6 +1,6 @@ /************************************************* * Engine Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ENGINE_H__ diff --git a/include/enums.h b/include/enums.h index bbf130e57..660c107ce 100644 --- a/include/enums.h +++ b/include/enums.h @@ -1,6 +1,6 @@ /************************************************* * Enumerations Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ENUMS_H__ diff --git a/include/exceptn.h b/include/exceptn.h index 3388020fc..1381782cf 100644 --- a/include/exceptn.h +++ b/include/exceptn.h @@ -1,6 +1,6 @@ /************************************************* * Exceptions Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_EXCEPTION_H__ diff --git a/include/filter.h b/include/filter.h index 531464659..ca2c7ffab 100644 --- a/include/filter.h +++ b/include/filter.h @@ -1,6 +1,6 @@ /************************************************* * Filter Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_FILTER_H__ diff --git a/include/filters.h b/include/filters.h index d0b2aec2d..a7c3c8cc7 100644 --- a/include/filters.h +++ b/include/filters.h @@ -1,6 +1,6 @@ /************************************************* * Filters Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_FILTERS_H__ diff --git a/include/fips140.h b/include/fips140.h index bf385fa35..b0cae081e 100644 --- a/include/fips140.h +++ b/include/fips140.h @@ -1,6 +1,6 @@ /************************************************* * FIPS 140 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_FIPS140_H__ diff --git a/include/fork256.h b/include/fork256.h index b3f6eb297..bcd2cb338 100644 --- a/include/fork256.h +++ b/include/fork256.h @@ -1,6 +1,6 @@ /************************************************* * FORK-256 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_FORK_256_H__ diff --git a/include/gost.h b/include/gost.h index 7d43d5f80..16c4edb6c 100644 --- a/include/gost.h +++ b/include/gost.h @@ -1,6 +1,6 @@ /************************************************* * GOST Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_GOST_H__ diff --git a/include/has160.h b/include/has160.h index 577160523..7cbcfa65f 100644 --- a/include/has160.h +++ b/include/has160.h @@ -1,6 +1,6 @@ /************************************************* * HAS-160 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_HAS_160_H__ diff --git a/include/hash_id.h b/include/hash_id.h index ba193aa24..d06e91537 100644 --- a/include/hash_id.h +++ b/include/hash_id.h @@ -1,6 +1,6 @@ /************************************************* * Hash Function Identification Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_HASHID_H__ diff --git a/include/hex.h b/include/hex.h index 31cdfd111..06dc25762 100644 --- a/include/hex.h +++ b/include/hex.h @@ -1,6 +1,6 @@ /************************************************* * Hex Encoder/Decoder Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_HEX_H__ diff --git a/include/hmac.h b/include/hmac.h index 533372aba..d757d9bf8 100644 --- a/include/hmac.h +++ b/include/hmac.h @@ -1,6 +1,6 @@ /************************************************* * HMAC Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_HMAC_H__ diff --git a/include/idea.h b/include/idea.h index 10b0f7049..39566e39b 100644 --- a/include/idea.h +++ b/include/idea.h @@ -1,6 +1,6 @@ /************************************************* * IDEA Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_IDEA_H__ diff --git a/include/if_algo.h b/include/if_algo.h index f3ff0e458..f0a1c97dc 100644 --- a/include/if_algo.h +++ b/include/if_algo.h @@ -1,6 +1,6 @@ /************************************************* * IF Scheme Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_IF_ALGO_H__ diff --git a/include/init.h b/include/init.h index 5a9181c8d..e07562eb0 100644 --- a/include/init.h +++ b/include/init.h @@ -1,6 +1,6 @@ /************************************************* * Library Initialization Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_INIT_H__ diff --git a/include/kasumi.h b/include/kasumi.h index ffaa10d9c..b7c594dcf 100644 --- a/include/kasumi.h +++ b/include/kasumi.h @@ -1,6 +1,6 @@ /************************************************* * KASUMI Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_KASUMI_H__ diff --git a/include/kdf.h b/include/kdf.h index ade4c926b..ee2e7724c 100644 --- a/include/kdf.h +++ b/include/kdf.h @@ -1,6 +1,6 @@ /************************************************* * KDF Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_KDF_H__ diff --git a/include/keypair.h b/include/keypair.h index c9a53c0d0..77b75b67f 100644 --- a/include/keypair.h +++ b/include/keypair.h @@ -1,6 +1,6 @@ /************************************************* * Keypair Checks Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_KEYPAIR_H__ diff --git a/include/libstate.h b/include/libstate.h index 5534d4ac1..7e83f57c6 100644 --- a/include/libstate.h +++ b/include/libstate.h @@ -1,6 +1,6 @@ /************************************************* * Library Internal/Global State Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_LIB_STATE_H__ diff --git a/include/lion.h b/include/lion.h index bc7d5328d..b89195797 100644 --- a/include/lion.h +++ b/include/lion.h @@ -1,6 +1,6 @@ /************************************************* * Lion Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_LION_H__ diff --git a/include/loadstor.h b/include/loadstor.h index 432aff4dc..5b5746cdb 100644 --- a/include/loadstor.h +++ b/include/loadstor.h @@ -1,6 +1,7 @@ /************************************************* * Load/Store Operators Header File * -* (C) 1999-2008 The Botan Project * +* (C) 1999-2007 Jack Lloyd * +* 2007 Yves Jerschow * *************************************************/ #ifndef BOTAN_LOAD_STORE_H__ diff --git a/include/look_add.h b/include/look_add.h index ec360f225..5a360c082 100644 --- a/include/look_add.h +++ b/include/look_add.h @@ -1,6 +1,6 @@ /************************************************* * Lookup Table Management Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_LOOKUP_MANGEMENT_H__ diff --git a/include/look_pk.h b/include/look_pk.h index 1491384a1..3255bfd86 100644 --- a/include/look_pk.h +++ b/include/look_pk.h @@ -1,6 +1,6 @@ /************************************************* * PK Algorithm Lookup Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PK_LOOKUP_H__ diff --git a/include/lookup.h b/include/lookup.h index 1fdfa3fd3..ec24344d2 100644 --- a/include/lookup.h +++ b/include/lookup.h @@ -1,6 +1,6 @@ /************************************************* * Algorithm Lookup Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_LOOKUP_H__ diff --git a/include/lubyrack.h b/include/lubyrack.h index 604314d51..a4e22f086 100644 --- a/include/lubyrack.h +++ b/include/lubyrack.h @@ -1,6 +1,6 @@ /************************************************* * Luby-Rackoff Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_LUBY_RACKOFF_H__ diff --git a/include/mars.h b/include/mars.h index cd517f525..5345f5613 100644 --- a/include/mars.h +++ b/include/mars.h @@ -1,6 +1,6 @@ /************************************************* * MARS Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MARS_H__ diff --git a/include/md2.h b/include/md2.h index e29f8f20f..c9758d9fb 100644 --- a/include/md2.h +++ b/include/md2.h @@ -1,6 +1,6 @@ /************************************************* * MD2 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MD2_H__ diff --git a/include/md4.h b/include/md4.h index d5ad8c5fa..03ba9b4d7 100644 --- a/include/md4.h +++ b/include/md4.h @@ -1,6 +1,6 @@ /************************************************* * MD4 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MD4_H__ diff --git a/include/md5.h b/include/md5.h index f3b8a2772..4cc6dc7ac 100644 --- a/include/md5.h +++ b/include/md5.h @@ -1,6 +1,6 @@ /************************************************* * MD5 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MD5_H__ diff --git a/include/mdx_hash.h b/include/mdx_hash.h index 967b7dc75..3ac5e3c93 100644 --- a/include/mdx_hash.h +++ b/include/mdx_hash.h @@ -1,6 +1,6 @@ /************************************************* * MDx Hash Function Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MDX_BASE_H__ diff --git a/include/mem_ops.h b/include/mem_ops.h index 83f075414..810356bce 100644 --- a/include/mem_ops.h +++ b/include/mem_ops.h @@ -1,6 +1,6 @@ /************************************************* * Memory Operations Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MEMORY_OPS_H__ diff --git a/include/mem_pool.h b/include/mem_pool.h index 435acd5b0..9d6d8d31d 100644 --- a/include/mem_pool.h +++ b/include/mem_pool.h @@ -1,6 +1,6 @@ /************************************************* * Pooling Allocator Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_POOLING_ALLOCATOR_H__ diff --git a/include/mgf1.h b/include/mgf1.h index 92db1a3c0..7f0e77e83 100644 --- a/include/mgf1.h +++ b/include/mgf1.h @@ -1,6 +1,6 @@ /************************************************* * MGF1 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MGF1_H__ diff --git a/include/misty1.h b/include/misty1.h index 8bbf73d57..806aba256 100644 --- a/include/misty1.h +++ b/include/misty1.h @@ -1,6 +1,6 @@ /************************************************* * MISTY1 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MISTY1_H__ diff --git a/include/mode_pad.h b/include/mode_pad.h index e315acaa2..85452167b 100644 --- a/include/mode_pad.h +++ b/include/mode_pad.h @@ -1,6 +1,6 @@ /************************************************* * CBC Padding Methods Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_CBC_PADDING_H__ diff --git a/include/modebase.h b/include/modebase.h index 5d5de7e72..cac6aa644 100644 --- a/include/modebase.h +++ b/include/modebase.h @@ -1,6 +1,6 @@ /************************************************* * Block Cipher Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MODEBASE_H__ diff --git a/include/modules.h b/include/modules.h index 0ef6cb36c..76c1337ab 100644 --- a/include/modules.h +++ b/include/modules.h @@ -1,6 +1,6 @@ /************************************************* * Module Factory Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MODULE_FACTORIES_H__ diff --git a/include/mp_asm.h b/include/mp_asm.h index 64694492a..e62a57110 100644 --- a/include/mp_asm.h +++ b/include/mp_asm.h @@ -1,6 +1,7 @@ /************************************************* * Lowest Level MPI Algorithms Header File * -* (C) 1999-2008 The Botan Project * +* (C) 1999-2008 Jack Lloyd * +* 2006 Luca Piccarreta * *************************************************/ #ifndef BOTAN_MP_ASM_H__ diff --git a/include/mp_asmi.h b/include/mp_asmi.h index c2e539be8..d15295154 100644 --- a/include/mp_asmi.h +++ b/include/mp_asmi.h @@ -1,6 +1,7 @@ /************************************************* * Lowest Level MPI Algorithms Header File * -* (C) 1999-2008 The Botan Project * +* (C) 1999-2008 Jack Lloyd * +* 2006 Luca Piccarreta * *************************************************/ #ifndef BOTAN_MP_ASM_INTERNAL_H__ diff --git a/include/mp_core.h b/include/mp_core.h index 670251fb9..9df4a41e4 100644 --- a/include/mp_core.h +++ b/include/mp_core.h @@ -1,6 +1,6 @@ /************************************************* * MPI Algorithms Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MP_CORE_H__ diff --git a/include/mp_types.h b/include/mp_types.h index 8ba551bd8..81b6d7395 100644 --- a/include/mp_types.h +++ b/include/mp_types.h @@ -1,6 +1,6 @@ /************************************************* * Low Level MPI Types Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MPI_TYPES_H__ diff --git a/include/mutex.h b/include/mutex.h index 9f750e526..ecf22a417 100644 --- a/include/mutex.h +++ b/include/mutex.h @@ -1,6 +1,6 @@ /************************************************* * Mutex Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MUTEX_H__ diff --git a/include/nr.h b/include/nr.h index d2ae0f202..bdf664594 100644 --- a/include/nr.h +++ b/include/nr.h @@ -1,6 +1,6 @@ /************************************************* * Nyberg-Rueppel Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_NYBERG_RUEPPEL_H__ diff --git a/include/numthry.h b/include/numthry.h index abb423e52..1f3a1f9b4 100644 --- a/include/numthry.h +++ b/include/numthry.h @@ -1,6 +1,6 @@ /************************************************* * Number Theory Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_NUMBTHRY_H__ diff --git a/include/ofb.h b/include/ofb.h index 80f535c8b..e6769d0e9 100644 --- a/include/ofb.h +++ b/include/ofb.h @@ -1,6 +1,6 @@ /************************************************* * OFB Mode Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_OFB_H__ diff --git a/include/oids.h b/include/oids.h index 7991533fa..e836ceef1 100644 --- a/include/oids.h +++ b/include/oids.h @@ -1,6 +1,6 @@ /************************************************* * OID Registry Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_OIDS_H__ diff --git a/include/openpgp.h b/include/openpgp.h index 8276ce56d..1a1290f39 100644 --- a/include/openpgp.h +++ b/include/openpgp.h @@ -1,6 +1,6 @@ /************************************************* * OpenPGP Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_OPENPGP_H__ diff --git a/include/out_buf.h b/include/out_buf.h index 5145b08d2..8965e3895 100644 --- a/include/out_buf.h +++ b/include/out_buf.h @@ -1,6 +1,6 @@ /************************************************* * Output Buffer Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_OUTPUT_BUFFER_H__ diff --git a/include/par_hash.h b/include/par_hash.h index 6862d66b9..dec785ea9 100644 --- a/include/par_hash.h +++ b/include/par_hash.h @@ -1,6 +1,6 @@ /************************************************* * Parallel Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PAR_HASH_H__ diff --git a/include/parsing.h b/include/parsing.h index dcfde9568..93eb8c279 100644 --- a/include/parsing.h +++ b/include/parsing.h @@ -1,6 +1,6 @@ /************************************************* * Parser Functions Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PARSER_H__ diff --git a/include/pbe.h b/include/pbe.h index c1fc2124f..2f39d6f15 100644 --- a/include/pbe.h +++ b/include/pbe.h @@ -1,6 +1,6 @@ /************************************************* * PBE Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PBE_H__ diff --git a/include/pbe_pkcs.h b/include/pbe_pkcs.h index 45559310a..694a649e7 100644 --- a/include/pbe_pkcs.h +++ b/include/pbe_pkcs.h @@ -1,6 +1,6 @@ /************************************************* * PKCS PBE Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PBE_PKCS_H__ diff --git a/include/pem.h b/include/pem.h index a8f58dd73..1d873d238 100644 --- a/include/pem.h +++ b/include/pem.h @@ -1,6 +1,6 @@ /************************************************* * PEM Encoding/Decoding Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PEM_H__ @@ -15,12 +15,12 @@ namespace PEM_Code { /************************************************* * PEM Encoding/Decoding * *************************************************/ -std::string encode(const byte[], u32bit, const std::string&); -std::string encode(const MemoryRegion<byte>&, const std::string&); +std::string encode(const byte[], u32bit, const std::string&, u32bit = 64); +std::string encode(const MemoryRegion<byte>&, const std::string&, u32bit = 64); SecureVector<byte> decode(DataSource&, std::string&); SecureVector<byte> decode_check_label(DataSource&, const std::string&); -bool matches(DataSource&, const std::string& = ""); +bool matches(DataSource&, const std::string& = "", u32bit search_range = 4096); } diff --git a/include/pgp_s2k.h b/include/pgp_s2k.h index 86a8bf1bb..fdcb6751b 100644 --- a/include/pgp_s2k.h +++ b/include/pgp_s2k.h @@ -1,6 +1,6 @@ /************************************************* * OpenPGP S2K Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_OPENPGP_S2K_H__ diff --git a/include/pipe.h b/include/pipe.h index 9bf05b76a..20fdc6a41 100644 --- a/include/pipe.h +++ b/include/pipe.h @@ -1,6 +1,6 @@ /************************************************* * Pipe Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PIPE_H__ diff --git a/include/pk_algs.h b/include/pk_algs.h index 479c50a10..89bdfa582 100644 --- a/include/pk_algs.h +++ b/include/pk_algs.h @@ -1,6 +1,6 @@ /************************************************* * PK Key Factory Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PK_KEY_FACTORY_H__ diff --git a/include/pk_core.h b/include/pk_core.h index f32d4a922..71beb3e7d 100644 --- a/include/pk_core.h +++ b/include/pk_core.h @@ -1,6 +1,6 @@ /************************************************* * PK Algorithm Core Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PK_CORE_H__ diff --git a/include/pk_filts.h b/include/pk_filts.h index 2e285e81e..cfb130dba 100644 --- a/include/pk_filts.h +++ b/include/pk_filts.h @@ -1,6 +1,6 @@ /************************************************* * PK Filters Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PK_FILTERS_H__ diff --git a/include/pk_keys.h b/include/pk_keys.h index 641d95a77..89173e739 100644 --- a/include/pk_keys.h +++ b/include/pk_keys.h @@ -1,6 +1,6 @@ /************************************************* * PK Key Types Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PK_KEYS_H__ diff --git a/include/pk_ops.h b/include/pk_ops.h index 05c2ec949..ef91ebf04 100644 --- a/include/pk_ops.h +++ b/include/pk_ops.h @@ -1,6 +1,6 @@ /************************************************* * Public Key Operations Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PK_OPS_H__ diff --git a/include/pk_util.h b/include/pk_util.h index a84d18291..3269779d3 100644 --- a/include/pk_util.h +++ b/include/pk_util.h @@ -1,6 +1,6 @@ /************************************************* * PK Utility Classes Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PUBKEY_UTIL_H__ diff --git a/include/pkcs10.h b/include/pkcs10.h index a83e65064..ac9ff4fee 100644 --- a/include/pkcs10.h +++ b/include/pkcs10.h @@ -1,6 +1,6 @@ /************************************************* * PKCS #10 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PKCS10_H__ diff --git a/include/pkcs5.h b/include/pkcs5.h index 8683d0009..e57f33149 100644 --- a/include/pkcs5.h +++ b/include/pkcs5.h @@ -1,6 +1,6 @@ /************************************************* * PKCS #5 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PKCS5_H__ diff --git a/include/pkcs8.h b/include/pkcs8.h index 5356418bc..871178412 100644 --- a/include/pkcs8.h +++ b/include/pkcs8.h @@ -1,6 +1,6 @@ /************************************************* * PKCS #8 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PKCS8_H__ diff --git a/include/pow_mod.h b/include/pow_mod.h index fbecd3f22..269a31116 100644 --- a/include/pow_mod.h +++ b/include/pow_mod.h @@ -1,6 +1,6 @@ /************************************************* * Modular Exponentiator Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_POWER_MOD_H__ diff --git a/include/pubkey.h b/include/pubkey.h index ee88d8a80..8d4764bce 100644 --- a/include/pubkey.h +++ b/include/pubkey.h @@ -1,6 +1,6 @@ /************************************************* * Public Key Interface Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_PUBKEY_H__ diff --git a/include/randpool.h b/include/randpool.h index 9531cac9a..30a96386a 100644 --- a/include/randpool.h +++ b/include/randpool.h @@ -1,6 +1,6 @@ /************************************************* * Randpool Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RANDPOOL_H__ diff --git a/include/rc2.h b/include/rc2.h index e83b44eb2..9701e0451 100644 --- a/include/rc2.h +++ b/include/rc2.h @@ -1,6 +1,6 @@ /************************************************* * RC2 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RC2_H__ diff --git a/include/rc5.h b/include/rc5.h index c5a42f7bf..066aa9356 100644 --- a/include/rc5.h +++ b/include/rc5.h @@ -1,6 +1,6 @@ /************************************************* * RC5 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RC5_H__ diff --git a/include/rc6.h b/include/rc6.h index a7b34db5a..34997c065 100644 --- a/include/rc6.h +++ b/include/rc6.h @@ -1,6 +1,6 @@ /************************************************* * RC6 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RC6_H__ diff --git a/include/reducer.h b/include/reducer.h index 44c3619b9..95160b477 100644 --- a/include/reducer.h +++ b/include/reducer.h @@ -1,6 +1,6 @@ /************************************************* * Modular Reducer Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_MODARITH_H__ diff --git a/include/rmd128.h b/include/rmd128.h index d0ef8464b..ba82de51d 100644 --- a/include/rmd128.h +++ b/include/rmd128.h @@ -1,6 +1,6 @@ /************************************************* * RIPEMD-128 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RIPEMD_128_H__ diff --git a/include/rmd160.h b/include/rmd160.h index 3ca7f5f90..59861ddd5 100644 --- a/include/rmd160.h +++ b/include/rmd160.h @@ -1,6 +1,6 @@ /************************************************* * RIPEMD-160 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RIPEMD_160_H__ diff --git a/include/rsa.h b/include/rsa.h index 0fdce6f2d..f3f0e2e5e 100644 --- a/include/rsa.h +++ b/include/rsa.h @@ -1,6 +1,6 @@ /************************************************* * RSA Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RSA_H__ diff --git a/include/rw.h b/include/rw.h index aa55a6978..843334cb3 100644 --- a/include/rw.h +++ b/include/rw.h @@ -1,6 +1,6 @@ /************************************************* * Rabin-Williams Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_RW_H__ diff --git a/include/s2k.h b/include/s2k.h index b2892760c..39789ad2a 100644 --- a/include/s2k.h +++ b/include/s2k.h @@ -1,6 +1,6 @@ /************************************************* * S2K Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_S2K_H__ diff --git a/include/safer_sk.h b/include/safer_sk.h index 84dcb1ec9..a7d9017ee 100644 --- a/include/safer_sk.h +++ b/include/safer_sk.h @@ -1,6 +1,6 @@ /************************************************* * SAFER-SK Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SAFER_SK_H__ diff --git a/include/secmem.h b/include/secmem.h index b50022c83..8ecfa5612 100644 --- a/include/secmem.h +++ b/include/secmem.h @@ -1,6 +1,6 @@ /************************************************* * Secure Memory Buffers Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SECURE_MEMORY_BUFFERS_H__ diff --git a/include/secqueue.h b/include/secqueue.h index 97cc8f933..b688196ae 100644 --- a/include/secqueue.h +++ b/include/secqueue.h @@ -1,6 +1,6 @@ /************************************************* * SecureQueue Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SECURE_QUEUE_H__ diff --git a/include/seed.h b/include/seed.h index 0428c28f5..ed347b82a 100644 --- a/include/seed.h +++ b/include/seed.h @@ -1,6 +1,6 @@ /************************************************* * SEED Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SEED_H__ diff --git a/include/serpent.h b/include/serpent.h index 0a8ab781a..57cdd027e 100644 --- a/include/serpent.h +++ b/include/serpent.h @@ -1,6 +1,6 @@ /************************************************* * Serpent Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SERPENT_H__ diff --git a/include/sha160.h b/include/sha160.h index 30d27d9c7..f493fbcc5 100644 --- a/include/sha160.h +++ b/include/sha160.h @@ -1,6 +1,6 @@ /************************************************* * SHA-160 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SHA_160_H__ diff --git a/include/sha256.h b/include/sha256.h index d9901da5d..912eb3dfe 100644 --- a/include/sha256.h +++ b/include/sha256.h @@ -1,6 +1,6 @@ /************************************************* * SHA-256 Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SHA_256_H__ diff --git a/include/sha_64.h b/include/sha_64.h index 4d77acb32..6535fa6c3 100644 --- a/include/sha_64.h +++ b/include/sha_64.h @@ -1,6 +1,6 @@ /************************************************* * SHA-{384,512} Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SHA_64BIT_H__ diff --git a/include/skipjack.h b/include/skipjack.h index e8e61b408..602eabdc3 100644 --- a/include/skipjack.h +++ b/include/skipjack.h @@ -1,6 +1,6 @@ /************************************************* * Skipjack Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SKIPJACK_H__ diff --git a/include/square.h b/include/square.h index 702fabad5..863ed8864 100644 --- a/include/square.h +++ b/include/square.h @@ -1,6 +1,6 @@ /************************************************* * Square Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SQUARE_H__ diff --git a/include/stl_util.h b/include/stl_util.h index 99982745f..95a19581f 100644 --- a/include/stl_util.h +++ b/include/stl_util.h @@ -1,6 +1,6 @@ /************************************************* * STL Utility Functions Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_STL_UTIL_H__ diff --git a/include/symkey.h b/include/symkey.h index ffd89bd85..c199f0cb1 100644 --- a/include/symkey.h +++ b/include/symkey.h @@ -1,6 +1,6 @@ /************************************************* * OctetString Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_SYMKEY_H__ diff --git a/include/tea.h b/include/tea.h index 77ef3eea8..3be8168ab 100644 --- a/include/tea.h +++ b/include/tea.h @@ -1,6 +1,6 @@ /************************************************* * TEA Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_TEA_H__ diff --git a/include/tiger.h b/include/tiger.h index dc99cf8d8..4355886ae 100644 --- a/include/tiger.h +++ b/include/tiger.h @@ -1,6 +1,6 @@ /************************************************* * Tiger Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_TIGER_H__ diff --git a/include/timers.h b/include/timers.h index 676d7bbd2..abceda449 100644 --- a/include/timers.h +++ b/include/timers.h @@ -1,6 +1,6 @@ /************************************************* * Timestamp Functions Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_TIMERS_H__ diff --git a/include/turing.h b/include/turing.h index bc7f91e2f..1f31eea2d 100644 --- a/include/turing.h +++ b/include/turing.h @@ -1,6 +1,6 @@ /************************************************* * Turing Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_TURING_H__ diff --git a/include/twofish.h b/include/twofish.h index 08d357d21..1b2f545b1 100644 --- a/include/twofish.h +++ b/include/twofish.h @@ -1,6 +1,6 @@ /************************************************* * Twofish Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_TWOFISH_H__ diff --git a/include/types.h b/include/types.h index e9994941a..e3d93c157 100644 --- a/include/types.h +++ b/include/types.h @@ -1,6 +1,6 @@ /************************************************* * Low Level Types Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_TYPES_H__ diff --git a/include/ui.h b/include/ui.h index 525529075..09a6dd396 100644 --- a/include/ui.h +++ b/include/ui.h @@ -1,6 +1,6 @@ /************************************************* * User Interface Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_UI_H__ diff --git a/include/util.h b/include/util.h index 8cede5de9..022026bc4 100644 --- a/include/util.h +++ b/include/util.h @@ -1,6 +1,6 @@ /************************************************* * Utility Functions Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_UTIL_H__ diff --git a/include/version.h b/include/version.h index 88cb16966..1e36a6984 100644 --- a/include/version.h +++ b/include/version.h @@ -1,6 +1,6 @@ /************************************************* * Version Information Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_VERSION_H__ diff --git a/include/whrlpool.h b/include/whrlpool.h index cc45f3293..c7c40f4cc 100644 --- a/include/whrlpool.h +++ b/include/whrlpool.h @@ -1,6 +1,6 @@ /************************************************* * Whirlpool Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_WHIRLPOOL_H__ diff --git a/include/wid_wake.h b/include/wid_wake.h index 8355566d1..17f2d72f7 100644 --- a/include/wid_wake.h +++ b/include/wid_wake.h @@ -1,6 +1,6 @@ /************************************************* * WiderWake Header File * -* (C) 1999-2008 The Botan Project * +* (C) 1999-2008 Jack Lloyd * *************************************************/ #ifndef BOTAN_WIDER_WAKE_H__ diff --git a/include/x509_ca.h b/include/x509_ca.h index 933324960..3c2610d7f 100644 --- a/include/x509_ca.h +++ b/include/x509_ca.h @@ -1,6 +1,6 @@ /************************************************* * X.509 Certificate Authority Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2008 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_CA_H__ @@ -21,7 +21,9 @@ namespace Botan { class X509_CA { public: - X509_Certificate sign_request(const PKCS10_Request&, u32bit = 0) const; + X509_Certificate sign_request(const PKCS10_Request& req, + const X509_Time& not_before, + const X509_Time& not_after); X509_Certificate ca_certificate() const; diff --git a/include/x509_crl.h b/include/x509_crl.h index 7960c4cb9..2b1f6d14d 100644 --- a/include/x509_crl.h +++ b/include/x509_crl.h @@ -1,6 +1,6 @@ /************************************************* * X.509 CRL Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_CRL_H__ diff --git a/include/x509_ext.h b/include/x509_ext.h index 63052f3c1..b715de2e9 100644 --- a/include/x509_ext.h +++ b/include/x509_ext.h @@ -1,6 +1,6 @@ /************************************************* * X.509 Certificate Extensions Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_EXTENSIONS_H__ diff --git a/include/x509_key.h b/include/x509_key.h index 555ef1549..a07268e53 100644 --- a/include/x509_key.h +++ b/include/x509_key.h @@ -1,6 +1,6 @@ /************************************************* * X.509 Public Key Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_PUBLIC_KEY_H__ diff --git a/include/x509_obj.h b/include/x509_obj.h index d72ef71a4..6e5eb6d17 100644 --- a/include/x509_obj.h +++ b/include/x509_obj.h @@ -1,6 +1,6 @@ /************************************************* * X.509 SIGNED Object Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_OBJECT_H__ diff --git a/include/x509cert.h b/include/x509cert.h index 3d3ad54fb..c94b46b14 100644 --- a/include/x509cert.h +++ b/include/x509cert.h @@ -1,6 +1,6 @@ /************************************************* * X.509 Certificates Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_CERTS_H__ diff --git a/include/x509find.h b/include/x509find.h index e27d4b94c..eea4315c6 100644 --- a/include/x509find.h +++ b/include/x509find.h @@ -1,6 +1,6 @@ /************************************************* * X.509 Certificate Store Searching Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_CERT_STORE_SEARCH_H__ diff --git a/include/x509self.h b/include/x509self.h index eb9628a0b..4ad7f8f5c 100644 --- a/include/x509self.h +++ b/include/x509self.h @@ -1,6 +1,6 @@ /************************************************* * X.509 Self-Signed Certificate Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_SELF_H__ @@ -47,7 +47,8 @@ class X509_Cert_Options void add_ex_constraint(const OID&); void add_ex_constraint(const std::string&); - X509_Cert_Options(const std::string& = ""); + X509_Cert_Options(const std::string& = "", + u32bit expire = 365 * 24 * 60 * 60); }; namespace X509 { diff --git a/include/x509stor.h b/include/x509stor.h index 9a6e10502..e12400a9e 100644 --- a/include/x509stor.h +++ b/include/x509stor.h @@ -1,6 +1,6 @@ /************************************************* * X.509 Certificate Store Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_X509_CERT_STORE_H__ diff --git a/include/x919_mac.h b/include/x919_mac.h index 03e91bf4b..d8cca9315 100644 --- a/include/x919_mac.h +++ b/include/x919_mac.h @@ -1,6 +1,6 @@ /************************************************* * ANSI X9.19 MAC Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ANSI_X919_MAC_H__ diff --git a/include/x931_rng.h b/include/x931_rng.h index a76204a05..771ab64c6 100644 --- a/include/x931_rng.h +++ b/include/x931_rng.h @@ -1,6 +1,6 @@ /************************************************* * ANSI X9.31 RNG Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_ANSI_X931_RNG_H__ diff --git a/include/xtea.h b/include/xtea.h index a85e394c2..fb25161b8 100644 --- a/include/xtea.h +++ b/include/xtea.h @@ -1,6 +1,6 @@ /************************************************* * XTEA Header File * -* (C) 1999-2007 The Botan Project * +* (C) 1999-2007 Jack Lloyd * *************************************************/ #ifndef BOTAN_XTEA_H__ |