Index: src/amiga-glue.m
==================================================================
--- src/amiga-glue.m
+++ src/amiga-glue.m
@@ -227,27 +227,15 @@
 
 	return of_zip_archive_entry_extra_field_find(extraField, tag, size);
 }
 
 void __saveds
-glue_of_pbkdf2 PPC_PARAMS(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)
-{
-	M68K_ARG(OFHMAC *, HMAC, a0)
-	M68K_ARG(size_t, iterations, d0)
-	M68K_ARG(const unsigned char *, salt, a1)
-	M68K_ARG(size_t, saltLength, d1)
-	M68K_ARG(const char *, password, a2)
-	M68K_ARG(size_t, passwordLength, d2)
-	M68K_ARG(unsigned char *, key, a3)
-	M68K_ARG(size_t, keyLength, d3)
-	M68K_ARG(bool, allowsSwappableMemory, d4)
-
-	of_pbkdf2(HMAC, iterations, salt, saltLength, password, passwordLength,
-	    key, keyLength, allowsSwappableMemory);
+glue_of_pbkdf2 PPC_PARAMS(const of_pbkdf2_parameters_t *param)
+{
+	M68K_ARG(const of_pbkdf2_parameters_t *, param, a0)
+
+	of_pbkdf2(*param);
 }
 
 void __saveds
 glue_of_salsa20_8_core PPC_PARAMS(uint32_t *buffer)
 {
@@ -278,28 +266,15 @@
 
 	of_scrypt_romix(buffer, blockSize, costFactor, tmp);
 }
 
 void __saveds
-glue_of_scrypt PPC_PARAMS(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)
-{
-	M68K_ARG(size_t, blockSize, d0)
-	M68K_ARG(size_t, costFactor, d1)
-	M68K_ARG(size_t, parallelization, d2)
-	M68K_ARG(const unsigned char *, salt, a0)
-	M68K_ARG(size_t, saltLength, d3)
-	M68K_ARG(const char *, password, a1)
-	M68K_ARG(size_t, passwordLength, d4)
-	M68K_ARG(unsigned char *, key, a2)
-	M68K_ARG(size_t, keyLength, d5)
-	M68K_ARG(bool, allowsSwappableMemory, d6)
-
-	of_scrypt(blockSize, costFactor, parallelization, salt, saltLength,
-	    password, passwordLength, key, keyLength, allowsSwappableMemory);
+glue_of_scrypt PPC_PARAMS(const of_scrypt_parameters_t *param)
+{
+	M68K_ARG(const of_scrypt_parameters_t *, param, a0)
+
+	of_scrypt(*param);
 }
 
 const char *__saveds
 glue_of_strptime PPC_PARAMS(const char *buf, const char *fmt, struct tm *tm,
     int16_t *tz)

Index: src/amigaos3.sfd
==================================================================
--- src/amigaos3.sfd
+++ src/amigaos3.sfd
@@ -23,15 +23,15 @@
 size_t glue_of_string_utf16_length(const of_char16_t *string)(a0)
 size_t glue_of_string_utf32_length(const of_char32_t *string)(a0)
 OFString *_Nonnull glue_of_zip_archive_entry_version_to_string(uint16_t version)(d0)
 OFString *_Nonnull glue_of_zip_archive_entry_compression_method_to_string(uint16_t compressionMethod)(d0)
 size_t glue_of_zip_archive_entry_extra_field_find(OFData *extraField, uint16_t tag, uint16_t *size)(a0,d0,a1)
-void glue_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)(a0,d0,a1,d1,a2,d2,a3,d3,d4)
+void glue_of_pbkdf2(const of_pbkdf2_parameters_t *param)(a0)
 void glue_of_salsa20_8_core(uint32_t *_Nonnull buffer)(a0)
 void glue_of_scrypt_block_mix(uint32_t *_Nonnull output, const uint32_t *_Nonnull input, size_t blockSize)(a0,a1,d0)
 void glue_of_scrypt_romix(uint32_t *buffer, size_t blockSize, size_t costFactor, uint32_t *tmp)(a0,d0,d1,a1)
-void glue_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)(d0,d1,d2,a0,d3,a1,d4,a2,d5,d6)
+void glue_of_scrypt(const of_scrypt_parameters_t *param)(a0)
 const char *_Nullable glue_of_strptime(const char *buf, const char *fmt, struct tm *tm, int16_t *_Nullable tz)(a0,a1,a2,a3)
 void glue_of_socket_address_parse_ip(of_socket_address_t *_Nonnull address, OFString *IP, uint16_t port)(a0,a1,d0)
 void glue_of_socket_address_parse_ipv4(of_socket_address_t *_Nonnull address, OFString *IP, uint16_t port)(a0,a1,d0)
 void glue_of_socket_address_parse_ipv6(of_socket_address_t *_Nonnull address, OFString *IP, uint16_t port)(a0,a1,d0)
 void glue_of_socket_address_ipx(of_socket_address_t *_Nonnull address, const unsigned char *_Nonnull node, uint32_t network, uint16_t port)(a0,a1,d0,d1)

Index: src/linklib/linklib.m
==================================================================
--- src/linklib/linklib.m
+++ src/linklib/linklib.m
@@ -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)
 {