aboutsummaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorlloyd <lloyd@randombit.net>2009-09-04 16:12:44 +0000
committerlloyd <lloyd@randombit.net>2009-09-04 16:12:44 +0000
commit57c85454d803121374306701049b7dc5ef4747eb (patch)
treed13bcd9c2dd141db07de3a19f2e5a20cb49a358d
parentf7595eeae651ff36709793989fd1688303915f5a (diff)
parentc184cd88ab53a8e2c343be0ab3a8517a964789e7 (diff)
propagate from branch 'net.randombit.botan.1_8' (head 75371777750b63ef94693602202c5104f217a987)
to branch 'net.randombit.botan' (head 3f53f01c349eeee89288b1922fbde45b283c958c)
-rwxr-xr-xconfigure.py20
-rw-r--r--doc/log.txt2
-rwxr-xr-xdoc/scripts/configure.pl1
-rw-r--r--src/libstate/info.txt2
-rw-r--r--src/libstate/pk_engine.h1
-rw-r--r--src/utils/info.txt2
6 files changed, 24 insertions, 4 deletions
diff --git a/configure.py b/configure.py
index 286e61979..800af6cf1 100755
--- a/configure.py
+++ b/configure.py
@@ -164,6 +164,8 @@ def process_command_line(args):
mods_group.add_option('--disable-modules', dest='disabled_modules',
metavar='MODS', action='append', default=[],
help='disable specific modules')
+ mods_group.add_option('--no-autoload', action='store_true', default=False,
+ help='disable automatic loading')
for mod in ['openssl', 'gnump', 'bzip2', 'zlib']:
@@ -799,10 +801,22 @@ def choose_modules_to_use(options, modules):
cannot_use_because(modname, 'loaded on request only')
elif module.load_on == 'dep':
maybe_dep.append(modname)
- elif module.load_on in ['auto', 'asm_ok']:
- if module.load_on == 'asm_ok' and not options.asm_ok:
+
+ elif module.load_on == 'always':
+ to_load.append(modname)
+
+ elif module.load_on == 'asm_ok':
+ if options.asm_ok:
+ if options.no_autoload:
+ maybe_dep.append(modname)
+ else:
+ to_load.append(modname)
+ else:
cannot_use_because(modname,
'uses assembly and --disable-asm set')
+ elif module.load_on == 'auto':
+ if options.no_autoload:
+ maybe_dep.append(modname)
else:
to_load.append(modname)
else:
@@ -847,6 +861,8 @@ def choose_modules_to_use(options, modules):
logging.info('Skipping mod because %s - %s' % (
reason, ' '.join(disabled_mods)))
+ logging.info('Loading modules %s', ' '.join(sorted(to_load)))
+
return [modules[mod] for mod in to_load]
"""
diff --git a/doc/log.txt b/doc/log.txt
index e1b7a13c1..345e91d71 100644
--- a/doc/log.txt
+++ b/doc/log.txt
@@ -6,6 +6,8 @@
- Minor speedups to the Turing key schedule
* 1.8.7-pre, 2009-??-??
+ - Fix processing multiple messages in XTS mode
+ - Add --no-autoload option to configure.py, for minimized builds
* 1.8.6, 2009-08-13
- Add Cryptobox, a set of simple password-based encryption routines
diff --git a/doc/scripts/configure.pl b/doc/scripts/configure.pl
index 592eb2bff..6cf43e5e6 100755
--- a/doc/scripts/configure.pl
+++ b/doc/scripts/configure.pl
@@ -520,6 +520,7 @@ sub scan_modules {
next unless(module_runs_on($config, \%modinfo, $mod, 0));
if($modinfo{'load_on'} eq 'auto' or
+ $modinfo{'load_on'} eq 'always' or
($modinfo{'load_on'} eq 'asm_ok' and $$config{'asm_ok'})) {
my %maybe_load = ();
diff --git a/src/libstate/info.txt b/src/libstate/info.txt
index 7ca35c5a4..6eaa2f70b 100644
--- a/src/libstate/info.txt
+++ b/src/libstate/info.txt
@@ -1,6 +1,6 @@
realname "Botan Libstate Module"
-load_on auto
+load_on always
define LIBSTATE_MODULE
diff --git a/src/libstate/pk_engine.h b/src/libstate/pk_engine.h
index 3f8650a4e..256a47c20 100644
--- a/src/libstate/pk_engine.h
+++ b/src/libstate/pk_engine.h
@@ -9,6 +9,7 @@
#define BOTAN_ENGINE_PK_LOOKUP_H__
#include <botan/bigint.h>
+#include <botan/pow_mod.h>
#if defined(BOTAN_HAS_IF_PUBLIC_KEY_FAMILY)
#include <botan/if_op.h>
diff --git a/src/utils/info.txt b/src/utils/info.txt
index 95ea5fc2e..ab50b88ad 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -2,7 +2,7 @@ realname "Utility Functions"
define UTIL_FUNCTIONS
-load_on auto
+load_on always
<libs>
tru64 -> rt