js/CryptoPassphrase
1
1
Fork 0
Code Issues Pull requests Projects Releases 2 Wiki Activity

iOS: Add initial parts of support for key files

Browse source
This commit is contained in:
Jonathan Schleifer 2017-11-26 21:09:53 +01:00
parent f886262722
commit fa21a9d8f3
No known key found for this signature in database
GPG key ID: 28D65178B37F33E3
13 changed files with 226 additions and 99 deletions
Download patch file Download diff file Expand all files Collapse all files

12
LegacyPasswordGenerator.m
View file

@ -23,7 +23,7 @@
#import "LegacyPasswordGenerator.h"
@implementation LegacyPasswordGenerator
@synthesize site = _site, keyfile = _keyfile, passphrase = _passphrase;
@synthesize site = _site, keyFile = _keyFile, passphrase = _passphrase;
@synthesize output = _output;
+ (instancetype)generator
@ -70,11 +70,11 @@
_output = [self allocMemoryWithSize: _length + 1];
passphraseLength = combinedPassphraseLength = strlen(_passphrase);
if (_keyfile != nil) {
if (SIZE_MAX - combinedPassphraseLength < _keyfile.count)
if (_keyFile != nil) {
if (SIZE_MAX - combinedPassphraseLength < _keyFile.count)
@throw [OFOutOfRangeException exception];
combinedPassphraseLength += _keyfile.count;
combinedPassphraseLength += _keyFile.count;
}
if ((combinedPassphrase = malloc(combinedPassphraseLength)) == NULL)
@ -83,9 +83,9 @@
@try {
memcpy(combinedPassphrase, _passphrase, passphraseLength);
if (_keyfile != nil)
if (_keyFile != nil)
memcpy(combinedPassphrase + passphraseLength,
_keyfile.items, _keyfile.count);
_keyFile.items, _keyFile.count);
of_scrypt(8, 524288, 2, siteHash.digest,
[siteHash.class digestSize], combinedPassphrase,