Compare commits
3 Commits
master
...
mkirk/hand
| Author | SHA1 | Date | |
|---|---|---|---|
|
|
9f9563a83c | ||
|
|
7b6bec45b3 | ||
|
|
d5b519fa14 |
@ -35,12 +35,6 @@ CFHTTPMessageRef SRHTTPConnectMessageCreate(NSURLRequest *request,
|
||||
// Set host first so it defaults
|
||||
CFHTTPMessageSetHeaderFieldValue(message, CFSTR("Host"), (__bridge CFStringRef)_SRHTTPConnectMessageHost(url));
|
||||
|
||||
NSMutableData *keyBytes = [[NSMutableData alloc] initWithLength:16];
|
||||
int result = SecRandomCopyBytes(kSecRandomDefault, keyBytes.length, keyBytes.mutableBytes);
|
||||
if (result != 0) {
|
||||
//TODO: (nlutsenko) Check if there was an error.
|
||||
}
|
||||
|
||||
// Apply cookies if any have been provided
|
||||
if (cookies) {
|
||||
NSDictionary<NSString *, NSString *> *messageCookies = [NSHTTPCookie requestHeaderFieldsWithCookies:cookies];
|
||||
|
||||
@ -15,9 +15,13 @@ NS_ASSUME_NONNULL_BEGIN
|
||||
|
||||
NSData *SRRandomData(NSUInteger length)
|
||||
{
|
||||
NSMutableData *data = [NSMutableData dataWithLength:length];
|
||||
NSMutableData *_Nullable data = [NSMutableData dataWithLength:length];
|
||||
if (data == nil) {
|
||||
[NSException raise:NSInternalInconsistencyException format:@"Failed to allocate random data"];
|
||||
}
|
||||
|
||||
int result = SecRandomCopyBytes(kSecRandomDefault, data.length, data.mutableBytes);
|
||||
if (result != 0) {
|
||||
if (result != errSecSuccess) {
|
||||
[NSException raise:NSInternalInconsistencyException format:@"Failed to generate random bytes with OSStatus: %d", result];
|
||||
}
|
||||
return data;
|
||||
|
||||
@ -1380,12 +1380,10 @@ static const size_t SRFrameHeaderOverhead = 32;
|
||||
|
||||
const uint8_t *unmaskedPayloadBuffer = (uint8_t *)data.bytes;
|
||||
uint8_t *maskKey = frameBuffer + frameBufferSize;
|
||||
|
||||
|
||||
size_t randomBytesSize = sizeof(uint32_t);
|
||||
int result = SecRandomCopyBytes(kSecRandomDefault, randomBytesSize, maskKey);
|
||||
if (result != 0) {
|
||||
//TODO: (nlutsenko) Check if there was an error.
|
||||
}
|
||||
NSData *randomData = SRRandomData(randomBytesSize);
|
||||
[randomData getBytes:maskKey range:NSMakeRange(0, randomBytesSize)];
|
||||
frameBufferSize += randomBytesSize;
|
||||
|
||||
// Copy and unmask the buffer
|
||||
|
||||
Loading…
Reference in New Issue
Block a user