Hash x

src/crypto/SecretKey.cpp

@@ -14,6 +14,7 @@
 #include "util/HashOfHash.h"
 #include <mutex>
 #include "main/Config.h"
+#include "transactions/SignatureUtils.h"
 #include "util/lrucache.hpp"
 
 namespace stellar
@@ -327,16 +328,13 @@ PubKeyUtils::verifySig(PublicKey const& key, Signature const& signature,
 SignatureHint
 PubKeyUtils::getHint(PublicKey const& pk)
 {
-    SignatureHint res;
-    memcpy(res.data(), &pk.ed25519().back() - res.size() + 1, res.size());
-    return res;
+    return SignatureUtils::getHint(pk.ed25519());
 }
 
 bool
 PubKeyUtils::hasHint(PublicKey const& pk, SignatureHint const& hint)
 {
-    return memcmp(&pk.ed25519().back() - hint.size() + 1, hint.data(),
-                  hint.size()) == 0;
+    return SignatureUtils::hasHint(pk.ed25519(), hint);
 }
 
 PublicKey

src/transactions/SignatureUtils.cpp

@@ -51,6 +51,25 @@ verifyHashX(DecoratedSignature const& sig, SignerKey const& signerKey)
     return signerKey.hashX() == hash;
 }
 
+SignatureHint getHint(ByteSlice const& bs)
+{
+    SignatureHint res;
+    memcpy(res.data(), bs.end() - res.size(), res.size());
+    return res;
+}
+
+bool
+hasHint(ByteSlice const& bs, SignatureHint const& hint)
+{
+    if (bs.size() < hint.size())
+    {
+        return false;
+    }
+
+    return memcmp(bs.end() - hint.size(), hint.data(),
+                  hint.size()) == 0;
+}
+
 }
 
 }

src/transactions/SignatureUtils.h

@@ -23,6 +23,9 @@ bool verify(DecoratedSignature const& sig, SignerKey const& signerKey, Hash cons
 DecoratedSignature signHashX(const ByteSlice &x);
 bool verifyHashX(DecoratedSignature const& sig, SignerKey const& signerKey);
 
+SignatureHint getHint(ByteSlice const& bs);
+bool hasHint(ByteSlice const& bs, SignatureHint const& hint);
+
 }
 
 }