aboutsummaryrefslogtreecommitdiffstats
path: root/src/lib/asn1
diff options
context:
space:
mode:
Diffstat (limited to 'src/lib/asn1')
-rw-r--r--src/lib/asn1/asn1_obj.h12
-rw-r--r--src/lib/asn1/asn1_time.cpp345
-rw-r--r--src/lib/asn1/asn1_time.h41
3 files changed, 189 insertions, 209 deletions
diff --git a/src/lib/asn1/asn1_obj.h b/src/lib/asn1/asn1_obj.h
index d208ec78e..f68ef675e 100644
--- a/src/lib/asn1/asn1_obj.h
+++ b/src/lib/asn1/asn1_obj.h
@@ -13,6 +13,9 @@
namespace Botan {
+class BER_Decoder;
+class DER_Encoder;
+
/**
* ASN.1 Type and Class Tags
*/
@@ -44,8 +47,9 @@ enum ASN1_Tag {
VISIBLE_STRING = 0x1A,
BMP_STRING = 0x1E,
- UTC_TIME = 0x17,
- GENERALIZED_TIME = 0x18,
+ UTC_TIME = 0x17,
+ GENERALIZED_TIME = 0x18,
+ UTC_OR_GENERALIZED_TIME = 0x19,
NO_OBJECT = 0xFF00,
DIRECTORY_STRING = 0xFF01
@@ -61,13 +65,13 @@ class BOTAN_DLL ASN1_Object
* Encode whatever this object is into to
* @param to the DER_Encoder that will be written to
*/
- virtual void encode_into(class DER_Encoder& to) const = 0;
+ virtual void encode_into(DER_Encoder& to) const = 0;
/**
* Decode whatever this object is from from
* @param from the BER_Decoder that will be read from
*/
- virtual void decode_from(class BER_Decoder& from) = 0;
+ virtual void decode_from(BER_Decoder& from) = 0;
virtual ~ASN1_Object() {}
};
diff --git a/src/lib/asn1/asn1_time.cpp b/src/lib/asn1/asn1_time.cpp
index 72bf87df9..b7cf589a2 100644
--- a/src/lib/asn1/asn1_time.cpp
+++ b/src/lib/asn1/asn1_time.cpp
@@ -9,6 +9,7 @@
#include <botan/der_enc.h>
#include <botan/ber_dec.h>
#include <botan/charset.h>
+#include <botan/exceptn.h>
#include <botan/parsing.h>
#include <botan/calendar.h>
#include <sstream>
@@ -16,162 +17,36 @@
namespace Botan {
-/*
-* Create an X509_Time
-*/
-X509_Time::X509_Time(const std::string& time_str)
- {
- set_to(time_str);
- }
-
-/*
-* Create a X509_Time from a time point
-*/
X509_Time::X509_Time(const std::chrono::system_clock::time_point& time)
{
calendar_point cal = calendar_value(time);
- year = cal.year;
- month = cal.month;
- day = cal.day;
- hour = cal.hour;
- minute = cal.minutes;
- second = cal.seconds;
+ m_year = cal.year;
+ m_month = cal.month;
+ m_day = cal.day;
+ m_hour = cal.hour;
+ m_minute = cal.minutes;
+ m_second = cal.seconds;
- tag = (year >= 2050) ? GENERALIZED_TIME : UTC_TIME;
+ m_tag = (m_year >= 2050) ? GENERALIZED_TIME : UTC_TIME;
}
-/*
-* Create an X509_Time
-*/
-X509_Time::X509_Time(const std::string& t_spec, ASN1_Tag t) : tag(t)
+X509_Time::X509_Time(const std::string& t_spec, ASN1_Tag tag)
{
set_to(t_spec, tag);
}
-/*
-* Set the time with a human readable string
-*/
-void X509_Time::set_to(const std::string& time_str)
- {
- if(time_str == "")
- {
- year = month = day = hour = minute = second = 0;
- tag = NO_OBJECT;
- return;
- }
-
- std::vector<std::string> params;
- std::string current;
-
- for(size_t j = 0; j != time_str.size(); ++j)
- {
- if(Charset::is_digit(time_str[j]))
- current += time_str[j];
- else
- {
- if(current != "")
- params.push_back(current);
- current.clear();
- }
- }
- if(current != "")
- params.push_back(current);
-
- if(params.size() < 3 || params.size() > 6)
- throw Invalid_Argument("Invalid time specification " + time_str);
-
- year = to_u32bit(params[0]);
- month = to_u32bit(params[1]);
- day = to_u32bit(params[2]);
- hour = (params.size() >= 4) ? to_u32bit(params[3]) : 0;
- minute = (params.size() >= 5) ? to_u32bit(params[4]) : 0;
- second = (params.size() == 6) ? to_u32bit(params[5]) : 0;
-
- tag = (year >= 2050) ? GENERALIZED_TIME : UTC_TIME;
-
- if(!passes_sanity_check())
- throw Invalid_Argument("Invalid time specification " + time_str);
- }
-
-/*
-* Set the time with an ISO time format string
-*/
-void X509_Time::set_to(const std::string& t_spec, ASN1_Tag spec_tag)
- {
- if(spec_tag == GENERALIZED_TIME)
- {
- if(t_spec.size() != 13 && t_spec.size() != 15)
- throw Invalid_Argument("Invalid GeneralizedTime: " + t_spec);
- }
- else if(spec_tag == UTC_TIME)
- {
- if(t_spec.size() != 11 && t_spec.size() != 13)
- throw Invalid_Argument("Invalid UTCTime: " + t_spec);
- }
- else
- {
- throw Invalid_Argument("Invalid time tag " + std::to_string(spec_tag) + " val " + t_spec);
- }
-
- if(t_spec[t_spec.size()-1] != 'Z')
- throw Invalid_Argument("Invalid time encoding: " + t_spec);
-
- const size_t YEAR_SIZE = (spec_tag == UTC_TIME) ? 2 : 4;
-
- std::vector<std::string> params;
- std::string current;
-
- for(size_t j = 0; j != YEAR_SIZE; ++j)
- current += t_spec[j];
- params.push_back(current);
- current.clear();
-
- for(size_t j = YEAR_SIZE; j != t_spec.size() - 1; ++j)
- {
- current += t_spec[j];
- if(current.size() == 2)
- {
- params.push_back(current);
- current.clear();
- }
- }
-
- year = to_u32bit(params[0]);
- month = to_u32bit(params[1]);
- day = to_u32bit(params[2]);
- hour = to_u32bit(params[3]);
- minute = to_u32bit(params[4]);
- second = (params.size() == 6) ? to_u32bit(params[5]) : 0;
- tag = spec_tag;
-
- if(spec_tag == UTC_TIME)
- {
- if(year >= 50) year += 1900;
- else year += 2000;
- }
-
- if(!passes_sanity_check())
- throw Invalid_Argument("Invalid time specification " + t_spec);
- }
-
-/*
-* DER encode a X509_Time
-*/
void X509_Time::encode_into(DER_Encoder& der) const
{
- if(tag != GENERALIZED_TIME && tag != UTC_TIME)
+ if(m_tag != GENERALIZED_TIME && m_tag != UTC_TIME)
throw Invalid_Argument("X509_Time: Bad encoding tag");
- der.add_object(tag, UNIVERSAL,
- Charset::transcode(as_string(),
+ der.add_object(m_tag, UNIVERSAL,
+ Charset::transcode(to_string(),
LOCAL_CHARSET,
LATIN1_CHARSET));
}
-/*
-* Decode a BER encoded X509_Time
-*/
void X509_Time::decode_from(BER_Decoder& source)
{
BER_Object ber_time = source.get_next_object();
@@ -182,33 +57,36 @@ void X509_Time::decode_from(BER_Decoder& source)
ber_time.type_tag);
}
-/*
-* Return a string representation of the time
-*/
-std::string X509_Time::as_string() const
+std::string X509_Time::to_string() const
{
if(time_is_set() == false)
throw Invalid_State("X509_Time::as_string: No time set");
- u32bit full_year = year;
+ u32bit full_year = m_year;
- if(tag == UTC_TIME)
+ if(m_tag == UTC_TIME)
{
- if(year < 1950 || year >= 2050)
+ if(m_year < 1950 || m_year >= 2050)
throw Encoding_Error("X509_Time: The time " + readable_string() +
" cannot be encoded as a UTCTime");
- full_year = (year >= 2000) ? (year - 2000) : (year - 1900);
+ full_year = (m_year >= 2000) ? (m_year - 2000) : (m_year - 1900);
}
- std::string repr = std::to_string(full_year*10000000000 +
- month*100000000 +
- day*1000000 +
- hour*10000 +
- minute*100 +
- second) + "Z";
+ const auto factor_y = uint64_t{10000000000ull}; // literal exceeds 32bit int range
+ const auto factor_m = uint64_t{100000000ull};
+ const auto factor_d = uint64_t{1000000ull};
+ const auto factor_h = uint64_t{10000ull};
+ const auto factor_i = uint64_t{100ull};
- u32bit desired_size = (tag == UTC_TIME) ? 13 : 15;
+ std::string repr = std::to_string(factor_y * full_year +
+ factor_m * m_month +
+ factor_d * m_day +
+ factor_h * m_hour +
+ factor_i * m_minute +
+ m_second) + "Z";
+
+ u32bit desired_size = (m_tag == UTC_TIME) ? 13 : 15;
while(repr.size() < desired_size)
repr = "0" + repr;
@@ -216,17 +94,6 @@ std::string X509_Time::as_string() const
return repr;
}
-/*
-* Return if the time has been set somehow
-*/
-bool X509_Time::time_is_set() const
- {
- return (year != 0);
- }
-
-/*
-* Return a human readable string representation
-*/
std::string X509_Time::readable_string() const
{
if(time_is_set() == false)
@@ -237,33 +104,19 @@ std::string X509_Time::readable_string() const
{
using namespace std;
output << setfill('0')
- << setw(4) << year << "/" << setw(2) << month << "/" << setw(2) << day
+ << setw(4) << m_year << "/" << setw(2) << m_month << "/" << setw(2) << m_day
<< " "
- << setw(2) << hour << ":" << setw(2) << minute << ":" << setw(2) << second
+ << setw(2) << m_hour << ":" << setw(2) << m_minute << ":" << setw(2) << m_second
<< " UTC";
}
return output.str();
}
-/*
-* Do a general sanity check on the time
-*/
-bool X509_Time::passes_sanity_check() const
+bool X509_Time::time_is_set() const
{
- if(year < 1950 || year > 2100)
- return false;
- if(month == 0 || month > 12)
- return false;
- if(day == 0 || day > 31)
- return false;
- if(hour >= 24 || minute > 60 || second > 60)
- return false;
- return true;
+ return (m_year != 0);
}
-/*
-* Compare this time against another
-*/
s32bit X509_Time::cmp(const X509_Time& other) const
{
if(time_is_set() == false)
@@ -271,22 +124,128 @@ s32bit X509_Time::cmp(const X509_Time& other) const
const s32bit EARLIER = -1, LATER = 1, SAME_TIME = 0;
- if(year < other.year) return EARLIER;
- if(year > other.year) return LATER;
- if(month < other.month) return EARLIER;
- if(month > other.month) return LATER;
- if(day < other.day) return EARLIER;
- if(day > other.day) return LATER;
- if(hour < other.hour) return EARLIER;
- if(hour > other.hour) return LATER;
- if(minute < other.minute) return EARLIER;
- if(minute > other.minute) return LATER;
- if(second < other.second) return EARLIER;
- if(second > other.second) return LATER;
+ if(m_year < other.m_year) return EARLIER;
+ if(m_year > other.m_year) return LATER;
+ if(m_month < other.m_month) return EARLIER;
+ if(m_month > other.m_month) return LATER;
+ if(m_day < other.m_day) return EARLIER;
+ if(m_day > other.m_day) return LATER;
+ if(m_hour < other.m_hour) return EARLIER;
+ if(m_hour > other.m_hour) return LATER;
+ if(m_minute < other.m_minute) return EARLIER;
+ if(m_minute > other.m_minute) return LATER;
+ if(m_second < other.m_second) return EARLIER;
+ if(m_second > other.m_second) return LATER;
return SAME_TIME;
}
+void X509_Time::set_to(const std::string& t_spec, ASN1_Tag spec_tag)
+ {
+ if(spec_tag == UTC_OR_GENERALIZED_TIME)
+ {
+ try
+ {
+ set_to(t_spec, GENERALIZED_TIME);
+ return;
+ }
+ catch(Invalid_Argument) {} // Not a generalized time. Continue
+
+ try
+ {
+ set_to(t_spec, UTC_TIME);
+ return;
+ }
+ catch(Invalid_Argument) {} // Not a UTC time. Continue
+
+ throw Invalid_Argument("Time string could not be parsed as GeneralizedTime or UTCTime.");
+ }
+
+ BOTAN_ASSERT(spec_tag == UTC_TIME || spec_tag == GENERALIZED_TIME, "Invalid tag.");
+
+ if(t_spec.empty())
+ throw Invalid_Argument("Time string must not be empty.");
+
+ if(t_spec.back() != 'Z')
+ throw Unsupported_Argument("Botan does not support times with timezones other than Z: " + t_spec);
+
+ if(spec_tag == GENERALIZED_TIME)
+ {
+ if(t_spec.size() != 13 && t_spec.size() != 15)
+ throw Invalid_Argument("Invalid GeneralizedTime string: '" + t_spec + "'");
+ }
+ else if(spec_tag == UTC_TIME)
+ {
+ if(t_spec.size() != 11 && t_spec.size() != 13)
+ throw Invalid_Argument("Invalid UTCTime string: '" + t_spec + "'");
+ }
+
+ const size_t YEAR_SIZE = (spec_tag == UTC_TIME) ? 2 : 4;
+
+ std::vector<std::string> params;
+ std::string current;
+
+ for(size_t j = 0; j != YEAR_SIZE; ++j)
+ current += t_spec[j];
+ params.push_back(current);
+ current.clear();
+
+ for(size_t j = YEAR_SIZE; j != t_spec.size() - 1; ++j)
+ {
+ current += t_spec[j];
+ if(current.size() == 2)
+ {
+ params.push_back(current);
+ current.clear();
+ }
+ }
+
+ m_year = to_u32bit(params[0]);
+ m_month = to_u32bit(params[1]);
+ m_day = to_u32bit(params[2]);
+ m_hour = to_u32bit(params[3]);
+ m_minute = to_u32bit(params[4]);
+ m_second = (params.size() == 6) ? to_u32bit(params[5]) : 0;
+ m_tag = spec_tag;
+
+ if(spec_tag == UTC_TIME)
+ {
+ if(m_year >= 50) m_year += 1900;
+ else m_year += 2000;
+ }
+
+ if(!passes_sanity_check())
+ throw Invalid_Argument("Time did not pass sanity check: " + t_spec);
+ }
+
+/*
+* Do a general sanity check on the time
+*/
+bool X509_Time::passes_sanity_check() const
+ {
+ if(m_year < 1950 || m_year > 2100)
+ return false;
+ if(m_month == 0 || m_month > 12)
+ return false;
+ if(m_day == 0 || m_day > 31)
+ return false;
+ if(m_hour >= 24 || m_minute > 60 || m_second > 60)
+ return false;
+
+ if (m_tag == UTC_TIME)
+ {
+ // UTCTime limits the value of components such that leap seconds are not covered.
+ // See "UNIVERSAL 23" in "Information technology – Abstract Syntax Notation One (ASN.1): Specification of basic notation"
+ // http://www.itu.int/ITU-T/studygroups/com17/languages/
+ if (m_hour > 23 || m_minute > 59 || m_second > 59)
+ {
+ return false;
+ }
+ }
+
+ return true;
+ }
+
/*
* Compare two X509_Times for in various ways
*/
diff --git a/src/lib/asn1/asn1_time.h b/src/lib/asn1/asn1_time.h
index 6200d7b62..313b26b06 100644
--- a/src/lib/asn1/asn1_time.h
+++ b/src/lib/asn1/asn1_time.h
@@ -19,27 +19,44 @@ namespace Botan {
class BOTAN_DLL X509_Time : public ASN1_Object
{
public:
- void encode_into(class DER_Encoder&) const override;
- void decode_from(class BER_Decoder&) override;
+ /// DER encode a X509_Time
+ void encode_into(DER_Encoder&) const override;
- std::string as_string() const;
+ // Decode a BER encoded X509_Time
+ void decode_from(BER_Decoder&) override;
+
+ /// Return an internal string representation of the time
+ std::string to_string() const;
+
+ /// Returns a human friendly string replesentation of no particular formatting
std::string readable_string() const;
- bool time_is_set() const;
- std::string to_string() const { return readable_string(); }
+ /// Return if the time has been set somehow
+ bool time_is_set() const;
- s32bit cmp(const X509_Time&) const;
+ /// Compare this time against another
+ s32bit cmp(const X509_Time& other) const;
- void set_to(const std::string&);
- void set_to(const std::string&, ASN1_Tag);
+ /// Create an invalid X509_Time
+ X509_Time() {}
+ /// Create a X509_Time from a time point
X509_Time(const std::chrono::system_clock::time_point& time);
- X509_Time(const std::string& = "");
- X509_Time(const std::string&, ASN1_Tag);
+
+ /// Create an X509_Time from string
+ X509_Time(const std::string& t_spec, ASN1_Tag tag);
+
private:
+ void set_to(const std::string& t_spec, ASN1_Tag);
bool passes_sanity_check() const;
- u32bit year, month, day, hour, minute, second;
- ASN1_Tag tag;
+
+ u32bit m_year = 0;
+ u32bit m_month = 0;
+ u32bit m_day = 0;
+ u32bit m_hour = 0;
+ u32bit m_minute = 0;
+ u32bit m_second = 0;
+ ASN1_Tag m_tag = NO_OBJECT;
};
/*
generated by cgit v1.2.3 (git 2.39.1) at 2024-12-28 16:18:13 +0000