Merge branch 'master' of github.com:limelight-stream/limelight-ios

Limelight/CryptoManager.h

@@ -12,5 +12,6 @@
 
 - (void) generateKeyPairUsingSSl;
 - (NSString*) getUniqueID;
+- (NSData*) readCertFromFile;
 
 @end

Limelight/CryptoManager.m

@@ -17,6 +17,13 @@
     
 }
 
+- (NSData*) readCertFromFile {
+    NSArray *paths = NSSearchPathForDirectoriesInDomains(NSDocumentDirectory, NSUserDomainMask, YES);
+    NSString *documentsDirectory = [paths objectAtIndex:0];
+    NSString *certFile = [documentsDirectory stringByAppendingPathComponent:@"client.crt"];
+    return [NSData dataWithContentsOfFile:certFile];
+}
+
 - (void) generateKeyPairUsingSSl {
     NSLog(@"Generating Certificate: ");
     CertKeyPair certKeyPair = generateCertKeyPair();

Limelight/HttpManager.h

@@ -9,6 +9,8 @@
 #import <Foundation/Foundation.h>
 
 @interface HttpManager : NSObject
+- (id) initWithHost:(NSString*) host uniqueId:(NSString*) uniqueId deviceName:(NSString*) deviceName;
 - (NSString*) generatePIN;
-- (NSString*) saltPIN:(NSString*)PIN;
+- (NSData*) saltPIN:(NSString*)PIN;
+- (NSURL*) newPairRequestWithSalt:(NSData*)salt andCert:(NSData*)cert;
 @end

Limelight/HttpManager.m

@@ -28,15 +28,21 @@ static const NSString* PORT = @"47984";
     return self;
 }
 
-- (NSURL*) newPairRequestWithSalt:(NSString*)salt andCert:(NSString*)cert {
+- (NSURL*) newPairRequestWithSalt:(NSData*)salt andCert:(NSData*)cert {
-    NSURL* url = [[NSURL alloc] initWithString:
+    NSLog(@"host: %@ \nport: %@ \nuniqueID: %@ \ndeviceName: %@ \nsalt: %@ \ncert: %@", _host, PORT, _uniqueId, _deviceName, salt, cert);
-                  [NSString stringWithFormat:@"http://%@:%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=getservercert&salt=%@&clientcert=%@",
+    NSString* urlString = [[NSString stringWithFormat:@"%@/pair?uniqueid=%@&devicename=%@&updateState=1&phrase=getservercert&salt=%@&clientcert=%@", _baseURL, _uniqueId, _deviceName, [self bytesToHex:salt], [self bytesToHex:cert]] stringByAddingPercentEscapesUsingEncoding:NSUTF8StringEncoding];
-                                                _host, PORT, _uniqueId, _deviceName, salt, cert]];
+    NSURL* url = [[NSURL alloc] initWithString:urlString];
+    NSLog(@"pair url: %@", url);
     return url;
 }
 
-- (void) initiatePairing {
+- (NSString*) bytesToHex:(NSData*)data {
-    
+    const unsigned char* bytes = [data bytes];
+    NSMutableString *hex = [[NSMutableString alloc] init];
+    for (int i = 0; i < [data length]; i++) {
+        [hex appendFormat:@"%02X" , bytes[i]];
+    }
+    return hex;
 }
 
 - (NSString*) generatePIN {

Limelight/MainFrameViewController.h

@@ -9,7 +9,7 @@
 #import <UIKit/UIKit.h>
 #import "MDNSManager.h"
 
-@interface MainFrameViewController : UIViewController <UIPickerViewDataSource, UIPickerViewDelegate, MDNSCallback>
+@interface MainFrameViewController : UIViewController <UIPickerViewDataSource, UIPickerViewDelegate, MDNSCallback, NSURLConnectionDelegate>
 @property (strong, nonatomic) IBOutlet UIPickerView *HostPicker;
 - (IBAction)StreamButton:(UIButton *)sender;
 - (IBAction)PairButton:(UIButton *)sender;

Limelight/MainFrameViewController.m

@@ -88,9 +88,18 @@ MDNSManager* mDNSManager;
     mDNSManager = [[MDNSManager alloc] initWithCallback:self];
     [mDNSManager searchForHosts];
     CryptoManager* cryptMan = [[CryptoManager alloc] init];
-    [cryptMan getUniqueID];
+    NSString* uniqueId = [cryptMan getUniqueID];
-    HttpManager* hMan = [[HttpManager alloc] init];
+    [cryptMan generateKeyPairUsingSSl];
-    [hMan saltPIN:[hMan generatePIN]];
+    NSData* cert = [cryptMan readCertFromFile];
+    HttpManager* hMan = [[HttpManager alloc] initWithHost:hostAddr uniqueId:uniqueId deviceName:@"roth"];
+    NSString* PIN = [hMan generatePIN];
+    NSData* saltedPIN = [hMan saltPIN:PIN];
+    NSLog(@"PIN: %@, saltedPIN: %@", PIN, saltedPIN);
+    NSURL* pairUrl = [hMan newPairRequestWithSalt:saltedPIN andCert:cert];
+    NSURLRequest* pairRequest = [[NSURLRequest alloc] initWithURL:pairUrl];
+    NSLog(@"making pair request: %@", [pairRequest description]);
+    NSData* pairData = [NSURLConnection sendSynchronousRequest:pairRequest returningResponse:nil error:nil];
+    NSLog(@"Pair response: %@", [pairData description]);
 }
 
 - (void)updateHosts:(NSArray *)hosts {