sjs/arq_restore
1
0
Fork 0
mirror of https://github.com/samsonjs/arq_restore.git synced 2026-03-25 09:25:53 +00:00
Code Issues Projects Releases Packages Wiki Activity Actions

decrypt the folder plist if it's encrypted

Browse source
This commit is contained in:
Stefan Reitshamer 2012-12-12 10:25:02 -05:00
parent 97e6feb1f3
commit b4f30b72b5
1 changed files with 23 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
ArqRestoreCommand.m
View file

@ -161,6 +161,29 @@
if (data == nil) {
return NO;
}
// Decrypt the plist if necessary:
unsigned long length = 9;
if ([data length] < length) {
length = [data length];
}
if (length >= 9 && !strncmp([data bytes], "encrypted", length)) {
NSData *encryptedData = [data subdataWithRange:NSMakeRange(9, [data length] - 9)];
ArqSalt *arqSalt = [[[ArqSalt alloc] initWithAccessKeyID:accessKey secretAccessKey:secretKey s3BucketName:s3BucketName computerUUID:computerUUID] autorelease];
NSData *salt = [arqSalt salt:error];
if (salt == nil) {
return NO;
}
CryptoKey *cryptoKey = [[[CryptoKey alloc] initWithPassword:encryptionPassword salt:salt error:error] autorelease];
if (cryptoKey == nil) {
return NO;
}
data = [encryptedData decryptWithCryptoKey:cryptoKey error:error];
if (data == nil) {
return NO;
}
}
DictNode *plist = [DictNode dictNodeWithXMLData:data error:error];
if (plist == nil) {
return NO;