@@ -492,16 +492,13 @@
 	return glue_of_zip_archive_entry_extra_field_find(
 	    extraField, tag, size);
 }
 
 void
-of_pbkdf2(OFHMAC *HMAC, size_t iterations, const unsigned char *salt,
-    size_t saltLength, const char *password, size_t passwordLength,
-    unsigned char *key, size_t keyLength, bool allowsSwappableMemory)
+of_pbkdf2(of_pbkdf2_parameters_t param)
 {
-	glue_of_pbkdf2(HMAC, iterations, salt, saltLength,
-	    password, passwordLength, key, keyLength, allowsSwappableMemory);
+	glue_of_pbkdf2(&param);
 }
 
 void
 of_salsa20_8_core(uint32_t *buffer)
 {
@@ -520,17 +517,13 @@
 {
 	glue_of_scrypt_romix(buffer, blockSize, costFactor, tmp);
 }
 
 void
-of_scrypt(size_t blockSize, size_t costFactor, size_t parallelization,
-    const unsigned char *salt, size_t saltLength, const char *password,
-    size_t passwordLength, unsigned char *key, size_t keyLength,
-    bool allowsSwappableMemory)
+of_scrypt(of_scrypt_parameters_t param)
 {
-	glue_of_scrypt(blockSize, costFactor, parallelization, salt, saltLength,
-	    password, passwordLength, key, keyLength, allowsSwappableMemory);
+	glue_of_scrypt(&param);
 }
 
 const char *
 of_strptime(const char *buf, const char *fmt, struct tm *tm, int16_t *tz)
 {