From e1d81327dde6c6837ed81c61c58876bd261fb47d Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Thu, 17 Sep 2009 13:59:56 +0000
Subject: 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

---
 src/alloc/mem_pool/mem_pool.cpp    |  2 +-
 src/benchmark/benchmark.cpp        |  1 -
 src/cert/cvc/cvc_ca.cpp            |  1 -
 src/cert/cvc/cvc_self.cpp          |  2 +-
 src/cert/x509/crl_ent.cpp          |  2 +-
 src/cert/x509/x509_ca.cpp          |  2 +-
 src/cert/x509/x509opt.cpp          |  4 +--
 src/cert/x509/x509stor.cpp         |  2 +-
 src/math/bigint/bigint.cpp         |  2 +-
 src/math/numbertheory/mp_numth.cpp |  2 +-
 src/modes/mode_pad/mode_pad.cpp    |  1 -
 src/pubkey/dh/dh.cpp               |  2 +-
 src/pubkey/dl_group/dl_group.cpp   |  2 +-
 src/pubkey/ecc_key/ecc_key.cpp     |  1 -
 src/pubkey/ecdsa/ecdsa.cpp         |  1 -
 src/pubkey/eckaeg/eckaeg.cpp       |  1 -
 src/pubkey/elgamal/elgamal.cpp     |  2 +-
 src/pubkey/info.txt                |  2 ++
 src/pubkey/workfactor.cpp          | 51 ++++++++++++++++++++++++++++++++++++++
 src/pubkey/workfactor.h            | 22 ++++++++++++++++
 src/rng/hmac_rng/hmac_rng.cpp      |  1 -
 src/rng/randpool/randpool.cpp      |  2 +-
 src/timer/gettimeofday/tm_unix.cpp |  1 -
 src/timer/posix_rt/tm_posix.cpp    |  1 -
 src/timer/timer.cpp                |  1 -
 src/timer/timer.h                  |  5 ++++
 src/utils/info.txt                 |  3 +--
 src/utils/rounding.h               | 35 ++++++++++++++++++++++++++
 src/utils/util.cpp                 | 50 -------------------------------------
 src/utils/util.h                   | 45 ---------------------------------
 30 files changed, 129 insertions(+), 120 deletions(-)
 create mode 100644 src/pubkey/workfactor.cpp
 create mode 100644 src/pubkey/workfactor.h
 create mode 100644 src/utils/rounding.h
 delete mode 100644 src/utils/util.cpp
 delete mode 100644 src/utils/util.h

(limited to 'src')

diff --git a/src/alloc/mem_pool/mem_pool.cpp b/src/alloc/mem_pool/mem_pool.cpp
index 38e0c3285..dabf5e310 100644
--- a/src/alloc/mem_pool/mem_pool.cpp
+++ b/src/alloc/mem_pool/mem_pool.cpp
@@ -8,7 +8,7 @@
 */
 
 #include <botan/mem_pool.h>
-#include <botan/util.h>
+#include <botan/rounding.h>
 #include <botan/mem_ops.h>
 #include <algorithm>
 #include <exception>
diff --git a/src/benchmark/benchmark.cpp b/src/benchmark/benchmark.cpp
index 3bbc1f883..9be845974 100644
--- a/src/benchmark/benchmark.cpp
+++ b/src/benchmark/benchmark.cpp
@@ -11,7 +11,6 @@
 #include <botan/stream_cipher.h>
 #include <botan/hash.h>
 #include <botan/mac.h>
