@@ -54,11 +54,11 @@
 }
 
 - (void)derivePassword
 {
 	OFSHA256Hash *siteHash = [OFSHA256Hash
-	    cryptoHashWithAllowsSwappableMemory: true];
+	    hashWithAllowsSwappableMemory: true];
 	size_t passphraseLength, combinedPassphraseLength;
 	OFSecureData *combinedPassphrase;
 	char *combinedPassphraseItems;
 	unsigned char *outputItems;
 
@@ -87,11 +87,11 @@
 	if (_keyFile != nil)
 		memcpy(combinedPassphraseItems + passphraseLength,
 		    _keyFile.items, _keyFile.count);
 
 	outputItems = _output.mutableItems;
-	of_scrypt((of_scrypt_parameters_t){
+	OFScrypt((OFScryptParameters){
 		.blockSize             = 8,
 		.costFactor            = 524288,
 		.parallelization       = 2,
 		.salt                  = siteHash.digest,
 		.saltLength            = [siteHash.class digestSize],