Sync pki to chromium 8049b24a3fa617e66c5d3fc0e9322bb07c500f49
Change-Id: Ib65febca30ce312f2c8fd6d6dbc85f24987b50d8
Reviewed-on: https://boringssl-review.googlesource.com/c/boringssl/+/62245
Auto-Submit: Bob Beck <bbe@google.com>
Reviewed-by: David Benjamin <davidben@google.com>
Commit-Queue: David Benjamin <davidben@google.com>
diff --git a/pki/input.h b/pki/input.h
index 14a1fef..e0dff1f 100644
--- a/pki/input.h
+++ b/pki/input.h
@@ -10,10 +10,11 @@
#include <stdint.h>
#include <string>
+#include <string_view>
+
#include <openssl/span.h>
-
namespace bssl::der {
// An opaque class that represents a fixed buffer of data of a fixed length,
@@ -31,30 +32,30 @@
// Creates an empty Input, one from which no data can be read.
constexpr Input() = default;
- // Creates an Input from a constant array |data|.
- template <size_t N>
- constexpr explicit Input(const uint8_t (&data)[N]) : data_(data), len_(N) {}
+ // Creates an Input from a span. The constructed Input is only valid as long
+ // as |data| points to live memory. If constructed from, say, a
+ // |std::vector<uint8_t>|, mutating the vector will invalidate the Input.
+ constexpr explicit Input(bssl::Span<const uint8_t> data) : data_(data) {}
// Creates an Input from the given |data| and |len|.
constexpr explicit Input(const uint8_t* data, size_t len)
- : data_(data), len_(len) {}
+ : data_(bssl::MakeConstSpan(data, len)) {}
- // Creates an Input from a std::string_view
- explicit Input(std::string_view sp);
-
- // Creates an Input from a std::string. The lifetimes are a bit subtle when
- // using this function: The constructed Input is only valid so long as |s| is
- // still alive and not mutated.
- explicit Input(const std::string* s);
+ // Creates an Input from a std::string_view. The constructed Input is only
+ // valid as long as |data| points to live memory. If constructed from, say, a
+ // |std::string|, mutating the vector will invalidate the Input.
+ explicit Input(std::string_view str)
+ : data_(bssl::MakeConstSpan(reinterpret_cast<const uint8_t*>(str.data()),
+ str.size())) {}
// Returns the length in bytes of an Input's data.
- constexpr size_t Length() const { return len_; }
+ constexpr size_t Length() const { return data_.size(); }
// Returns a pointer to the Input's data. This method is marked as "unsafe"
// because access to the Input's data should be done through ByteReader
// instead. This method should only be used where using a ByteReader truly
// is not an option.
- constexpr const uint8_t* UnsafeData() const { return data_; }
+ constexpr const uint8_t* UnsafeData() const { return data_.data(); }
// Returns a copy of the data represented by this object as a std::string.
std::string AsString() const;
@@ -64,21 +65,13 @@
// this Input.
std::string_view AsStringView() const;
- // Returns a bssl::Span pointing to the same data as the Input. The resulting
- // bssl::Span must not outlive the data that was used to construct this
- // Input.
+ // Returns a span pointing to the same data as the Input. The resulting span
+ // must not outlive the data that was used to construct this Input.
bssl::Span<const uint8_t> AsSpan() const;
private:
- // This constructor is deleted to prevent constructing an Input from a
- // std::string r-value. Since the Input points to memory owned by another
- // object, such an Input would point to invalid memory. Without this deleted
- // constructor, a std::string could be passed in to the std::string_view
- // constructor because of std::string_view's implicit constructor.
- Input(std::string) = delete;
-
- const uint8_t* data_ = nullptr;
- size_t len_ = 0;
+ // TODO(crbug.com/770501): Replace this type with span altogether.
+ bssl::Span<const uint8_t> data_;
};
// Return true if |lhs|'s data and |rhs|'s data are byte-wise equal.