-#include <botan/util.h>
 #include <memory>
 
 namespace Botan {
diff --git a/src/cert/cvc/cvc_ca.cpp b/src/cert/cvc/cvc_ca.cpp
index 638d3f984..8ca8db0c2 100644
--- a/src/cert/cvc/cvc_ca.cpp
+++ b/src/cert/cvc/cvc_ca.cpp
@@ -1,7 +1,6 @@
 #include <botan/cvc_ca.h>
 #include <botan/cvc_cert.h>
 #include <botan/der_enc.h>
-#include <botan/util.h>
 #include <botan/oids.h>
 namespace Botan {
 
diff --git a/src/cert/cvc/cvc_self.cpp b/src/cert/cvc/cvc_self.cpp
index 91ea38724..777347a18 100644
--- a/src/cert/cvc/cvc_self.cpp
+++ b/src/cert/cvc/cvc_self.cpp
@@ -14,7 +14,7 @@
 #include <botan/look_pk.h>
 #include <botan/cvc_req.h>
 #include <botan/cvc_ado.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 #include <sstream>
 
 namespace Botan {
diff --git a/src/cert/x509/crl_ent.cpp b/src/cert/x509/crl_ent.cpp
index afea8cf6b..a8a989c24 100644
--- a/src/cert/x509/crl_ent.cpp
+++ b/src/cert/x509/crl_ent.cpp
@@ -11,7 +11,7 @@
 #include <botan/ber_dec.h>
 #include <botan/bigint.h>
 #include <botan/oids.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 
 namespace Botan {
 
diff --git a/src/cert/x509/x509_ca.cpp b/src/cert/x509/x509_ca.cpp
index 41e314724..f0eb9c3e5 100644
--- a/src/cert/x509/x509_ca.cpp
+++ b/src/cert/x509/x509_ca.cpp
@@ -13,7 +13,7 @@
 #include <botan/bigint.h>
 #include <botan/parsing.h>
 #include <botan/oids.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 #include <algorithm>
 #include <typeinfo>
 #include <iterator>
diff --git a/src/cert/x509/x509opt.cpp b/src/cert/x509/x509opt.cpp
index de9d589a3..988ab2cfa 100644
--- a/src/cert/x509/x509opt.cpp
+++ b/src/cert/x509/x509opt.cpp
@@ -6,9 +6,9 @@
 */
 
 #include <botan/x509self.h>
-#include <botan/util.h>
-#include <botan/parsing.h>
 #include <botan/oids.h>
+#include <botan/parsing.h>
+#include <botan/timer.h>
 #include <ctime>
 
 namespace Botan {
diff --git a/src/cert/x509/x509stor.cpp b/src/cert/x509/x509stor.cpp
index cb61bc2d2..40801148c 100644
--- a/src/cert/x509/x509stor.cpp
+++ b/src/cert/x509/x509stor.cpp
@@ -10,7 +10,7 @@
 #include <botan/pubkey.h>
 #include <botan/look_pk.h>
 #include <botan/oids.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 #include <algorithm>
 #include <memory>
 
diff --git a/src/math/bigint/bigint.cpp b/src/math/bigint/bigint.cpp
index 926bedc02..63bdc3605 100644
--- a/src/math/bigint/bigint.cpp
+++ b/src/math/bigint/bigint.cpp
@@ -9,7 +9,7 @@
 #include <botan/mp_core.h>
 #include <botan/loadstor.h>
 #include <botan/parsing.h>
-#include <botan/util.h>
+#include <botan/rounding.h>
 
 namespace Botan {
 
diff --git a/src/math/numbertheory/mp_numth.cpp b/src/math/numbertheory/mp_numth.cpp
index 45a398440..2cb36b8a3 100644
--- a/src/math/numbertheory/mp_numth.cpp
+++ b/src/math/numbertheory/mp_numth.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/numthry.h>
 #include <botan/mp_core.h>
-#include <botan/util.h>
+#include <botan/rounding.h>
 #include <algorithm>
 
 namespace Botan {
diff --git a/src/modes/mode_pad/mode_pad.cpp b/src/modes/mode_pad/mode_pad.cpp
index b8badd7a7..2204c28b5 100644
--- a/src/modes/mode_pad/mode_pad.cpp
+++ b/src/modes/mode_pad/mode_pad.cpp
@@ -7,7 +7,6 @@
 
 #include <botan/mode_pad.h>
 #include <botan/exceptn.h>
-#include <botan/util.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/dh/dh.cpp b/src/pubkey/dh/dh.cpp
index 0c9d02f0e..149bc5882 100644
--- a/src/pubkey/dh/dh.cpp
+++ b/src/pubkey/dh/dh.cpp
@@ -7,7 +7,7 @@
 
 #include <botan/dh.h>
 #include <botan/numthry.h>
-#include <botan/util.h>
+#include <botan/workfactor.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/dl_group/dl_group.cpp b/src/pubkey/dl_group/dl_group.cpp
index 81c5d5e1d..13ea03016 100644
--- a/src/pubkey/dl_group/dl_group.cpp
+++ b/src/pubkey/dl_group/dl_group.cpp
@@ -12,7 +12,7 @@
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/pipe.h>
-#include <botan/util.h>
+#include <botan/workfactor.h>
 #include <botan/pem.h>
 
 namespace Botan {
diff --git a/src/pubkey/ecc_key/ecc_key.cpp b/src/pubkey/ecc_key/ecc_key.cpp
index 615efecf1..677a5088e 100644
--- a/src/pubkey/ecc_key/ecc_key.cpp
+++ b/src/pubkey/ecc_key/ecc_key.cpp
@@ -10,7 +10,6 @@
 #include <botan/ecc_key.h>
 #include <botan/x509_key.h>
 #include <botan/numthry.h>
-#include <botan/util.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/secmem.h>
diff --git a/src/pubkey/ecdsa/ecdsa.cpp b/src/pubkey/ecdsa/ecdsa.cpp
index 9640c6397..ea2c35a19 100644
--- a/src/pubkey/ecdsa/ecdsa.cpp
+++ b/src/pubkey/ecdsa/ecdsa.cpp
@@ -9,7 +9,6 @@
 
 #include <botan/ecdsa.h>
 #include <botan/numthry.h>
-#include <botan/util.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/secmem.h>
diff --git a/src/pubkey/eckaeg/eckaeg.cpp b/src/pubkey/eckaeg/eckaeg.cpp
index b8ff75d89..dc6eb925b 100644
--- a/src/pubkey/eckaeg/eckaeg.cpp
+++ b/src/pubkey/eckaeg/eckaeg.cpp
@@ -9,7 +9,6 @@
 
 #include <botan/eckaeg.h>
 #include <botan/numthry.h>
-#include <botan/util.h>
 #include <botan/der_enc.h>
 #include <botan/ber_dec.h>
 #include <botan/secmem.h>
diff --git a/src/pubkey/elgamal/elgamal.cpp b/src/pubkey/elgamal/elgamal.cpp
index 1f79df57a..8c07c5735 100644
--- a/src/pubkey/elgamal/elgamal.cpp
+++ b/src/pubkey/elgamal/elgamal.cpp
@@ -9,7 +9,7 @@
 #include <botan/numthry.h>
 #include <botan/keypair.h>
 #include <botan/look_pk.h>
-#include <botan/util.h>
+#include <botan/workfactor.h>
 
 namespace Botan {
 
diff --git a/src/pubkey/info.txt b/src/pubkey/info.txt
index ee8da5b9d..63af86c47 100644
--- a/src/pubkey/info.txt
+++ b/src/pubkey/info.txt
@@ -15,6 +15,8 @@ pubkey.cpp
 pubkey.h
 pubkey_enums.cpp
 pubkey_enums.h
+workfactor.cpp
+workfactor.h
 </add>
 
 <requires>
diff --git a/src/pubkey/workfactor.cpp b/src/pubkey/workfactor.cpp
new file mode 100644
index 000000000..e40b7919c
--- /dev/null
+++ b/src/pubkey/workfactor.cpp
@@ -0,0 +1,51 @@
+/*
+* Public Key Work Factor Functions
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#include <botan/workfactor.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
+   }
+
+
+}
diff --git a/src/pubkey/workfactor.h b/src/pubkey/workfactor.h
new file mode 100644
index 000000000..653f697e3
--- /dev/null
+++ b/src/pubkey/workfactor.h
@@ -0,0 +1,22 @@
+/*
+* Public Key Work Factor Functions
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_WORKFACTOR_H__
+#define BOTAN_WORKFACTOR_H__
+
+#include <botan/types.h>
+
+namespace Botan {
+
+/*
+* Work Factor Estimates
+*/
+BOTAN_DLL u32bit dl_work_factor(u32bit prime_group_size);
+
+}
+
+#endif
diff --git a/src/rng/hmac_rng/hmac_rng.cpp b/src/rng/hmac_rng/hmac_rng.cpp
index 113489db3..8444b1083 100644
--- a/src/rng/hmac_rng/hmac_rng.cpp
+++ b/src/rng/hmac_rng/hmac_rng.cpp
@@ -8,7 +8,6 @@
 #include <botan/hmac_rng.h>
 #include <botan/loadstor.h>
 #include <botan/xor_buf.h>
-#include <botan/util.h>
 #include <botan/stl_util.h>
 #include <algorithm>
 
diff --git a/src/rng/randpool/randpool.cpp b/src/rng/randpool/randpool.cpp
index 77a5228c6..fe83f4361 100644
--- a/src/rng/randpool/randpool.cpp
+++ b/src/rng/randpool/randpool.cpp
@@ -8,7 +8,7 @@
 #include <botan/randpool.h>
 #include <botan/loadstor.h>
 #include <botan/xor_buf.h>
-#include <botan/util.h>
+#include <botan/timer.h>
 #include <botan/stl_util.h>
 #include <algorithm>
 
diff --git a/src/timer/gettimeofday/tm_unix.cpp b/src/timer/gettimeofday/tm_unix.cpp
index e32df7166..9d8ac4a04 100644
--- a/src/timer/gettimeofday/tm_unix.cpp
+++ b/src/timer/gettimeofday/tm_unix.cpp
@@ -6,7 +6,6 @@
 */
 
 #include <botan/tm_unix.h>
-#include <botan/util.h>
 #include <sys/time.h>
 
 namespace Botan {
diff --git a/src/timer/posix_rt/tm_posix.cpp b/src/timer/posix_rt/tm_posix.cpp
index d356384ab..96182025c 100644
--- a/src/timer/posix_rt/tm_posix.cpp
+++ b/src/timer/posix_rt/tm_posix.cpp
@@ -6,7 +6,6 @@
 */
 
 #include <botan/tm_posix.h>
-#include <botan/util.h>
 
 #ifndef _POSIX_C_SOURCE
   #define _POSIX_C_SOURCE 199309
diff --git a/src/timer/timer.cpp b/src/timer/timer.cpp
index 035c217f9..e3e3c5a16 100644
--- a/src/timer/timer.cpp
+++ b/src/timer/timer.cpp
@@ -7,7 +7,6 @@
 
 #include <botan/timer.h>
 #include <botan/loadstor.h>
-#include <botan/util.h>
 #include <ctime>
 
 namespace Botan {
diff --git a/src/timer/timer.h b/src/timer/timer.h
index b6e8ef448..3bbe85a5e 100644
--- a/src/timer/timer.h
+++ b/src/timer/timer.h
@@ -12,6 +12,11 @@
 
 namespace Botan {
 
+/*
+* Time Access Functions
+*/
+BOTAN_DLL u64bit system_time();
+
 /**
 * Timer Interface
 */
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/rounding.h b/src/utils/rounding.h
new file mode 100644
index 000000000..11ab90b8d
--- /dev/null
+++ b/src/utils/rounding.h
@@ -0,0 +1,35 @@
+/*
+* Integer Rounding Functions
+* (C) 1999-2007 Jack Lloyd
+*
+* Distributed under the terms of the Botan license
+*/
+
+#ifndef BOTAN_ROUNDING_H__
+#define BOTAN_ROUNDING_H__
+
+#include <botan/types.h>
+
+namespace Botan {
+
+/*
+* Round up n to multiple of align_to
+*/
+inline u32bit round_up(u32bit n, u32bit align_to)
+   {
+   if(n % align_to || n == 0)
+      n += align_to - (n % align_to);
+   return n;
+   }
+
+/*
+* Round down n to multiple of align_to
+*/
+inline u32bit round_down(u32bit n, u32bit align_to)
+   {
+   return (n - (n % align_to));
+   }
+
+}
+
+#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
-   }
-
-}
diff --git a/src/utils/util.h b/src/utils/util.h
deleted file mode 100644
index e3dadc64b..000000000
--- a/src/utils/util.h
+++ /dev/null
@@ -1,45 +0,0 @@
-/*
-* Utility Functions
-* (C) 1999-2007 Jack Lloyd
-*
-* Distributed under the terms of the Botan license
-*/
-
-#ifndef BOTAN_UTIL_H__
-#define BOTAN_UTIL_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)
-   {
-   if(n % align_to || n == 0)
-      n += align_to - (n % align_to);
-   return n;
-   }
-
-/*
-* Round down n to multiple of align_to
-*/
-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
-- 
cgit v1.2.3