Return immutable data from generateSecureRandomData:length and use OSStatus to check the status of SecRandomCopyBytes. (signalapp#1306)

futureimperfect · michaelkirk · commit f8a0be4c70ef · 2016-08-17T16:09:57.000-04:00
diff --git a/Signal/src/crypto/CryptoTools.m b/Signal/src/crypto/CryptoTools.m
@@ -10,11 +10,11 @@ @implementation CryptoTools
 
 + (NSData *)generateSecureRandomData:(NSUInteger)length {
     NSMutableData *d = [NSMutableData dataWithLength:length];
-    int err          = SecRandomCopyBytes(kSecRandomDefault, length, [d mutableBytes]);
-    if (err != 0) {
+    OSStatus status  = SecRandomCopyBytes(kSecRandomDefault, length, [d mutableBytes]);
+    if (status != noErr) {
         [SecurityFailure raise:@"SecRandomCopyBytes failed"];
     }
-    return d;
+    return [d copy];
 }
 
 + (uint16_t)generateSecureRandomUInt16 {

Original file line number	Diff line number	Diff line change
`@@ -10,11 +10,11 @@ @implementation CryptoTools`
`10`	`10`
`11`	`11`	`+ (NSData *)generateSecureRandomData:(NSUInteger)length {`
`12`	`12`	`NSMutableData *d = [NSMutableData dataWithLength:length];`
`13`		`- int err = SecRandomCopyBytes(kSecRandomDefault, length, [d mutableBytes]);`
`14`		`- if (err != 0) {`
	`13`	`+ OSStatus status = SecRandomCopyBytes(kSecRandomDefault, length, [d mutableBytes]);`
	`14`	`+ if (status != noErr) {`
`15`	`15`	`[SecurityFailure raise:@"SecRandomCopyBytes failed"];`
`16`	`16`	`}`
`17`		`- return d;`
	`17`	`+ return [d copy];`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`+ (uint16_t)generateSecureRandomUInt16 {`