Fix ASN1 Integer & Timestamp encoding

Author: JRomainG

proto/asn1-pdu/asn1_universal_types_to_der.cc

@@ -41,8 +41,9 @@ void Encode(const Boolean& boolean, std::vector<uint8_t>& der) {
 }
 
 void Encode(const Integer& integer, std::vector<uint8_t>& der) {
+  // Cannot have an empty integer, so make sure the length is at least 1.
   EncodeTagAndLength(kAsn1Integer,
-                     std::min<size_t>(0x01u, integer.val().size()), der.size(),
+                     std::max<size_t>(0x01u, integer.val().size()), der.size(),
                      der);
 
   if (!integer.val().empty()) {
@@ -139,7 +140,9 @@ void EncodeTimestamp(const google::protobuf::Timestamp& timestamp,
                      bool use_two_digit_year,
                      std::vector<uint8_t>& der) {
   std::string iso_date = google::protobuf::util::TimeUtil::ToString(timestamp);
-  if (iso_date.size() < 25) {
+
+  // Expected date format: yyyy-MM-ddTHH:mm:ssZ (20 characters).
+  if (iso_date.size() < 20) {
     return;
   }
 

proto/asn1-pdu/common.h

@@ -17,6 +17,8 @@
 #ifndef PROTO_ASN1_PDU_COMMON_H_
 #define PROTO_ASN1_PDU_COMMON_H_
 
+#include <stddef.h>
+
 #include <stdint.h>
 
 #include <vector>
@@ -82,4 +84,4 @@ void EncodeTagAndLength(uint8_t tag_byte,
 // that |der| remains a valid DER encoding.
 void ReplaceTag(uint8_t tag_byte, size_t pos_of_tag, std::vector<uint8_t>& der);
 
-#endif  // PROTO_ASN1_PDU_COMMON_H_
+#endif  // PROTO_ASN1_PDU_COMMON_H_