CryptoPassphrase  Check-in [31d77b5098]

Overview
Comment:Adjust to ObjFW changes
Downloads: Tarball | ZIP archive | SQL archive
Timelines: family | ancestors | descendants | both | trunk
Files: files | file ages | folders
SHA3-256: 31d77b50984eb2e4695733a86c2c77f470fa4b6d07e05471c69236ba9b557965
User & Date: js on 2019-12-28 22:46:05
Other Links: manifest | tags
Context
2020-01-03
00:03
Use non-swappable memory check-in: d5ba7b8a87 user: js tags: trunk
2019-12-28
22:46
Adjust to ObjFW changes check-in: 31d77b5098 user: js tags: trunk
2019-06-19
23:15
iOS: Make more use of native Swift types check-in: 5d68f3d40a user: js tags: trunk
Changes
Hide Diffs Side-by-Side Diffs Ignore Whitespace Patch

Modified LegacyPasswordGenerator.m from [c255ef24dd] to [c0c1315d5a].

︙
51
52
53
54
55
56
57
58


59
60
61
62
63
64
65

51
52
53
54
55
56
57

58
59
60
61
62
63
64
65
66








-
+
+








- (size_t)length
{
	return _length;
}

- (void)derivePassword
{
	OFSHA256Hash *siteHash = [OFSHA256Hash cryptoHash];
	OFSHA256Hash *siteHash = [OFSHA256Hash
	    cryptoHashWithAllowsSwappableMemory: true];
	size_t passphraseLength, combinedPassphraseLength;
	char *combinedPassphrase;

	[siteHash updateWithBuffer: _site.UTF8String
			    length: _site.UTF8StringLength];

	if (_output != NULL) {
︙
85
86
87
88
89
90
91
92

93
94
95
96
97
98
99

86
87
88
89
90
91
92

93
94
95
96
97
98
99
100








-
+









		if (_keyFile != nil)
			memcpy(combinedPassphrase + passphraseLength,
			    _keyFile.items, _keyFile.count);

		of_scrypt(8, 524288, 2, siteHash.digest,
		    [siteHash.class digestSize], combinedPassphrase,
		    combinedPassphraseLength, _output, _length);
		    combinedPassphraseLength, _output, _length, true);
	} @finally {
		of_explicit_memset(combinedPassphrase, 0,
		    combinedPassphraseLength);
		free(combinedPassphrase);
	}

	/*
︙

Modified NewPasswordGenerator.m from [8d62d07f4b] to [37a8c168df].

︙
38
39
40
41
42
43
44
45


46
47
48
49
50
51
52

38
39
40
41
42
43
44

45
46
47
48
49
50
51
52
53








-
+
+








	_length = 16;

	return self;
}

- (void)derivePassword
{
	OFSHA384Hash *siteHash = [OFSHA384Hash cryptoHash];
	OFSHA384Hash *siteHash = [OFSHA384Hash
	    cryptoHashWithAllowsSwappableMemory: true];
	size_t passphraseLength, combinedPassphraseLength;
	char *combinedPassphrase;

	[siteHash updateWithBuffer: _site.UTF8String
			    length: _site.UTF8StringLength];

	if (_output != NULL) {
︙
72
73
74
75
76
77
78
79

80
81
82
83
84
85
86

73
74
75
76
77
78
79

80
81
82
83
84
85
86
87








-
+









		if (_keyFile != nil)
			memcpy(combinedPassphrase + passphraseLength,
			    _keyFile.items, _keyFile.count);

		of_scrypt(8, 524288, 2, siteHash.digest,
		    [siteHash.class digestSize], combinedPassphrase,
		    combinedPassphraseLength, _output, _length);
		    combinedPassphraseLength, _output, _length, true);
	} @finally {
		of_explicit_memset(combinedPassphrase, 0,
		    combinedPassphraseLength);
		free(combinedPassphrase);
	}

	for (size_t i = 0; i < _length; i++)
︙