summaryrefslogtreecommitdiff
path: root/src/keyDerivation.cpp
diff options
context:
space:
mode:
authorChristian Pointner <equinox@anytun.org>2010-01-07 15:05:50 +0000
committerChristian Pointner <equinox@anytun.org>2010-01-07 15:05:50 +0000
commit9670eb99379b4293f8eb4039e65d6633aa495650 (patch)
tree2cdc4bd8bf42b9d7b86c807ce0cc96ea4b0682e9 /src/keyDerivation.cpp
parentdisable signal controller for FreeBSD. this needs some more works. (diff)
added visual studio build targets with gcrypt
Diffstat (limited to 'src/keyDerivation.cpp')
-rw-r--r--src/keyDerivation.cpp4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/keyDerivation.cpp b/src/keyDerivation.cpp
index 6b102b9..25b7cf0 100644
--- a/src/keyDerivation.cpp
+++ b/src/keyDerivation.cpp
@@ -79,7 +79,7 @@ void KeyDerivation::calcMasterKey(std::string passphrase, u_int16_t length)
}
#ifndef USE_SSL_CRYPTO
- Buffer digest(gcry_md_get_algo_dlen(GCRY_MD_SHA256));
+ Buffer digest(static_cast<u_int32_t>(gcry_md_get_algo_dlen(GCRY_MD_SHA256)));
gcry_md_hash_buffer(GCRY_MD_SHA256, digest.getBuf(), passphrase.c_str(), passphrase.length());
#else
Buffer digest(u_int32_t(SHA256_DIGEST_LENGTH));
@@ -108,7 +108,7 @@ void KeyDerivation::calcMasterSalt(std::string passphrase, u_int16_t length)
}
#ifndef USE_SSL_CRYPTO
- Buffer digest(gcry_md_get_algo_dlen(GCRY_MD_SHA1));
+ Buffer digest(static_cast<u_int32_t>(gcry_md_get_algo_dlen(GCRY_MD_SHA1)));
gcry_md_hash_buffer(GCRY_MD_SHA1, digest.getBuf(), passphrase.c_str(), passphrase.length());
#else
Buffer digest(u_int32_t(SHA_DIGEST_LENGTH));