@@ -1,7 +1,7 @@
 /*
- * Copyright (c) 2008-2021 Jonathan Schleifer <js@nil.im>
+ * Copyright (c) 2008-2022 Jonathan Schleifer <js@nil.im>
  *
  * All rights reserved.
  *
  * This file is part of ObjFW. It may be distributed under the terms of the
  * Q Public License 1.0, which can be found in the file LICENSE.QPL included in
@@ -17,11 +17,11 @@
 
 #include <string.h>
 
 #import "TestsAppDelegate.h"
 
-static OFString *module = @"scrypt";
+static OFString *const module = @"OFScrypt";
 /* Test vectors form RFC 7914 */
 static const unsigned char salsa20Input[64] = {
 	0x7E, 0x87, 0x9A, 0x21, 0x4F, 0x3E, 0xC9, 0x86, 0x7C, 0xA9, 0x40, 0xE6,
 	0x41, 0x71, 0x8F, 0x26, 0xBA, 0xEE, 0x55, 0x5B, 0x8C, 0x61, 0xC1, 0xB5,
 	0x0D, 0xF8, 0x46, 0x11, 0x6D, 0xCD, 0x3B, 0x1D, 0xEE, 0x24, 0xF3, 0x19,
@@ -108,18 +108,21 @@
 	0xE7, 0x73, 0x76, 0x63, 0x4B, 0x37, 0x31, 0x62, 0x2E, 0xAF, 0x30, 0xD9,
 	0x2E, 0x22, 0xA3, 0x88, 0x6F, 0xF1, 0x09, 0x27, 0x9D, 0x98, 0x30, 0xDA,
 	0xC7, 0x27, 0xAF, 0xB9, 0x4A, 0x83, 0xEE, 0x6D, 0x83, 0x60, 0xCB, 0xDF,
 	0xA2, 0xCC, 0x06, 0x40
 };
+/* The third test vector is too expensive for m68k. */
+#ifndef OF_M68K
 static const unsigned char testVector3[64] = {
 	0x70, 0x23, 0xBD, 0xCB, 0x3A, 0xFD, 0x73, 0x48, 0x46, 0x1C, 0x06, 0xCD,
 	0x81, 0xFD, 0x38, 0xEB, 0xFD, 0xA8, 0xFB, 0xBA, 0x90, 0x4F, 0x8E, 0x3E,
 	0xA9, 0xB5, 0x43, 0xF6, 0x54, 0x5D, 0xA1, 0xF2, 0xD5, 0x43, 0x29, 0x55,
 	0x61, 0x3F, 0x0F, 0xCF, 0x62, 0xD4, 0x97, 0x05, 0x24, 0x2A, 0x9A, 0xF9,
 	0xE6, 0x1E, 0x85, 0xDC, 0x0D, 0x65, 0x1E, 0x40, 0xDF, 0xCF, 0x01, 0x7B,
 	0x45, 0x57, 0x58, 0x87
 };
+#endif
 /* The forth test vector is too expensive to include it in the tests. */
 #if 0
 static const unsigned char testVector4[64] = {
 	0x21, 0x01, 0xCB, 0x9B, 0x6A, 0x51, 0x1A, 0xAE, 0xAD, 0xDB, 0xBE, 0x09,
 	0xCF, 0x70, 0xF8, 0x81, 0xEC, 0x56, 0x8D, 0x57, 0x4A, 0x2F, 0xFD, 0x4D,
@@ -128,11 +131,11 @@
 	0x37, 0x30, 0x40, 0x49, 0xE8, 0xA9, 0x52, 0xFB, 0xCB, 0xF4, 0x5C, 0x6F,
 	0xA7, 0x7A, 0x41, 0xA4
 };
 #endif
 
-@implementation TestsAppDelegate (ScryptTests)
+@implementation TestsAppDelegate (OFScryptTests)
 - (void)scryptTests
 {
 	void *pool = objc_autoreleasePoolPush();
 	uint32_t salsa20Buffer[16];
 	uint32_t blockMixBuffer[32];
@@ -179,10 +182,12 @@
 		.key                   = output,
 		.keyLength             = 64,
 		.allowsSwappableMemory = true
 	    })) && memcmp(output, testVector2, 64) == 0)
 
+	/* The third test vector is too expensive for m68k. */
+#ifndef OF_M68K
 	TEST(@"scrypt test vector #3",
 	    R(OFScrypt((OFScryptParameters){
 		.blockSize             = 8,
 		.costFactor            = 16384,
 		.parallelization       = 1,
@@ -192,10 +197,11 @@
 		.passwordLength        = 13,
 		.key                   = output,
 		.keyLength             = 64,
 		.allowsSwappableMemory = true
 	    })) && memcmp(output, testVector3, 64) == 0)
+#endif
 
 	/* The forth test vector is too expensive to include it in the tests. */
 #if 0
 	TEST(@"scrypt test vector #4",
 	    R(OFScrypt((OFScryptParameters){