diff options
author | Jack Lloyd <[email protected]> | 2016-12-08 20:58:51 -0500 |
---|---|---|
committer | Jack Lloyd <[email protected]> | 2016-12-08 20:58:51 -0500 |
commit | 00f297e0cf715b9c55deded933a70e811509f41a (patch) | |
tree | 2deefa1ccb079f2c605f3e929c07e3a5ab3204f1 | |
parent | 7f267b20ca60727eeca7c4531f297eb82fbc10ee (diff) |
Remove <source> block from info.txt files
Kind of a vestigial thing from an earlier iteration of the module
design, and never useful to specify anymore since taking all the cpp
files is what you want exactly 100% of the time.
-rwxr-xr-x | configure.py | 5 | ||||
-rw-r--r-- | src/lib/block/cascade/info.txt | 4 | ||||
-rw-r--r-- | src/lib/block/serpent/info.txt | 4 | ||||
-rw-r--r-- | src/lib/entropy/cryptoapi_rng/info.txt | 4 | ||||
-rw-r--r-- | src/lib/entropy/darwin_secrandom/info.txt | 6 | ||||
-rw-r--r-- | src/lib/entropy/dev_random/info.txt | 4 | ||||
-rw-r--r-- | src/lib/entropy/proc_walk/info.txt | 4 | ||||
-rw-r--r-- | src/lib/entropy/rdrand/info.txt | 4 | ||||
-rw-r--r-- | src/lib/entropy/rdseed/info.txt | 4 | ||||
-rw-r--r-- | src/lib/entropy/win32_stats/info.txt | 4 | ||||
-rw-r--r-- | src/lib/filters/info.txt | 17 | ||||
-rw-r--r-- | src/lib/math/bigint/info.txt | 10 | ||||
-rw-r--r-- | src/lib/math/mp/info.txt | 7 | ||||
-rw-r--r-- | src/lib/prov/pkcs11/info.txt | 15 | ||||
-rw-r--r-- | src/lib/pubkey/dh/info.txt | 4 | ||||
-rw-r--r-- | src/lib/pubkey/info.txt | 11 | ||||
-rw-r--r-- | src/lib/pubkey/xmss/info.txt | 18 |
17 files changed, 3 insertions, 122 deletions
diff --git a/configure.py b/configure.py index 263ae4dfa..e262c3bce 100755 --- a/configure.py +++ b/configure.py @@ -607,7 +607,7 @@ class ModuleInfo(object): def __init__(self, infofile): lex_me_harder(infofile, self, - ['source', 'header:internal', 'header:public', + ['header:internal', 'header:public', 'header:external', 'requires', 'os', 'arch', 'cc', 'libs', 'frameworks', 'comment', 'warning'], @@ -632,8 +632,7 @@ class ModuleInfo(object): else: self.need_isa = self.need_isa.split(',') - if self.source == []: - self.source = list(extract_files_matching(self.lives_in, ['.cpp'])) + self.source = list(extract_files_matching(self.lives_in, ['.cpp'])) if self.header_internal == [] and self.header_public == []: self.header_public = list(extract_files_matching(self.lives_in, ['.h'])) diff --git a/src/lib/block/cascade/info.txt b/src/lib/block/cascade/info.txt index 445e49086..14f618fd0 100644 --- a/src/lib/block/cascade/info.txt +++ b/src/lib/block/cascade/info.txt @@ -3,7 +3,3 @@ define CASCADE 20131128 <header:public> cascade.h </header:public> - -<source> -cascade.cpp -</source> diff --git a/src/lib/block/serpent/info.txt b/src/lib/block/serpent/info.txt index aa29c567f..6337ef6c0 100644 --- a/src/lib/block/serpent/info.txt +++ b/src/lib/block/serpent/info.txt @@ -7,7 +7,3 @@ serpent.h <header:internal> serpent_sbox.h </header:internal> - -<source> -serpent.cpp -</source> diff --git a/src/lib/entropy/cryptoapi_rng/info.txt b/src/lib/entropy/cryptoapi_rng/info.txt index 8aa166692..846a11371 100644 --- a/src/lib/entropy/cryptoapi_rng/info.txt +++ b/src/lib/entropy/cryptoapi_rng/info.txt @@ -1,9 +1,5 @@ define ENTROPY_SRC_CAPI 20131128 -<source> -es_capi.cpp -</source> - <header:internal> es_capi.h </header:internal> diff --git a/src/lib/entropy/darwin_secrandom/info.txt b/src/lib/entropy/darwin_secrandom/info.txt index e12c341fd..2460d8f86 100644 --- a/src/lib/entropy/darwin_secrandom/info.txt +++ b/src/lib/entropy/darwin_secrandom/info.txt @@ -1,9 +1,5 @@ define ENTROPY_SRC_DARWIN_SECRANDOM 20150925 -<source> -darwin_secrandom.cpp -</source> - <header:internal> darwin_secrandom.h </header:internal> @@ -14,4 +10,4 @@ darwin <frameworks> darwin -> Security -</frameworks>
\ No newline at end of file +</frameworks> diff --git a/src/lib/entropy/dev_random/info.txt b/src/lib/entropy/dev_random/info.txt index d8b7df134..56162f84e 100644 --- a/src/lib/entropy/dev_random/info.txt +++ b/src/lib/entropy/dev_random/info.txt @@ -1,9 +1,5 @@ define ENTROPY_SRC_DEV_RANDOM 20131128 -<source> -dev_random.cpp -</source> - <header:internal> dev_random.h </header:internal> diff --git a/src/lib/entropy/proc_walk/info.txt b/src/lib/entropy/proc_walk/info.txt index 8c3947dc6..46912eb5a 100644 --- a/src/lib/entropy/proc_walk/info.txt +++ b/src/lib/entropy/proc_walk/info.txt @@ -1,9 +1,5 @@ define ENTROPY_SRC_PROC_WALKER 20131128 -<source> -proc_walk.cpp -</source> - <header:internal> proc_walk.h </header:internal> diff --git a/src/lib/entropy/rdrand/info.txt b/src/lib/entropy/rdrand/info.txt index ebc7fb747..01ef2bc05 100644 --- a/src/lib/entropy/rdrand/info.txt +++ b/src/lib/entropy/rdrand/info.txt @@ -4,10 +4,6 @@ define ENTROPY_SRC_RDRAND 20131128 rdrand_rng </requires> -<source> -rdrand.cpp -</source> - <header:internal> rdrand.h </header:internal> diff --git a/src/lib/entropy/rdseed/info.txt b/src/lib/entropy/rdseed/info.txt index 53aa496b0..10e797322 100644 --- a/src/lib/entropy/rdseed/info.txt +++ b/src/lib/entropy/rdseed/info.txt @@ -2,10 +2,6 @@ define ENTROPY_SRC_RDSEED 20151218 need_isa rdseed -<source> -rdseed.cpp -</source> - <header:internal> rdseed.h </header:internal> diff --git a/src/lib/entropy/win32_stats/info.txt b/src/lib/entropy/win32_stats/info.txt index 48eb91faa..1787c9138 100644 --- a/src/lib/entropy/win32_stats/info.txt +++ b/src/lib/entropy/win32_stats/info.txt @@ -1,9 +1,5 @@ define ENTROPY_SRC_WIN32 20131128 -<source> -es_win32.cpp -</source> - <header:internal> es_win32.h </header:internal> diff --git a/src/lib/filters/info.txt b/src/lib/filters/info.txt index 620c1e6cc..0e51d0f8a 100644 --- a/src/lib/filters/info.txt +++ b/src/lib/filters/info.txt @@ -1,22 +1,5 @@ define FILTERS 20160415 -<source> -algo_filt.cpp -basefilt.cpp -buf_filt.cpp -comp_filter.cpp -data_snk.cpp -filter.cpp -key_filt.cpp -out_buf.cpp -pipe.cpp -pipe_io.cpp -pipe_rw.cpp -secqueue.cpp -threaded_fork.cpp -cipher_filter.cpp -</source> - <header:public> basefilt.h buf_filt.h diff --git a/src/lib/math/bigint/info.txt b/src/lib/math/bigint/info.txt index 53edcb1f1..c91c85e9f 100644 --- a/src/lib/math/bigint/info.txt +++ b/src/lib/math/bigint/info.txt @@ -7,16 +7,6 @@ bigint.h divide.h </header:public> -<source> -big_code.cpp -big_io.cpp -big_ops2.cpp -big_ops3.cpp -big_rand.cpp -bigint.cpp -divide.cpp -</source> - <requires> mp hex diff --git a/src/lib/math/mp/info.txt b/src/lib/math/mp/info.txt index b5db12648..0b8b9c33b 100644 --- a/src/lib/math/mp/info.txt +++ b/src/lib/math/mp/info.txt @@ -1,12 +1,5 @@ define BIGINT_MP 20151225 -<source> -mp_core.cpp -mp_comba.cpp -mp_karat.cpp -mp_monty.cpp -</source> - <header:public> mp_types.h </header:public> diff --git a/src/lib/prov/pkcs11/info.txt b/src/lib/prov/pkcs11/info.txt index e5a471b25..a8146133c 100644 --- a/src/lib/prov/pkcs11/info.txt +++ b/src/lib/prov/pkcs11/info.txt @@ -31,18 +31,3 @@ p11_session.h p11_slot.h p11_x509.h </header:public> - -<source> -p11.cpp -p11_ecc_key.cpp -p11_ecdh.cpp -p11_ecdsa.cpp -p11_mechanism.cpp -p11_module.cpp -p11_object.cpp -p11_randomgenerator.cpp -p11_rsa.cpp -p11_session.cpp -p11_slot.cpp -p11_x509.cpp -</source> diff --git a/src/lib/pubkey/dh/info.txt b/src/lib/pubkey/dh/info.txt index 13ee41d5b..960872fe3 100644 --- a/src/lib/pubkey/dh/info.txt +++ b/src/lib/pubkey/dh/info.txt @@ -4,10 +4,6 @@ define DIFFIE_HELLMAN 20131128 dh.h </header:public> -<source> -dh.cpp -</source> - <requires> dl_algo dl_group diff --git a/src/lib/pubkey/info.txt b/src/lib/pubkey/info.txt index 88c29e2f6..d598e7b25 100644 --- a/src/lib/pubkey/info.txt +++ b/src/lib/pubkey/info.txt @@ -1,16 +1,5 @@ define PUBLIC_KEY_CRYPTO 20131128 -<source> -blinding.cpp -pk_algs.cpp -pk_keys.cpp -pk_ops.cpp -pkcs8.cpp -pubkey.cpp -workfactor.cpp -x509_key.cpp -</source> - <header:public> blinding.h pk_algs.h diff --git a/src/lib/pubkey/xmss/info.txt b/src/lib/pubkey/xmss/info.txt index 93fe4eef5..8a834ffeb 100644 --- a/src/lib/pubkey/xmss/info.txt +++ b/src/lib/pubkey/xmss/info.txt @@ -1,23 +1,5 @@ define XMSS 20161008 -<source> -xmss_common_ops.cpp -xmss_hash.cpp -xmss_index_registry.cpp -xmss_parameters.cpp -xmss_privatekey.cpp -xmss_publickey.cpp -xmss_signature.cpp -xmss_signature_operation.cpp -xmss_verification_operation.cpp -xmss_wots_common_ops.cpp -xmss_wots_parameters.cpp -xmss_wots_privatekey.cpp -xmss_wots_publickey.cpp -xmss_wots_signature_operation.cpp -xmss_wots_verification_operation.cpp -</source> - <header:public> atomic.h xmss.h |