Add support for external encryption libraries

SmartDeviceLink-iOS.xcodeproj/project.pbxproj

@@ -747,6 +747,7 @@
 		5D61FE121A84238C00846EE7 /* SDLWarningLightStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FC251A84238C00846EE7 /* SDLWarningLightStatus.m */; };
 		5D61FE131A84238C00846EE7 /* SDLWiperStatus.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D61FC261A84238C00846EE7 /* SDLWiperStatus.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5D61FE141A84238C00846EE7 /* SDLWiperStatus.m in Sources */ = {isa = PBXBuildFile; fileRef = 5D61FC271A84238C00846EE7 /* SDLWiperStatus.m */; };
+		5D6CC8EF1C610E660027F60A /* SDLSecurityType.h in Headers */ = {isa = PBXBuildFile; fileRef = 5D6CC8EE1C610E660027F60A /* SDLSecurityType.h */; settings = {ATTRIBUTES = (Public, ); }; };
 		5D86022E1C99AF5100A55266 /* OCMock.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 5D1464351C99AC0900727339 /* OCMock.framework */; };
 		5D86022F1C99AF5900A55266 /* OCMock.framework in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D1464351C99AC0900727339 /* OCMock.framework */; settings = {ATTRIBUTES = (CodeSignOnCopy, RemoveHeadersOnCopy, ); }; };
 		5D8602301C99AF8300A55266 /* Nimble.framework.dSYM in CopyFiles */ = {isa = PBXBuildFile; fileRef = 5D1464311C99AC0000727339 /* Nimble.framework.dSYM */; };
@@ -1649,6 +1650,7 @@
 		5D61FC251A84238C00846EE7 /* SDLWarningLightStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLWarningLightStatus.m; sourceTree = "<group>"; };
 		5D61FC261A84238C00846EE7 /* SDLWiperStatus.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLWiperStatus.h; sourceTree = "<group>"; };
 		5D61FC271A84238C00846EE7 /* SDLWiperStatus.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLWiperStatus.m; sourceTree = "<group>"; };
+		5D6CC8EE1C610E660027F60A /* SDLSecurityType.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLSecurityType.h; sourceTree = "<group>"; };
 		5D8B174D1AC9D266006A6E1C /* SDLDialNumber.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDialNumber.h; sourceTree = "<group>"; };
 		5D8B174E1AC9D266006A6E1C /* SDLDialNumber.m */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.objc; path = SDLDialNumber.m; sourceTree = "<group>"; };
 		5D8B17511AC9E11B006A6E1C /* SDLDialNumberResponse.h */ = {isa = PBXFileReference; fileEncoding = 4; lastKnownFileType = sourcecode.c.h; path = SDLDialNumberResponse.h; sourceTree = "<group>"; };
