From 3bb17150aa4bff7f0ac3d00e20ce89133e281a71 Mon Sep 17 00:00:00 2001
From: Jonathan Schleifer <js@nil.im>
Date: Wed, 28 Apr 2021 21:51:03 +0000
Subject: [PATCH] Adjust to ObjFW changes

FossilOrigin-Name: aec6746a96f92e9bed68663cf775bf229bcdb3930f4a689b3b8b68c27fe29868
---
 CryptoPassphrase.m        | 33 +++++++++++++++------------------
 LegacyPasswordGenerator.m |  4 ++--
 NewPasswordGenerator.m    |  4 ++--
 3 files changed, 19 insertions(+), 22 deletions(-)

diff --git a/CryptoPassphrase.m b/CryptoPassphrase.m
index f3d9a0e..0c532c5 100644
--- a/CryptoPassphrase.m
+++ b/CryptoPassphrase.m
@@ -50,7 +50,7 @@ showHelp(OFStream *output, bool verbose)
 - (void)applicationDidFinishLaunching
 {
 	OFString *keyFilePath, *lengthString;
-	const of_options_parser_option_t options[] = {
+	const OFOptionsParserOption options[] = {
 		{ 'h', @"help", 0, NULL, NULL },
 		{ 'k', @"keyfile", 1, NULL, &keyFilePath },
 		{ 'l', @"length", 1, NULL, &lengthString },
@@ -60,7 +60,7 @@ showHelp(OFStream *output, bool verbose)
 	};
 	OFOptionsParser *optionsParser =
 	    [OFOptionsParser parserWithOptions: options];
-	of_unichar_t option;
+	OFUnichar option;
 	OFMutableData *keyFile = nil;
 	OFString *prompt;
 	const char *promptCString;
@@ -71,19 +71,19 @@ showHelp(OFStream *output, bool verbose)
 	while ((option = [optionsParser nextOption]) != '\0') {
 		switch (option) {
 		case 'h':
-			showHelp(of_stdout, true);
+			showHelp(OFStdOut, true);
 
 			[OFApplication terminate];
 
 			break;
 		case ':':
 			if (optionsParser.lastLongOption != nil)
-				[of_stderr writeFormat:
+				[OFStdErr writeFormat:
 				    @"%@: Argument for option --%@ missing\n",
 				    [OFApplication programName],
 				    optionsParser.lastLongOption];
 			else
-				[of_stderr writeFormat:
+				[OFStdErr writeFormat:
 				    @"%@: Argument for option -%C missing\n",
 				    [OFApplication programName],
 				    optionsParser.lastOption];
@@ -92,12 +92,12 @@ showHelp(OFStream *output, bool verbose)
 			break;
 		case '?':
 			if (optionsParser.lastLongOption != nil)
-				[of_stderr writeFormat:
+				[OFStdErr writeFormat:
 				    @"%@: Unknown option: --%@\n",
 				    [OFApplication programName],
 				    optionsParser.lastLongOption];
 			else
-				[of_stderr writeFormat:
+				[OFStdErr writeFormat:
 				    @"%@: Unknown option: -%C\n",
 				    [OFApplication programName],
 				    optionsParser.lastOption];
@@ -108,7 +108,7 @@ showHelp(OFStream *output, bool verbose)
 	}
 
 	if (optionsParser.remainingArguments.count != 1) {
-		showHelp(of_stderr, false);
+		showHelp(OFStdErr, false);
 
 		[OFApplication terminateWithStatus: 1];
 	}
@@ -136,7 +136,7 @@ showHelp(OFStream *output, bool verbose)
 		}
 
 		if (invalid) {
-			[of_stderr writeFormat:
+			[OFStdErr writeFormat:
 			    @"%@: Invalid length: %@\n",
 			    [OFApplication programName], lengthString];
 
@@ -159,11 +159,11 @@ showHelp(OFStream *output, bool verbose)
 		memcpy(passphrase.mutableItems, passphraseCString,
 		    passphraseLength + 1);
 	} @finally {
-		of_explicit_memset(passphraseCString, '\0', passphraseLength);
+		OFZeroMemory(passphraseCString, passphraseLength);
 	}
 
 	if (_repeat) {
-		of_string_encoding_t encoding = [OFLocale encoding];
+		OFStringEncoding encoding = [OFLocale encoding];
 
 		prompt = [OFString stringWithFormat:
 		    @"Repeat passphrase for site \"%@\": ", generator.site];
@@ -171,22 +171,19 @@ showHelp(OFStream *output, bool verbose)
 		    getpass([prompt cStringWithEncoding: encoding]);
 
 		if (strcmp(passphraseCString, passphrase.items) != 0) {
-			[of_stderr writeString: @"Passphrases do not match!\n"];
+			[OFStdErr writeString: @"Passphrases do not match!\n"];
 			[OFApplication terminateWithStatus: 1];
 		}
 
-		of_explicit_memset(passphraseCString, '\0',
-		    strlen(passphraseCString));
+		OFZeroMemory(passphraseCString, strlen(passphraseCString));
 	}
 
 	generator.keyFile = keyFile;
 	generator.passphrase = passphrase;
 
 	[generator derivePassword];
-	[of_stdout writeBuffer: generator.output.items
-			length: generator.length];
-	[of_stdout writeBuffer: "\n"
-			length: 1];
+	[OFStdOut writeBuffer: generator.output.items length: generator.length];
+	[OFStdOut writeBuffer: "\n" length: 1];
 
 	[OFApplication terminate];
 }
diff --git a/LegacyPasswordGenerator.m b/LegacyPasswordGenerator.m
index be35242..419e854 100644
--- a/LegacyPasswordGenerator.m
+++ b/LegacyPasswordGenerator.m
@@ -56,7 +56,7 @@
 - (void)derivePassword
 {
 	OFSHA256Hash *siteHash = [OFSHA256Hash
-	    cryptoHashWithAllowsSwappableMemory: true];
+	    hashWithAllowsSwappableMemory: true];
 	size_t passphraseLength, combinedPassphraseLength;
 	OFSecureData *combinedPassphrase;
 	char *combinedPassphraseItems;
@@ -89,7 +89,7 @@
 		    _keyFile.items, _keyFile.count);
 
 	outputItems = _output.mutableItems;
-	of_scrypt((of_scrypt_parameters_t){
+	OFScrypt((OFScryptParameters){
 		.blockSize             = 8,
 		.costFactor            = 524288,
 		.parallelization       = 2,
diff --git a/NewPasswordGenerator.m b/NewPasswordGenerator.m
index 6890bb5..f7a3c01 100644
--- a/NewPasswordGenerator.m
+++ b/NewPasswordGenerator.m
@@ -43,7 +43,7 @@
 - (void)derivePassword
 {
 	OFSHA384Hash *siteHash = [OFSHA384Hash
-	    cryptoHashWithAllowsSwappableMemory: true];
+	    hashWithAllowsSwappableMemory: true];
 	size_t passphraseLength, combinedPassphraseLength;
 	OFSecureData *combinedPassphrase;
 	char *combinedPassphraseItems;
@@ -76,7 +76,7 @@
 		    _keyFile.items, _keyFile.count);
 
 	outputItems = _output.mutableItems;
-	of_scrypt((of_scrypt_parameters_t){
+	OFScrypt((OFScryptParameters){
 		.blockSize             = 8,
 		.costFactor            = 524288,
 		.parallelization       = 2,