fix up salt for pbkdf2

diff --git a/pdns/ipcipher.cc b/pdns/ipcipher.cc
index 963f11509aa869dfaa26368671662551374f05f4..5d5230638715101d4b2d9a4733d33388dc0c6a98 100644 (file)
--- a/pdns/ipcipher.cc
+++ b/pdns/ipcipher.cc
@@ -10,9 +10,10 @@ int PKCS5_PBKDF2_HMAC_SHA1(const char *pass, int passlen,
 */
 std::string makeIPCipherKey(const std::string& password)
 {
-  static const char* salt="ipcryptipcrypt";
+  static const char salt[]="ipcryptipcrypt";
   unsigned char out[16];
-  PKCS5_PBKDF2_HMAC_SHA1(password.c_str(), password.size(), (const unsigned char*)salt, sizeof(salt), 50000, sizeof(out), out);
+
+  PKCS5_PBKDF2_HMAC_SHA1(password.c_str(), password.size(), (const unsigned char*)salt, sizeof(salt)-1, 50000, sizeof(out), out);
 
   return std::string((const char*)out, (const char*)out + sizeof(out));
 }