@@ -2199,6 +2201,7 @@
 		5D5934ED1A85160400687FB9 /* Proxy */ = {
 			isa = PBXGroup;
 			children = (
+				5D6CC8ED1C610E490027F60A /* Security */,
 				5D5934FE1A851B2500687FB9 /* @protocols */,
 				5D61FB031A84238A00846EE7 /* SDLLockScreenManager.h */,
 				5D61FB041A84238A00846EE7 /* SDLLockScreenManager.m */,
@@ -2942,6 +2945,14 @@
 			name = "Supporting Files";
 			sourceTree = "<group>";
 		};
+		5D6CC8ED1C610E490027F60A /* Security */ = {
+			isa = PBXGroup;
+			children = (
+				5D6CC8EE1C610E660027F60A /* SDLSecurityType.h */,
+			);
+			name = Security;
+			sourceTree = "<group>";
+		};
 		5DB92D201AC47AC400C15BB0 /* UtilitiesSpecs */ = {
 			isa = PBXGroup;
 			children = (
@@ -3063,6 +3074,7 @@
 				5D61FC5F1A84238C00846EE7 /* SDLCharacterSet.h in Headers */,
 				5D61FCFF1A84238C00846EE7 /* SDLOnAppInterfaceUnregistered.h in Headers */,
 				5D61FDC51A84238C00846EE7 /* SDLTCPTransport.h in Headers */,
+				5D6CC8EF1C610E660027F60A /* SDLSecurityType.h in Headers */,
 				5D61FCF61A84238C00846EE7 /* SDLMediaClockFormat.h in Headers */,
 				5D61FD831A84238C00846EE7 /* SDLSetDisplayLayout.h in Headers */,
 				5D61FCC91A84238C00846EE7 /* SDLIgnitionStableStatus.h in Headers */,

SmartDeviceLink/SDLAbstractProtocol.h

@@ -6,6 +6,7 @@
 @class SDLRPCRequest;
 
 #import "SDLProtocolListener.h"
+#import "SDLSecurityType.h"
 #import "SDLTransportDelegate.h"
 
 
@@ -14,15 +15,23 @@
 @property (strong) NSString *debugConsoleGroupName;
 @property (weak) SDLAbstractTransport *transport;
 @property (strong) NSHashTable *protocolDelegateTable; // table of id<SDLProtocolListener>
+@property (nonatomic, strong) id<SDLSecurityType> securityManager;
+@property (nonatomic, copy) NSString *appId;
 
 // Sending
-- (void)sendStartSessionWithType:(SDLServiceType)serviceType;
-- (void)sendEndSessionWithType:(SDLServiceType)serviceType;
+- (void)sendStartSessionWithType:(SDLServiceType)serviceType __deprecated_msg(("Use startServiceWithType: instead"));
+- (void)startServiceWithType:(SDLServiceType)serviceType;
+- (void)startSecureServiceWithType:(SDLServiceType)serviceType completionHandler:(void (^)(BOOL success, NSError *error))completionHandler;
+- (void)sendEndSessionWithType:(SDLServiceType)serviceType __deprecated_msg(("Use endServiceWithType: instead"));
+- (void)endServiceWithType:(SDLServiceType)serviceType;
 - (void)sendRPC:(SDLRPCMessage *)message;
+- (BOOL)sendRPC:(SDLRPCMessage *)message encrypted:(BOOL)encryption error:(NSError **)error;
 - (void)sendRPCRequest:(SDLRPCRequest *)rpcRequest __deprecated_msg(("Use sendRPC: instead"));
-- (void)sendHeartbeat __deprecated_msg("Heartbeat is no longer used.");
-- (void)sendRawDataStream:(NSInputStream *)inputStream withServiceType:(SDLServiceType)serviceType;
 - (void)sendRawData:(NSData *)data withServiceType:(SDLServiceType)serviceType;
+- (void)sendEncryptedRawData:(NSData *)data onService:(SDLServiceType)serviceType;
+
+- (void)sendRawDataStream:(NSInputStream *)inputStream withServiceType:(SDLServiceType)serviceType __deprecated_msg("This is not implemented and will cause a crash if called");
+- (void)sendHeartbeat __deprecated_msg("This is not implemented and will cause a crash if called");
 
 // Recieving
 - (void)handleBytesFromTransport:(NSData *)receivedData;

SmartDeviceLink/SDLAbstractProtocol.m

@@ -20,14 +20,31 @@ - (void)sendStartSessionWithType:(SDLServiceType)serviceType {
     [self doesNotRecognizeSelector:_cmd];
 }
 
+- (void)startServiceWithType:(SDLServiceType)serviceType {
+    [self doesNotRecognizeSelector:_cmd];
+}
+
+- (void)startSecureServiceWithType:(SDLServiceType)serviceType completionHandler:(void (^)(BOOL success, NSError *error))completionHandler {
+    [self doesNotRecognizeSelector:_cmd];
+}
+
 - (void)sendEndSessionWithType:(SDLServiceType)serviceType {
     [self doesNotRecognizeSelector:_cmd];
 }
 
+- (void)endServiceWithType:(SDLServiceType)serviceType {
+    [self doesNotRecognizeSelector:_cmd];
+}
+
 - (void)sendRPC:(SDLRPCMessage *)message {
     [self doesNotRecognizeSelector:_cmd];
 }
 
+- (BOOL)sendRPC:(SDLRPCMessage *)message encrypted:(BOOL)encryption error:(NSError *__autoreleasing *)error {
+    [self doesNotRecognizeSelector:_cmd];
+    return NO;
+}
+
 - (void)sendRPCRequest:(SDLRPCRequest *)rpcRequest {
     [self doesNotRecognizeSelector:_cmd];
 }
@@ -40,11 +57,15 @@ - (void)handleBytesFromTransport:(NSData *)receivedData {
     [self doesNotRecognizeSelector:_cmd];
 }
 
+- (void)sendRawData:(NSData *)data withServiceType:(SDLServiceType)serviceType {
+    [self doesNotRecognizeSelector:_cmd];
+}
+
 - (void)sendRawDataStream:(NSInputStream *)inputStream withServiceType:(SDLServiceType)serviceType {
     [self doesNotRecognizeSelector:_cmd];
 }
 
-- (void)sendRawData:(NSData *)data withServiceType:(SDLServiceType)serviceType {
+- (void)sendEncryptedRawData:(NSData *)data onService:(SDLServiceType)serviceType {
     [self doesNotRecognizeSelector:_cmd];
 }
 

SmartDeviceLink/SDLProtocol.h

@@ -5,15 +5,25 @@
 @class SDLProtocolHeader;
 @class SDLProtocolRecievedMessageRouter;
 
+typedef NS_ENUM(NSUInteger, SDLProtocolError) {
+    SDLProtocolErrorNoSecurityManager,
+};
+
+extern NSString *const SDLProtocolSecurityErrorDomain;
 
 @interface SDLProtocol : SDLAbstractProtocol <SDLProtocolListener>
 
 // Sending
-- (void)sendStartSessionWithType:(SDLServiceType)serviceType;
-- (void)sendEndSessionWithType:(SDLServiceType)serviceType;
+- (void)sendStartSessionWithType:(SDLServiceType)serviceType __deprecated_msg(("Use startServiceWithType: instead"));
+- (void)startServiceWithType:(SDLServiceType)serviceType;
+- (void)startSecureServiceWithType:(SDLServiceType)serviceType completionHandler:(void (^)(BOOL success, NSError *error))completionHandler;
+- (void)sendEndSessionWithType:(SDLServiceType)serviceType __deprecated_msg(("Use endServiceWithType: instead"));
+- (void)endServiceWithType:(SDLServiceType)serviceType;
 - (void)sendRPC:(SDLRPCMessage *)message;
+- (BOOL)sendRPC:(SDLRPCMessage *)message encrypted:(BOOL)encryption error:(NSError **)error;
 - (void)sendRPCRequest:(SDLRPCRequest *)rpcRequest __deprecated_msg(("Use sendRPC: instead"));
 - (void)sendRawData:(NSData *)data withServiceType:(SDLServiceType)serviceType;
+- (void)sendEncryptedRawData:(NSData *)data onService:(SDLServiceType)serviceType;
 
 // Recieving
 - (void)handleBytesFromTransport:(NSData *)receivedData;