timoreo/olm
1
1
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity

OLMKit: Zero only critical buffers out

Browse source
This commit is contained in:
manuroe 2018-10-17 11:21:08 +02:00
parent 2ea2bc8ebc
commit 90bbdec8ad
1 changed files with 4 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

8
xcode/OLMKit/OLMPkDecryption.m
View file

@ -69,8 +69,6 @@
} }
NSString *publicKey = [[NSString alloc] initWithData:publicKeyData encoding:NSUTF8StringEncoding]; NSString *publicKey = [[NSString alloc] initWithData:publicKeyData encoding:NSUTF8StringEncoding];
[publicKeyData resetBytesInRange:NSMakeRange(0, publicKeyData.length)];
return publicKey; return publicKey;
} }
@ -90,6 +88,7 @@
size_t result = olm_pk_key_from_private(session, size_t result = olm_pk_key_from_private(session,
publicKeyData.mutableBytes, publicKeyData.length, publicKeyData.mutableBytes, publicKeyData.length,
random.mutableBytes, randomLength); random.mutableBytes, randomLength);
[random resetBytesInRange:NSMakeRange(0, randomLength)];
if (result == olm_error()) { if (result == olm_error()) {
const char *olm_error = olm_pk_decryption_last_error(session); const char *olm_error = olm_pk_decryption_last_error(session);
NSLog(@"[OLMPkDecryption] generateKey: olm_pk_key_from_private error: %s", olm_error); NSLog(@"[OLMPkDecryption] generateKey: olm_pk_key_from_private error: %s", olm_error);
@ -107,8 +106,6 @@
} }
NSString *publicKey = [[NSString alloc] initWithData:publicKeyData encoding:NSUTF8StringEncoding]; NSString *publicKey = [[NSString alloc] initWithData:publicKeyData encoding:NSUTF8StringEncoding];
[publicKeyData resetBytesInRange:NSMakeRange(0, publicKeyData.length)];
return publicKey; return publicKey;
} }
@ -218,6 +215,7 @@
key.bytes, key.length, key.bytes, key.length,
pickle.mutableBytes, pickle.length, pickle.mutableBytes, pickle.length,
ephemeralBuffer.mutableBytes, ephemeralLength); ephemeralBuffer.mutableBytes, ephemeralLength);
[pickle resetBytesInRange:NSMakeRange(0, pickle.length)];
if (result == olm_error()) { if (result == olm_error()) {
const char *olm_error = olm_pk_decryption_last_error(session); const char *olm_error = olm_pk_decryption_last_error(session);
NSString *errorString = [NSString stringWithUTF8String:olm_error]; NSString *errorString = [NSString stringWithUTF8String:olm_error];
@ -248,6 +246,8 @@
} }
NSString *pickleString = [[NSString alloc] initWithData:pickled encoding:NSUTF8StringEncoding]; NSString *pickleString = [[NSString alloc] initWithData:pickled encoding:NSUTF8StringEncoding];
[pickled resetBytesInRange:NSMakeRange(0, pickled.length)];
return pickleString; return pickleString;
} }