More span

lief-project · Nov 11, 2023 · 002f356 · 002f356
1 parent 879c4c5
commit 002f356
Show file tree

Hide file tree

Showing 4 changed files with 6 additions and 5 deletions.
diff --git a/include/LIEF/MachO/VersionMin.hpp b/include/LIEF/MachO/VersionMin.hpp
@@ -55,7 +55,6 @@ class LIEF_API VersionMin : public LoadCommand {
   const version_t& sdk() const;
   void sdk(const version_t& sdk);
 
-
   void accept(Visitor& visitor) const override;
 
   std::ostream& print(std::ostream& os) const override;

diff --git a/include/LIEF/PE/signature/attributes/GenericType.hpp b/include/LIEF/PE/signature/attributes/GenericType.hpp
@@ -20,6 +20,7 @@
 
 #include "LIEF/visibility.h"
 #include "LIEF/errors.hpp"
+#include "LIEF/span.hpp"
 #include "LIEF/PE/signature/Attribute.hpp"
 #include "LIEF/PE/signature/types.hpp"
 
@@ -51,7 +52,7 @@ class LIEF_API GenericType : public Attribute {
   }
 
   //! Original DER blob of the attribute
-  const std::vector<uint8_t>& raw_content() const {
+  span<const uint8_t> raw_content() const {
     return raw_;
   }
 

diff --git a/include/LIEF/PE/signature/attributes/PKCS9MessageDigest.hpp b/include/LIEF/PE/signature/attributes/PKCS9MessageDigest.hpp
@@ -19,6 +19,7 @@
 #include "LIEF/visibility.h"
 #include "LIEF/errors.hpp"
 #include "LIEF/PE/signature/Attribute.hpp"
+#include "LIEF/span.hpp"
 
 #include <vector>
 
@@ -58,7 +59,7 @@ class LIEF_API PKCS9MessageDigest : public Attribute {
   std::unique_ptr<Attribute> clone() const override;
 
   //! Message digeset as a blob of bytes as described in the RFC
-  const std::vector<uint8_t>& digest() const {
+  span<const uint8_t> digest() const {
     return digest_;
   }
 

diff --git a/src/PE/signature/Signature.cpp b/src/PE/signature/Signature.cpp
@@ -132,7 +132,7 @@ Signature::VERIFICATION_FLAGS verify_ts_counter_signature(const SignerInfo& sign
     LIEF_WARN("Missing MessageDigest in authenticated attributes in the counter signature's signer");
     return flags | Signature::VERIFICATION_FLAGS::INVALID_SIGNER;
   }
-  const std::vector<uint8_t>& dg_value = message_dg->digest();
+  const std::vector<uint8_t>& dg_value = as_vector(message_dg->digest());
   const std::vector<uint8_t> dg_cs_hash = Signature::hash(signer.encrypted_digest(), cs_digest_algo);
   if (dg_value != dg_cs_hash) {
     LIEF_WARN("MessageDigest mismatch with Hash(signer ED)");
@@ -358,7 +358,7 @@ Signature::VERIFICATION_FLAGS Signature::check(VERIFICATION_CHECKS checks) const
 
     const auto& digest_attr = reinterpret_cast<const PKCS9MessageDigest&>(*it_pkcs9_digest);
     LIEF_DEBUG("pkcs9-message-digest:\n  {}\n  {}", hex_dump(digest_attr.digest()), hex_dump(content_info_hash));
-    if (digest_attr.digest() != content_info_hash) {
+    if (as_vector(digest_attr.digest()) != content_info_hash) {
       return flags | VERIFICATION_FLAGS::BAD_DIGEST;
     }
   } else {