From 9fb89c26f3a3991d197b207f44ef79b1d16c26fc Mon Sep 17 00:00:00 2001 From: Jeff Garzik Date: Sun, 15 Apr 2012 17:00:20 -0400 Subject: [PATCH] Fix misc. minor sign-comparison warnings --- src/base58.h | 2 +- src/crypter.cpp | 2 +- src/key.h | 4 ++-- 3 files changed, 4 insertions(+), 4 deletions(-) diff --git a/src/base58.h b/src/base58.h index 7fefbc5d7..90ce34b05 100644 --- a/src/base58.h +++ b/src/base58.h @@ -288,7 +288,7 @@ public: bool IsValid() const { - int nExpectedSize = 20; + unsigned int nExpectedSize = 20; bool fExpectTestNet = false; switch(nVersion) { diff --git a/src/crypter.cpp b/src/crypter.cpp index 83041addb..2501305ed 100644 --- a/src/crypter.cpp +++ b/src/crypter.cpp @@ -31,7 +31,7 @@ bool CCrypter::SetKeyFromPassphrase(const SecureString& strKeyData, const std::v i = EVP_BytesToKey(EVP_aes_256_cbc(), EVP_sha512(), &chSalt[0], (unsigned char *)&strKeyData[0], strKeyData.size(), nRounds, chKey, chIV); - if (i != WALLET_CRYPTO_KEY_SIZE) + if (i != (int)WALLET_CRYPTO_KEY_SIZE) { memset(&chKey, 0, sizeof chKey); memset(&chIV, 0, sizeof chIV); diff --git a/src/key.h b/src/key.h index b8fc0cd77..8f220f1c7 100644 --- a/src/key.h +++ b/src/key.h @@ -173,7 +173,7 @@ public: CPrivKey GetPrivKey() const { - unsigned int nSize = i2d_ECPrivateKey(pkey, NULL); + int nSize = i2d_ECPrivateKey(pkey, NULL); if (!nSize) throw key_error("CKey::GetPrivKey() : i2d_ECPrivateKey failed"); CPrivKey vchPrivKey(nSize, 0); @@ -196,7 +196,7 @@ public: std::vector GetPubKey() const { - unsigned int nSize = i2o_ECPublicKey(pkey, NULL); + int nSize = i2o_ECPublicKey(pkey, NULL); if (!nSize) throw key_error("CKey::GetPubKey() : i2o_ECPublicKey failed"); std::vector vchPubKey(nSize, 0);