From 7e839d037119055b572f40ce0cd882f85583db2e Mon Sep 17 00:00:00 2001
From: lloyd <lloyd@randombit.net>
Date: Thu, 17 Sep 2009 14:12:57 +0000
Subject: The get_tm function was duplicated. Move single version to
 timer.{h,cpp}

---
 src/asn1/asn1_tm.cpp | 22 ++--------------------
 1 file changed, 2 insertions(+), 20 deletions(-)

(limited to 'src/asn1')

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;
-- 
cgit v1.2.3