Revert part of questionable Monero #3999- constant time

blur-network · May 6, 2020 · 54b839d · 54b839d
1 parent c3f36c1
commit 54b839d
Show file tree

Hide file tree

Showing 3 changed files with 10 additions and 31 deletions.
diff --git a/src/crypto/crypto.h b/src/crypto/crypto.h
@@ -283,6 +283,6 @@ namespace crypto {
 }
 
 CRYPTO_MAKE_HASHABLE(public_key)
-CRYPTO_MAKE_HASHABLE_CONSTANT_TIME(secret_key)
+CRYPTO_MAKE_HASHABLE(secret_key)
 CRYPTO_MAKE_HASHABLE(key_image)
 CRYPTO_MAKE_COMPARABLE(signature)
diff --git a/src/crypto/generic-ops.h b/src/crypto/generic-ops.h
@@ -33,30 +33,19 @@
 #include <cstddef>
 #include <cstring>
 #include <functional>
-#include <sodium/crypto_verify_32.h>
 
 #define CRYPTO_MAKE_COMPARABLE(type) \
 namespace crypto { \
   inline bool operator==(const type &_v1, const type &_v2) { \
-    return !memcmp(&_v1, &_v2, sizeof(_v1)); \
+    return std::memcmp(&_v1, &_v2, sizeof(type)) == 0; \
   } \
   inline bool operator!=(const type &_v1, const type &_v2) { \
-    return !operator==(_v1, _v2); \
+    return std::memcmp(&_v1, &_v2, sizeof(type)) != 0; \
   } \
 }
 
-#define CRYPTO_MAKE_COMPARABLE_CONSTANT_TIME(type) \
-namespace crypto { \
-  inline bool operator==(const type &_v1, const type &_v2) { \
-    static_assert(sizeof(_v1) == 32, "constant time comparison is only implenmted for 32 bytes"); \
-    return crypto_verify_32((const unsigned char*)&_v1, (const unsigned char*)&_v2) == 0; \
-  } \
-  inline bool operator!=(const type &_v1, const type &_v2) { \
-    return !operator==(_v1, _v2); \
-  } \
-}
-
-#define CRYPTO_DEFINE_HASH_FUNCTIONS(type) \
+#define CRYPTO_MAKE_HASHABLE(type) \
+CRYPTO_MAKE_COMPARABLE(type) \
 namespace crypto { \
   static_assert(sizeof(std::size_t) <= sizeof(type), "Size of " #type " must be at least that of size_t"); \
   inline std::size_t hash_value(const type &_v) { \
@@ -71,12 +60,3 @@ namespace std { \
     } \
   }; \
 }
-
-#define CRYPTO_MAKE_HASHABLE(type) \
-CRYPTO_MAKE_COMPARABLE(type) \
-CRYPTO_DEFINE_HASH_FUNCTIONS(type)
-
-#define CRYPTO_MAKE_HASHABLE_CONSTANT_TIME(type) \
-CRYPTO_MAKE_COMPARABLE_CONSTANT_TIME(type) \
-CRYPTO_DEFINE_HASH_FUNCTIONS(type)
-
diff --git a/src/ringct/rctTypes.h b/src/ringct/rctTypes.h
@@ -36,7 +36,6 @@
 #include <vector>
 #include <iostream>
 #include <cinttypes>
-#include <sodium/crypto_verify_32.h>
 
 extern "C" {
 #include "crypto/crypto-ops.h"
@@ -82,7 +81,7 @@ namespace rct {
         unsigned char operator[](int i) const {
             return bytes[i];
         }
-        bool operator==(const key &k) const { return !crypto_verify_32(bytes, k.bytes); }
+        bool operator==(const key &k) const { return !memcmp(bytes, k.bytes, sizeof(bytes)); }
         unsigned char bytes[32];
     };
     typedef std::vector<key> keyV; //vector of keys
@@ -521,10 +520,10 @@ namespace rct {
 
 
 namespace cryptonote {
-    static inline bool operator==(const crypto::public_key &k0, const rct::key &k1) { return !crypto_verify_32((const unsigned char*)&k0, k1.bytes); }
-    static inline bool operator!=(const crypto::public_key &k0, const rct::key &k1) { return crypto_verify_32((const unsigned char*)&k0, k1.bytes); }
-    static inline bool operator==(const crypto::secret_key &k0, const rct::key &k1) { return !crypto_verify_32((const unsigned char*)&k0, k1.bytes); }
-    static inline bool operator!=(const crypto::secret_key &k0, const rct::key &k1) { return crypto_verify_32((const unsigned char*)&k0, k1.bytes); }
+    static inline bool operator==(const crypto::public_key &k0, const rct::key &k1) { return !memcmp(&k0, &k1, 32); }
+    static inline bool operator!=(const crypto::public_key &k0, const rct::key &k1) { return memcmp(&k0, &k1, 32); }
+    static inline bool operator==(const crypto::secret_key &k0, const rct::key &k1) { return !memcmp(&k0, &k1, 32); }
+    static inline bool operator!=(const crypto::secret_key &k0, const rct::key &k1) { return memcmp(&k0, &k1, 32); }
 }
 
 namespace rct {