diff options
| author | Jeff Garzik <jeff@garzik.org> | 2012-04-15 17:00:20 -0400 |
|---|---|---|
| committer | Jeff Garzik <jgarzik@redhat.com> | 2012-04-15 17:00:20 -0400 |
| commit | 9fb89c26f3a3991d197b207f44ef79b1d16c26fc (patch) | |
| tree | fdb5e70ffc5dc058955f76c51648e364f054444a | |
| parent | 0dd710acb6ae14bb88b33a9f86c549bdbb4b6975 (diff) | |
Fix misc. minor sign-comparison warnings
| -rw-r--r-- | src/base58.h | 2 | ||||
| -rw-r--r-- | src/crypter.cpp | 2 | ||||
| -rw-r--r-- | src/key.h | 4 |
3 files changed, 4 insertions, 4 deletions
diff --git a/src/base58.h b/src/base58.h index 7fefbc5d74..90ce34b05b 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 83041addb4..2501305edc 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); @@ -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<unsigned char> 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<unsigned char> vchPubKey(nSize, 0); |