pkcs5: Rename kdf_t to avoid conflict

diff --git a/src/libstrongswan/crypto/pkcs5.c b/src/libstrongswan/crypto/pkcs5.c
index e7677a9c19c1a25391c5e757104e3f3c41e9569f..b3f1acd67fc04af4c1731a9204b8af9282ff163e 100644 (file)
--- a/src/libstrongswan/crypto/pkcs5.c
+++ b/src/libstrongswan/crypto/pkcs5.c
@@ -131,7 +131,7 @@ static bool verify_padding(crypter_t *crypter, chunk_t *blob)
 /**
  * Prototype for key derivation functions.
  */
-typedef bool (*kdf_t)(private_pkcs5_t *this, chunk_t password, chunk_t key);
+typedef bool (*derive_t)(private_pkcs5_t *this, chunk_t password, chunk_t key);
 
 /**
  * Try to decrypt the given data with the given password using the given
@@ -139,7 +139,7 @@ typedef bool (*kdf_t)(private_pkcs5_t *this, chunk_t password, chunk_t key);
  * to, key and iv point to the actual keys and initialization vectors resp.
  */
 static bool decrypt_generic(private_pkcs5_t *this, chunk_t password,
-                                                       chunk_t data, chunk_t *decrypted, kdf_t kdf,
+                                                       chunk_t data, chunk_t *decrypted, derive_t kdf,
                                                        chunk_t keymat, chunk_t key, chunk_t iv)
 {
        if (!kdf(this, password, keymat))
@@ -341,7 +341,7 @@ METHOD(pkcs5_t, decrypt, bool,
        private_pkcs5_t *this, chunk_t password, chunk_t data, chunk_t *decrypted)
 {
        chunk_t keymat, key, iv;
-       kdf_t kdf;
+       derive_t kdf;
 
        if (!ensure_crypto_primitives(this, data) || !decrypted)
        {