Merge pull request #3176 from Diapolo/key

gavinandresen · gavinandresen · commit 42a12f22d6b6 · 2013-10-30T01:03:25.000-07:00
fix wrong memcmp() usage in CKey::operator==
diff --git a/src/key.h b/src/key.h
@@ -205,7 +205,8 @@ class CKey {
     }
 
     friend bool operator==(const CKey &a, const CKey &b) {
-        return a.fCompressed == b.fCompressed && memcmp(&a.vch[0], &b.vch[0], 32);
+        return a.fCompressed == b.fCompressed && a.size() == b.size() &&
+               memcmp(&a.vch[0], &b.vch[0], a.size()) == 0;
     }
 
     // Initialize using begin and end iterators to byte data.
@@ -261,9 +262,9 @@ class CKey {
 
     // Derive BIP32 child key.
     bool Derive(CKey& keyChild, unsigned char ccChild[32], unsigned int nChild, const unsigned char cc[32]) const;
-    
+
     // Load private key and check that public key matches.
-    bool Load(CPrivKey &privkey, CPubKey &vchPubKey, bool fSkipCheck);  
+    bool Load(CPrivKey &privkey, CPubKey &vchPubKey, bool fSkipCheck);
 };
 
 struct CExtPubKey {
