OpenSSL: Silence a compiler warning with OpenSSL 0.9.7

The PKCS5_PBKDF2_HMAC_SHA1() function in OpenSSL 0.9.7 did not mark
the salt parameter const even though it was not modified. Hide the
compiler warning with a type cast when an old OpenSSL version is
used.

Signed-hostap: Jouni Malinen <j@w1.fi>

diff --git a/src/crypto/crypto_openssl.c b/src/crypto/crypto_openssl.c
index 24e4fb7a8d5a644014001dcabbd572d99c91b5fc..5cc32d1651836c0177fd2ebb159ebc419da02474 100644 (file)
--- a/src/crypto/crypto_openssl.c
+++ b/src/crypto/crypto_openssl.c
@@ -698,9 +698,16 @@ int crypto_hash_finish(struct crypto_hash *ctx, u8 *mac, size_t *len)
 int pbkdf2_sha1(const char *passphrase, const u8 *ssid, size_t ssid_len,
                int iterations, u8 *buf, size_t buflen)
 {
+#if OPENSSL_VERSION_NUMBER < 0x00908000
+       if (PKCS5_PBKDF2_HMAC_SHA1(passphrase, os_strlen(passphrase),
+                                  (unsigned char *) ssid,
+                                  ssid_len, 4096, buflen, buf) != 1)
+               return -1;
+#else /* openssl < 0.9.8 */
        if (PKCS5_PBKDF2_HMAC_SHA1(passphrase, os_strlen(passphrase), ssid,
                                   ssid_len, 4096, buflen, buf) != 1)
                return -1;
+#endif /* openssl < 0.9.8 */
        return 0;
 }