propagate from branch 'net.randombit.botan.1_8' (head 3158f8272a3582dd44dfb771665eb71f7d005339)

            to branch 'net.randombit.botan' (head bf629b13dd132b263e76a72b7eca0f7e4ab19aac)

7 files changed, 22 insertions, 51 deletions

diff --git a/src/cert/cvc/asn1_eac_tm.cpp b/src/cert/cvc/asn1_eac_tm.cpp
index 05533b520..947b9e66d 100644
--- a/src/cert/cvc/asn1_eac_tm.cpp
+++ b/src/cert/cvc/asn1_eac_tm.cpp
@@ -11,53 +11,39 @@
 #include <botan/ber_dec.h>
 #include <botan/charset.h>
 #include <botan/parsing.h>
-#include <ctime>
-#include <sstream>
+#include <botan/rounding.h>
+#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("EAC_Time: gmtime could not encode " +
-                           to_string(timer));
-   return (*tm_p);
-   }
 SecureVector<byte> enc_two_digit(u32bit in)
    {
    SecureVector<byte> result;
    in %= 100;
    if (in < 10)
-      {
       result.append(0x00);
-      }
    else
       {
-      u32bit y_first_pos = (in - (in%10))/10;
+      u32bit y_first_pos = round_down(in, 10) / 10;
       result.append(static_cast<byte>(y_first_pos));
       }
-   u32bit y_sec_pos = in%10;
+
+   u32bit y_sec_pos = in % 10;
    result.append(static_cast<byte>(y_sec_pos));
    return result;
    }
+
 u32bit dec_two_digit(byte b1, byte b2)
    {
    u32bit upper = (u32bit)b1;
    u32bit lower = (u32bit)b2;
-   if (upper > 9 || lower > 9)
-      {
-      throw Invalid_Argument("u32bit dec_two_digit(byte b1, byte b2): value too large");
-      }
-   return upper*10 + lower;
 
+   if(upper > 9 || lower > 9)
+      throw Invalid_Argument("CVC dec_two_digit value too large");
+
+   return upper*10 + lower;
    }
 }
 
@@ -67,12 +53,11 @@ u32bit dec_two_digit(byte b1, byte b2)
 EAC_Time::EAC_Time(u64bit timer, ASN1_Tag t)
    :tag(t)
    {
-   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;
    day    = time_info.tm_mday;
-
    }
 
 /*
@@ -272,27 +257,15 @@ bool operator<(const EAC_Time& t1, const EAC_Time& t2)
 void EAC_Time::decode_from(BER_Decoder& source)
    {
    BER_Object obj = source.get_next_object();
-   if (obj.type_tag != this->tag)
-      {
-      std::string message("decoding type mismatch for EAC_Time, tag is ");
-      std::stringstream ss;
-      std::string str_is;
-      ss << std::hex << obj.type_tag;
-      ss >> str_is;
-      message.append(str_is);
-      message.append(", while it should be ");
-      std::stringstream ss2;
-      std::string str_should;
-      ss2 << std::hex << this->tag;
-      ss2 >> str_should;
-      message.append(str_should);
-      throw Decoding_Error(message);
 
-      }
-   if (obj.value.size() != 6)
+   if(obj.type_tag != this->tag)
+      throw BER_Decoding_Error("Tag mismatch when decoding");
+
+   if(obj.value.size() != 6)
       {
       throw Decoding_Error("EAC_Time decoding failed");
       }
+
    try
       {
       u32bit tmp_year = dec_two_digit(obj.value[0], obj.value[1]);
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..03bcd20f4 100644
--- a/src/cert/x509/x509opt.cpp
+++ b/src/cert/x509/x509opt.cpp
@@ -6,10 +6,9 @@
 */
 
 #include <botan/x509self.h>
-#include <botan/util.h>
-#include <botan/parsing.h>
 #include <botan/oids.h>
-#include <ctime>
+#include <botan/parsing.h>
+#include <botan/timer.h>
 
 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>