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: |
6de67efc1dd582456e997257b798b9c0 |
| User & Date: | js on 2020-06-24 17:23:23 |
| Other Links: | manifest | tags |
Context
|
2020-06-24
| ||
| 17:32 | Update Xcode project check-in: d2a6d7d9f2 user: js tags: trunk | |
| 17:23 | Adjust to ObjFW changes check-in: 6de67efc1d user: js tags: trunk | |
|
2020-01-03
| ||
| 00:19 | iOS: Update to recent changes check-in: 496f11bd4b user: js tags: trunk | |
Changes
Modified LegacyPasswordGenerator.m from [d5c5dfec12] to [2cbd3f94d4].
| ︙ | ︙ | |||
85 86 87 88 89 90 91 | memcpy(combinedPassphraseItems, _passphrase.items, passphraseLength); if (_keyFile != nil) memcpy(combinedPassphraseItems + passphraseLength, _keyFile.items, _keyFile.count); outputItems = _output.mutableItems; | > > > > > | > | > | > > | 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 100 101 102 103 104 105 106 107 108 109 110 |
memcpy(combinedPassphraseItems, _passphrase.items, passphraseLength);
if (_keyFile != nil)
memcpy(combinedPassphraseItems + passphraseLength,
_keyFile.items, _keyFile.count);
outputItems = _output.mutableItems;
of_scrypt((of_scrypt_parameters_t){
.blockSize = 8,
.costFactor = 524288,
.parallelization = 2,
.salt = siteHash.digest,
.saltLength = [siteHash.class digestSize],
.password = combinedPassphraseItems,
.passwordLength = combinedPassphraseLength,
.key = outputItems,
.keyLength = _length,
.allowsSwappableMemory = false
});
/*
* This has a bias, however, this is what scrypt-genpass does and the
* legacy mode wants to be compatible to scrypt-genpass.
*/
outputItems[0] = "abcdefghijklmnopqrstuvwxyz"[outputItems[0] % 26];
outputItems[1] = "0123456789"[outputItems[1] % 10];
|
| ︙ | ︙ |
Modified NewPasswordGenerator.m from [17ced95bbb] to [24f9e276e4].
| ︙ | ︙ | |||
72 73 74 75 76 77 78 | memcpy(combinedPassphraseItems, _passphrase.items, passphraseLength); if (_keyFile != nil) memcpy(combinedPassphraseItems + passphraseLength, _keyFile.items, _keyFile.count); outputItems = _output.mutableItems; | > > > > > | > | > | > > | 72 73 74 75 76 77 78 79 80 81 82 83 84 85 86 87 88 89 90 91 92 93 94 95 96 97 98 99 |
memcpy(combinedPassphraseItems, _passphrase.items, passphraseLength);
if (_keyFile != nil)
memcpy(combinedPassphraseItems + passphraseLength,
_keyFile.items, _keyFile.count);
outputItems = _output.mutableItems;
of_scrypt((of_scrypt_parameters_t){
.blockSize = 8,
.costFactor = 524288,
.parallelization = 2,
.salt = siteHash.digest,
.saltLength = [siteHash.class digestSize],
.password = combinedPassphraseItems,
.passwordLength = combinedPassphraseLength,
.key = outputItems,
.keyLength = _length,
.allowsSwappableMemory = false
});
for (size_t i = 0; i < _length; i++)
outputItems[i] =
"123456789"
"abcdefghijkmnopqrstuvwxyz"
"ABCDEFGHJKLMNPQRSTUVWXYZ"
"#$%-=?"[outputItems[i] & 0x3F];
}
@end
|