http_utils update using std::span

randombit · Feb 17, 2023 · 6479d27 · 6479d27
1 parent 9574cb1
commit 6479d27
Show file tree

Hide file tree

Showing 5 changed files with 10 additions and 7 deletions.
diff --git a/src/lib/utils/http_util/http_util.cpp b/src/lib/utils/http_util/http_util.cpp
@@ -67,7 +67,7 @@ std::string http_transact(const std::string& hostname,
    return oss.str();
    }
 
-bool needs_url_encoding(char c)
+inline bool needs_url_encoding(char c)
    {
    if(c >= 'A' && c <= 'Z')
       return false;

diff --git a/src/lib/utils/http_util/http_util.h b/src/lib/utils/http_util/http_util.h
@@ -11,6 +11,7 @@
 #include <botan/types.h>
 #include <botan/exceptn.h>
 #include <vector>
+#include <span>
 #include <map>
 #include <string>
 #include <functional>
@@ -40,7 +41,7 @@ class Response final
       Response() : m_status_code(0), m_status_message("Uninitialized") {}
 
       Response(unsigned int status_code, const std::string& status_message,
-               const std::vector<uint8_t>& body,
+               std::span<const uint8_t> body,
                const std::map<std::string, std::string>& headers) :
          m_status_code(status_code),
          m_status_message(status_message),
@@ -49,7 +50,7 @@ class Response final
 
       unsigned int status_code() const { return m_status_code; }
 
-      const std::vector<uint8_t>& body() const { return m_body; }
+      std::span<const uint8_t> body() const { return m_body; }
 
       const std::map<std::string, std::string>& headers() const { return m_headers; }
 
@@ -64,7 +65,7 @@ class Response final
    private:
       unsigned int m_status_code;
       std::string m_status_message;
-      std::vector<uint8_t> m_body;
+      std::span<const uint8_t> m_body;
       std::map<std::string, std::string> m_headers;
    };
 

diff --git a/src/lib/x509/ocsp.h b/src/lib/x509/ocsp.h
@@ -14,6 +14,7 @@
 #include <botan/bigint.h>
 
 #include <chrono>
+#include <span>
 #include <optional>
 
 namespace Botan {
@@ -148,7 +149,7 @@ class BOTAN_PUBLIC_API(2,0) Response final
       * Parses an OCSP response.
       * @param response_bits response bits received
       */
-      Response(const std::vector<uint8_t>& response_bits) :
+      Response(std::span<const uint8_t> response_bits) :
          Response(response_bits.data(), response_bits.size())
          {}
 

diff --git a/src/lib/x509/x509_crl.cpp b/src/lib/x509/x509_crl.cpp
@@ -43,7 +43,7 @@ X509_CRL::X509_CRL(DataSource& src)
    load_data(src);
    }
 
-X509_CRL::X509_CRL(const std::vector<uint8_t>& vec)
+X509_CRL::X509_CRL(std::span<const uint8_t> vec)
    {
    DataSource_Memory src(vec.data(), vec.size());
    load_data(src);

diff --git a/src/lib/x509/x509_crl.h b/src/lib/x509/x509_crl.h
@@ -12,6 +12,7 @@
 #include <botan/asn1_obj.h>
 #include <botan/pkix_enums.h>
 #include <vector>
+#include <span>
 
 namespace Botan {
 
@@ -166,7 +167,7 @@ class BOTAN_PUBLIC_API(2,0) X509_CRL final : public X509_Object
       * Construct a CRL from a binary vector
       * @param vec the binary (DER) representation of the CRL
       */
-      X509_CRL(const std::vector<uint8_t>& vec);
+      X509_CRL(std::span<const uint8_t> vec);
 
       /**
       * Construct a CRL