Make poly_dbl.h a submodule of utils

Only required by a few modules and if none of them are in use
then the whole thing can just be skipped from the build.

9 files changed, 28 insertions, 2 deletions

diff --git a/src/lib/mac/cmac/info.txt b/src/lib/mac/cmac/info.txt
index 01bdf7884..bdddca1b2 100644
--- a/src/lib/mac/cmac/info.txt
+++ b/src/lib/mac/cmac/info.txt
@@ -1,3 +1,7 @@
 <defines>
 CMAC -> 20131128
 </defines>
+
+<requires>
+poly_dbl
+</requires>
diff --git a/src/lib/modes/aead/ocb/info.txt b/src/lib/modes/aead/ocb/info.txt
index ab4c5297e..9af91f238 100644
--- a/src/lib/modes/aead/ocb/info.txt
+++ b/src/lib/modes/aead/ocb/info.txt
@@ -1,3 +1,7 @@
 <defines>
 AEAD_OCB -> 20131128
 </defines>
+
+<requires>
+poly_dbl
+</requires>
diff --git a/src/lib/modes/aead/siv/info.txt b/src/lib/modes/aead/siv/info.txt
index d25798ac9..4a8d3a846 100644
--- a/src/lib/modes/aead/siv/info.txt
+++ b/src/lib/modes/aead/siv/info.txt
@@ -7,4 +7,5 @@ load_on auto
 <requires>
 cmac
 ctr
+poly_dbl
 </requires>
diff --git a/src/lib/modes/xts/info.txt b/src/lib/modes/xts/info.txt
index 04cd046c7..2a41f696f 100644
--- a/src/lib/modes/xts/info.txt
+++ b/src/lib/modes/xts/info.txt
@@ -1,3 +1,7 @@
 <defines>
 MODE_XTS -> 20131128
 </defines>
+
+<requires>
+poly_dbl
+</requires>
diff --git a/src/lib/utils/info.txt b/src/lib/utils/info.txt
index 644bff901..5a0ce469c 100644
--- a/src/lib/utils/info.txt
+++ b/src/lib/utils/info.txt
@@ -31,7 +31,6 @@ ct_utils.h
 donna128.h
 filesystem.h
 os_utils.h
-poly_dbl.h
 prefetch.h
 rounding.h
 safeint.h
diff --git a/src/lib/utils/poly_dbl/info.txt b/src/lib/utils/poly_dbl/info.txt
new file mode 100644
index 000000000..5aae5b44f
--- /dev/null
+++ b/src/lib/utils/poly_dbl/info.txt
@@ -0,0 +1,7 @@
+<defines>
+POLY_DBL -> 20170927
+</defines>
+
+<header:internal>
+poly_dbl.h
+</header:internal>
diff --git a/src/lib/utils/poly_dbl.cpp b/src/lib/utils/poly_dbl/poly_dbl.cpp
index 2b989db57..2b989db57 100644
--- a/src/lib/utils/poly_dbl.cpp
+++ b/src/lib/utils/poly_dbl/poly_dbl.cpp
diff --git a/src/lib/utils/poly_dbl.h b/src/lib/utils/poly_dbl/poly_dbl.h
index 10c85c567..10c85c567 100644
--- a/src/lib/utils/poly_dbl.h
+++ b/src/lib/utils/poly_dbl/poly_dbl.h
diff --git a/src/tests/test_utils.cpp b/src/tests/test_utils.cpp
index b44faac39..8d46d4a26 100644
--- a/src/tests/test_utils.cpp
+++ b/src/tests/test_utils.cpp
@@ -12,7 +12,6 @@
 #include <botan/loadstor.h>
 #include <botan/calendar.h>
 #include <botan/internal/rounding.h>
-#include <botan/internal/poly_dbl.h>
 #include <botan/internal/ct_utils.h>
 #include <botan/charset.h>
 #include <botan/parsing.h>
@@ -21,6 +20,10 @@
    #include <botan/base64.h>
 #endif
 
+#if defined(BOTAN_HAS_POLY_DBL)
+   #include <botan/internal/poly_dbl.h>
+#endif
+
 namespace Botan_Tests {
 
 namespace {
@@ -213,6 +216,8 @@ class Utility_Function_Tests final : public Text_Based_Test
 
 BOTAN_REGISTER_TEST("util", Utility_Function_Tests);
 
+#if defined(BOTAN_HAS_POLY_DBL)
+
 class Poly_Double_Tests final : public Text_Based_Test
    {
    public:
@@ -234,6 +239,8 @@ class Poly_Double_Tests final : public Text_Based_Test
 
 BOTAN_REGISTER_TEST("poly_dbl", Poly_Double_Tests);
 
+#endif
+
 class Date_Format_Tests final : public Text_Based_Test
    {
    public: