moonlight-stream/moonlight-ios
1
0
Fork 0
mirror of https://github.com/moonlight-stream/moonlight-ios.git synced 2025-07-27 06:32:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Null terminate strings before passing them to BIO_puts

Browse Source
This commit is contained in:
Cameron Gutman 2015-07-10 22:33:09 -07:00
parent 5dee29a21c
commit b2563e534d
2 changed files with 10 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
Limelight/Crypto/CryptoManager.h
View File

@ -16,6 +16,7 @@
+ (NSData*) readKeyFromFile; + (NSData*) readKeyFromFile;
+ (NSData*) readP12FromFile; + (NSData*) readP12FromFile;
+ (NSData*) getSignatureFromCert:(NSData*)cert; + (NSData*) getSignatureFromCert:(NSData*)cert;
+ (NSData*) nullTerminateString:(NSData*)data;
- (NSData*) createAESKeyFromSalt:(NSData*)saltedPIN; - (NSData*) createAESKeyFromSalt:(NSData*)saltedPIN;
- (NSData*) SHA1HashData:(NSData*)data; - (NSData*) SHA1HashData:(NSData*)data;

12
Limelight/Crypto/CryptoManager.m
View File

@ -76,8 +76,14 @@ static NSData* p12 = nil;
return (((int)[data length] + 15) / 16) * 16; return (((int)[data length] + 15) / 16) * 16;
} }
+ (NSData*) nullTerminateString:(NSData*)data {
NSMutableData* mutData = [NSMutableData dataWithData:data];
[mutData appendBytes:"" length:1];
return mutData;
}
- (bool) verifySignature:(NSData *)data withSignature:(NSData*)signature andCert:(NSData*)cert { - (bool) verifySignature:(NSData *)data withSignature:(NSData*)signature andCert:(NSData*)cert {
const char* buffer = [cert bytes]; const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
X509* x509; X509* x509;
BIO* bio = BIO_new(BIO_s_mem()); BIO* bio = BIO_new(BIO_s_mem());
BIO_puts(bio, buffer); BIO_puts(bio, buffer);
@ -105,7 +111,7 @@ static NSData* p12 = nil;
} }
- (NSData *)signData:(NSData *)data withKey:(NSData *)key { - (NSData *)signData:(NSData *)data withKey:(NSData *)key {
const char* buffer = [key bytes]; const char* buffer = [[CryptoManager nullTerminateString:key] bytes];
BIO* bio = BIO_new(BIO_s_mem()); BIO* bio = BIO_new(BIO_s_mem());
BIO_puts(bio, buffer); BIO_puts(bio, buffer);
@ -188,7 +194,7 @@ static NSData* p12 = nil;
} }
+ (NSData *)getSignatureFromCert:(NSData *)cert { + (NSData *)getSignatureFromCert:(NSData *)cert {
const char* buffer = [cert bytes]; const char* buffer = [[CryptoManager nullTerminateString:cert] bytes];
X509* x509; X509* x509;
BIO* bio = BIO_new(BIO_s_mem()); BIO* bio = BIO_new(BIO_s_mem());
BIO_puts(bio, buffer); BIO_puts(bio, buffer);