Split up util.h into 3 files

 - rounding.h (round_up, round_down)
 - workfactor.h (dl_work_factor)
 - timer.h (system_time)
And update all users of the previous util.h

3 files changed, 4 insertions, 65 deletions

diff --git a/src/utils/info.txt b/src/utils/info.txt
index bf9778369..68981729f 100644
--- a/src/utils/info.txt
+++ b/src/utils/info.txt
@@ -22,12 +22,11 @@ mlock.cpp
 parsing.cpp
 parsing.h
 rotate.h
+rounding.h
 stl_util.h
 types.h
 ui.cpp
 ui.h
-util.cpp
-util.h
 version.cpp
 version.h
 xor_buf.h
diff --git a/src/utils/util.h b/src/utils/rounding.h
index e3dadc64b..11ab90b8d 100644
--- a/src/utils/util.h
+++ b/src/utils/rounding.h
@@ -1,23 +1,18 @@
 /*
-* Utility Functions
+* Integer Rounding Functions
 * (C) 1999-2007 Jack Lloyd
 *
 * Distributed under the terms of the Botan license
 */
 
-#ifndef BOTAN_UTIL_H__
-#define BOTAN_UTIL_H__
+#ifndef BOTAN_ROUNDING_H__
+#define BOTAN_ROUNDING_H__
 
 #include <botan/types.h>
 
 namespace Botan {
 
 /*
-* Time Access Functions
-*/
-BOTAN_DLL u64bit system_time();
-
-/*
 * Round up n to multiple of align_to
 */
 inline u32bit round_up(u32bit n, u32bit align_to)
@@ -35,11 +30,6 @@ inline u32bit round_down(u32bit n, u32bit align_to)
    return (n - (n % align_to));
    }
 
-/*
-* Work Factor Estimates
-*/
-BOTAN_DLL u32bit dl_work_factor(u32bit);
-
 }
 
 #endif
diff --git a/src/utils/util.cpp b/src/utils/util.cpp
deleted file mode 100644
index 09ac9f1ca..000000000
--- a/src/utils/util.cpp
+++ /dev/null
@@ -1,50 +0,0 @@
-/*
-* Utility Functions
-* (C) 1999-2007 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#include <botan/util.h>
-#include <algorithm>
-#include <cmath>
-
-namespace Botan {
-
-/*
-* Choose the exponent size for a DL group
-*/
-u32bit dl_work_factor(u32bit bits)
-   {
-#if 0
-   /*
-   These values were taken from RFC 3526
-   */
-   if(bits <= 1536)
-      return 90;
-   else if(bits <= 2048)
-      return 110;
-   else if(bits <= 3072)
-      return 130;
-   else if(bits <= 4096)
-      return 150;
-   else if(bits <= 6144)
-      return 170;
-   else if(bits <= 8192)
-      return 190;
-   return 256;
-#else
-   const u32bit MIN_ESTIMATE = 64;
-
-   const double log_x = bits / 1.44;
-
-   const double strength =
-      2.76 * std::pow(log_x, 1.0/3.0) * std::pow(std::log(log_x), 2.0/3.0);
-
-   if(strength > MIN_ESTIMATE)
-      return static_cast<u32bit>(strength);
-   return MIN_ESTIMATE;
-#endif
-   }
-
-}