aboutsummaryrefslogtreecommitdiffstats
path: root/src/rng
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-12-16 00:32:49 +0000
committerlloyd <[email protected]>2009-12-16 00:32:49 +0000
commit87cbaef441c6baba2699a8ea53ac2562c46c772d (patch)
treea61455bcb4de0e0eab34953f7a53a84b512f34d3 /src/rng
parent076afc21c2b775d2658f33086b890255f6f2c70f (diff)
Full working amalgamation build, plus internal-only headers concept.
Diffstat (limited to 'src/rng')
-rw-r--r--src/rng/auto_rng/auto_rng.cpp20
-rw-r--r--src/rng/auto_rng/info.txt7
-rw-r--r--src/rng/hmac_rng/info.txt7
-rw-r--r--src/rng/info.txt7
-rw-r--r--src/rng/randpool/info.txt7
-rw-r--r--src/rng/x931_rng/info.txt7
6 files changed, 10 insertions, 45 deletions
diff --git a/src/rng/auto_rng/auto_rng.cpp b/src/rng/auto_rng/auto_rng.cpp
index 6906d9d17..5befc9d14 100644
--- a/src/rng/auto_rng/auto_rng.cpp
+++ b/src/rng/auto_rng/auto_rng.cpp
@@ -28,35 +28,35 @@
#endif
#if defined(BOTAN_HAS_ENTROPY_SRC_HIGH_RESOLUTION_TIMER)
- #include <botan/hres_timer.h>
+ #include <botan/internal/hres_timer.h>
#endif
-#if defined(BOTAN_HAS_ENTROPY_SRC_DEVICE)
- #include <botan/es_dev.h>
+#if defined(BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM)
+ #include <botan/internal/dev_random.h>
#endif
#if defined(BOTAN_HAS_ENTROPY_SRC_EGD)
- #include <botan/es_egd.h>
+ #include <botan/internal/es_egd.h>
#endif
#if defined(BOTAN_HAS_ENTROPY_SRC_UNIX)
- #include <botan/es_unix.h>
+ #include <botan/internal/es_unix.h>
#endif
#if defined(BOTAN_HAS_ENTROPY_SRC_BEOS)
- #include <botan/es_beos.h>
+ #include <botan/internal/es_beos.h>
#endif
#if defined(BOTAN_HAS_ENTROPY_SRC_CAPI)
- #include <botan/es_capi.h>
+ #include <botan/internal/es_capi.h>
#endif
#if defined(BOTAN_HAS_ENTROPY_SRC_WIN32)
- #include <botan/es_win32.h>
+ #include <botan/internal/es_win32.h>
#endif
#if defined(BOTAN_HAS_ENTROPY_SRC_FTW)
- #include <botan/es_ftw.h>
+ #include <botan/internal/es_ftw.h>
#endif
namespace Botan {
@@ -72,7 +72,7 @@ void add_entropy_sources(RandomNumberGenerator* rng)
rng->add_entropy_source(new High_Resolution_Timestamp);
#endif
-#if defined(BOTAN_HAS_ENTROPY_SRC_DEVICE)
+#if defined(BOTAN_HAS_ENTROPY_SRC_DEV_RANDOM)
rng->add_entropy_source(
new Device_EntropySource(
split_on("/dev/urandom:/dev/random:/dev/srandom", ':')
diff --git a/src/rng/auto_rng/info.txt b/src/rng/auto_rng/info.txt
index 357dc17ad..0f7cee282 100644
--- a/src/rng/auto_rng/info.txt
+++ b/src/rng/auto_rng/info.txt
@@ -1,12 +1,5 @@
define AUTO_SEEDING_RNG
-load_on auto
-
-<add>
-auto_rng.h
-auto_rng.cpp
-</add>
-
<requires>
hmac
sha2
diff --git a/src/rng/hmac_rng/info.txt b/src/rng/hmac_rng/info.txt
index f6135ee5a..5facd4aae 100644
--- a/src/rng/hmac_rng/info.txt
+++ b/src/rng/hmac_rng/info.txt
@@ -1,12 +1,5 @@
define HMAC_RNG
-load_on auto
-
-<add>
-hmac_rng.cpp
-hmac_rng.h
-</add>
-
<requires>
mac
</requires>
diff --git a/src/rng/info.txt b/src/rng/info.txt
index eea122cf9..4c88ba382 100644
--- a/src/rng/info.txt
+++ b/src/rng/info.txt
@@ -1,10 +1,3 @@
-load_on auto
-
-<add>
-rng.cpp
-rng.h
-</add>
-
<requires>
entropy
</requires>
diff --git a/src/rng/randpool/info.txt b/src/rng/randpool/info.txt
index cab276e15..cc54e5d06 100644
--- a/src/rng/randpool/info.txt
+++ b/src/rng/randpool/info.txt
@@ -1,12 +1,5 @@
define RANDPOOL
-load_on auto
-
-<add>
-randpool.cpp
-randpool.h
-</add>
-
<requires>
block
mac
diff --git a/src/rng/x931_rng/info.txt b/src/rng/x931_rng/info.txt
index 35836b33b..d5ec68013 100644
--- a/src/rng/x931_rng/info.txt
+++ b/src/rng/x931_rng/info.txt
@@ -1,12 +1,5 @@
define X931_RNG
-load_on auto
-
-<add>
-x931_rng.cpp
-x931_rng.h
-</add>
-
<requires>
block
</requires>