aboutsummaryrefslogtreecommitdiffstats
path: root/src/asn1
diff options
context:
space:
mode:
authorlloyd <[email protected]>2009-09-17 14:12:57 +0000
committerlloyd <[email protected]>2009-09-17 14:12:57 +0000
commit7e839d037119055b572f40ce0cd882f85583db2e (patch)
tree03792d0825d846f634cf34341b87e01ef91cb22f /src/asn1
parente1d81327dde6c6837ed81c61c58876bd261fb47d (diff)
The get_tm function was duplicated. Move single version to timer.{h,cpp}
Diffstat (limited to 'src/asn1')
-rw-r--r--src/asn1/asn1_tm.cpp22
1 files changed, 2 insertions, 20 deletions
diff --git a/src/asn1/asn1_tm.cpp b/src/asn1/asn1_tm.cpp
index f85ea128b..09bc4d347 100644
--- a/src/asn1/asn1_tm.cpp
+++ b/src/asn1/asn1_tm.cpp
@@ -10,28 +10,10 @@
#include <botan/ber_dec.h>
#include <botan/charset.h>
#include <botan/parsing.h>
-#include <ctime>
+#include <botan/timer.h>
namespace Botan {
-namespace {
-
-/*
-* Convert a time_t to a struct tm
-*/
-std::tm get_tm(u64bit timer)
- {
- std::time_t time_val = static_cast<std::time_t>(timer);
-
- std::tm* tm_p = std::gmtime(&time_val);
- if(tm_p == 0)
- throw Encoding_Error("X509_Time: gmtime could not encode " +
- to_string(timer));
- return (*tm_p);
- }
-
-}
-
/*
* Create an X509_Time
*/
@@ -45,7 +27,7 @@ X509_Time::X509_Time(const std::string& time_str)
*/
X509_Time::X509_Time(u64bit timer)
{
- std::tm time_info = get_tm(timer);
+ std::tm time_info = time_t_to_tm(timer);
year = time_info.tm_year + 1900;
month = time_info.tm_mon + 1;