CryptoPassphrase  Diff

Differences From Artifact [af2775fb50]:

To Artifact [d60a88125c]:


1
2

3
4

5
6
7
8
9
10
11
1

2
3

4
5
6
7
8
9
10
11

-
+

-
+







/*
 * Copyright (c) 2016 - 2019 Jonathan Schleifer <js@heap.zone>
 * Copyright (c) 2016 - 2020 Jonathan Schleifer <js@nil.im>
 *
 * https://heap.zone/git/cryptopassphrase.git
 * https://nil.im/git/cryptopassphrase.git
 *
 * Permission to use, copy, modify, and/or distribute this software for any
 * purpose with or without fee is hereby granted, provided that the above
 * copyright notice and this permission notice is present in all copies.
 *
 * THIS SOFTWARE IS PROVIDED BY THE COPYRIGHT HOLDERS AND CONTRIBUTORS "AS IS"
 * AND ANY EXPRESS OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
60
61
62
63
64
65
66
67



68
69
70
71
72
73
74
60
61
62
63
64
65
66

67
68
69
70
71
72
73
74
75
76







-
+
+
+







	};
	OFOptionsParser *optionsParser =
	    [OFOptionsParser parserWithOptions: options];
	of_unichar_t option;
	OFMutableData *keyFile = nil;
	OFString *prompt;
	const char *promptCString;
	char *passphrase;
	char *passphraseCString;
	size_t passphraseLength;
	OFSecureData *passphrase;

	while ((option = [optionsParser nextOption]) != '\0') {
		switch (option) {
		case 'h':
			showHelp(of_stdout, true);

			[OFApplication terminate];
139
140
141
142
143
144
145
146


147
148
149
150







151
152
153
154
155


156
157
158
159


160
161
162


163
164
165


166
167
168
169
170
171





172
173
174

175
176
177


178
179

180
181
182
183
184




185
186
187
188
189
190
191
192
193
194
195
196
197
198
199
141
142
143
144
145
146
147

148
149
150



151
152
153
154
155
156
157


158


159
160

161


162
163



164
165
166


167
168






169
170
171
172
173



174
175


176
177
178

179





180
181
182
183











184
185
186
187







-
+
+

-
-
-
+
+
+
+
+
+
+
-
-

-
-
+
+
-

-
-
+
+
-
-
-
+
+

-
-
+
+
-
-
-
-
-
-
+
+
+
+
+
-
-
-
+

-
-
+
+

-
+
-
-
-
-
-
+
+
+
+
-
-
-
-
-
-
-
-
-
-
-




	prompt = [OFString stringWithFormat: @"Passphrase for site \"%@\": ",
					     generator.site];
	promptCString = [prompt cStringWithEncoding: [OFLocale encoding]];

	if (keyFilePath != nil)
		keyFile = [OFMutableData dataWithContentsOfFile: keyFilePath];

	passphrase = getpass(promptCString);
	passphraseCString = getpass(promptCString);
	passphraseLength = strlen(passphraseCString);
	@try {
		if (_repeat) {
			char *passphraseCopy = of_strdup(passphrase);

		passphrase = [OFSecureData dataWithCount: passphraseLength + 1
				   allowsSwappableMemory: false];
		memcpy(passphrase.mutableItems, passphraseCString,
		    passphraseLength + 1);
	} @finally {
		of_explicit_memset(passphraseCString, '\0', passphraseLength);
	}
			if (passphraseCopy == NULL)
				@throw [OFOutOfMemoryException exception];

			@try {
				of_string_encoding_t encoding =
	if (_repeat) {
		of_string_encoding_t encoding = [OFLocale encoding];
				    [OFLocale encoding];

				prompt = [OFString stringWithFormat:
				    @"Repeat passphrase for site \"%@\": ",
		prompt = [OFString stringWithFormat:
		    @"Repeat passphrase for site \"%@\": ", generator.site];
				    generator.site];
				passphrase = getpass(
				    [prompt cStringWithEncoding: encoding]);
		passphraseCString =
		    getpass([prompt cStringWithEncoding: encoding]);

				if (strcmp(passphrase, passphraseCopy) != 0) {
					[of_stderr writeString:
		if (strcmp(passphraseCString, passphrase.items) != 0) {
			[of_stderr writeString: @"Passphrases do not match!\n"];
					    @"Passphrases do not match!\n"];
					[OFApplication terminateWithStatus: 1];
				}
			} @finally {
				of_explicit_memset(passphraseCopy, 0,
				    strlen(passphraseCopy));
			[OFApplication terminateWithStatus: 1];
		}

		of_explicit_memset(passphraseCString, '\0',
		    strlen(passphraseCString));
				free(passphraseCopy);
			}
		}
	}

		generator.keyFile = keyFile;
		generator.passphrase = passphrase;
	generator.keyFile = keyFile;
	generator.passphrase = passphrase;

		[generator derivePassword];
	[generator derivePassword];
		@try {
			[of_stdout writeBuffer: generator.output
					length: generator.length];
			[of_stdout writeBuffer: "\n"
					length: 1];
	[of_stdout writeBuffer: generator.output.items
			length: generator.length];
	[of_stdout writeBuffer: "\n"
			length: 1];
		} @finally {
			of_explicit_memset(generator.output, 0,
			    generator.length);
		}
	} @finally {
		of_explicit_memset(passphrase, 0, strlen(passphrase));

		if (keyFile != nil)
			of_explicit_memset(keyFile.mutableItems, 0,
			    keyFile.count);
	}

	[OFApplication terminate];
}
@end