Adjust Crypto, CipherParams and ChannelOptions to spec.

ably-ios/ARTChannel.h

@@ -9,6 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "ARTTypes.h"
 #import "ARTDataEncoder.h"
+#import "ARTLog.h"
 
 @class ARTChannelOptions;
 @class ARTMessage;

ably-ios/ARTChannel.m

@@ -22,7 +22,7 @@ - (instancetype)initWithName:(NSString *)name andOptions:(ARTChannelOptions *)op
         _name = name;
         self.options = options;
         NSError *error;
-        _dataEncoder = [[ARTDataEncoder alloc] initWithCipherParams:_options.cipherParams error:&error];
+        _dataEncoder = [[ARTDataEncoder alloc] initWithCipherParams:_options.cipher error:&error];
         if (error != nil) {
             [logger warn:@"creating ARTDataEncoder: %@", error];
             _dataEncoder = [[ARTDataEncoder alloc] initWithCipherParams:nil error:nil];
@@ -34,7 +34,7 @@ - (instancetype)initWithName:(NSString *)name andOptions:(ARTChannelOptions *)op
 
 - (void)setOptions:(ARTChannelOptions *)options {
     if (!options) {
-        _options = [ARTChannelOptions unencrypted];
+        _options = [[ARTChannelOptions alloc] initWithCipher:nil];
     } else {
         _options = options;
     }

ably-ios/ARTChannelOptions.h

@@ -8,19 +8,17 @@
 
 #import <Foundation/Foundation.h>
 #import "ARTTypes.h"
-
-@class ARTCipherParams;
+#import "ARTCrypto.h"
 
 ART_ASSUME_NONNULL_BEGIN
 
 @interface ARTChannelOptions : NSObject
 
-@property (nonatomic, assign) BOOL encrypted;
-@property (nonatomic, strong, art_nullable) ARTCipherParams *cipherParams;
+@property (nonatomic, strong, art_nullable) ARTCipherParams *cipher;
 
-+ (instancetype)unencrypted;
 
-- (instancetype)initEncrypted:(ARTCipherParams *)cipherParams;
+- (instancetype)initWithCipher:(id<ARTCipherParamsCompatible> __art_nullable)cipherParams;
+- (instancetype)initWithCipherKey:(id<ARTCipherKeyCompatible>)key;
 
 @end
 

ably-ios/ARTChannelOptions.m

@@ -12,23 +12,15 @@
 
 @implementation ARTChannelOptions
 
-- (instancetype)initEncrypted:(ARTCipherParams *)cipherParams {
+- (instancetype)initWithCipher:(id<ARTCipherParamsCompatible>)cipherParams {
     if (self = [super init]) {
-        self->_encrypted = YES;
-        self->_cipherParams = cipherParams;
+        self->_cipher = [cipherParams toCipherParams];
     }
-
     return self;
 }
 
-+ (instancetype)unencrypted {
-    static id unencrypted;
-    static dispatch_once_t once;
-    dispatch_once(&once, ^{
-        unencrypted = [[ARTChannelOptions alloc] init];
-    });
-
-    return unencrypted;
+- (instancetype)initWithCipherKey:(id<ARTCipherKeyCompatible>)key {
+    return [self initWithCipher:@{@"key": key}];
 }
 
 @end

ably-ios/ARTCrypto+Private.h

@@ -0,0 +1,61 @@
+//
+//  ARTCrypto+Private.h
+//  ably
+//
+//  Created by Toni Cárdenas on 19/2/16.
+//  Copyright © 2016 Ably. All rights reserved.
+//
+
+#ifndef ARTCrypto_Private_h
+#define ARTCrypto_Private_h
+
+#import "ARTCrypto.h"
+#import "ARTLog.h"
+
+ART_ASSUME_NONNULL_BEGIN
+
+@interface ARTCipherParams ()
+
+@property (readonly, strong, nonatomic, art_nullable) NSData *iv;
+@property (nonatomic, weak) ARTLog *logger;
+- (instancetype)initWithAlgorithm:(NSString *)algorithm key:(id<ARTCipherKeyCompatible>)key iv:(NSData *__art_nullable)iv;
+
+@end
+
+@protocol ARTChannelCipher
+
+- (ARTStatus *)encrypt:(NSData *)plaintext output:(NSData *__art_nullable*__art_nullable)output;
+- (ARTStatus *)decrypt:(NSData *)ciphertext output:(NSData *__art_nullable*__art_nullable)output;
+- (NSString *)cipherName;
+- (size_t) keyLength;
+
+@end
+
+@interface ARTCbcCipher : NSObject<ARTChannelCipher>
+
+- (id)initWithCipherParams:(ARTCipherParams *)cipherParams;
++ (instancetype)cbcCipherWithParams:(ARTCipherParams *)cipherParams;
+
+
+@property (nonatomic, weak) ARTLog * logger;
+@property (readonly, strong, nonatomic) NSData *keySpec;
+@property NSData *iv;
+@property (readonly) NSUInteger blockLength;
+
+@end
+
+@interface ARTCrypto ()
+
++ (NSString *)defaultAlgorithm;
++ (int)defaultKeyLength;
++ (int)defaultBlockLength;
+
++ (NSData *)generateSecureRandomData:(size_t)length;
+
++ (id<ARTChannelCipher>)cipherWithParams:(ARTCipherParams *)params;
+
+@end
+
+ART_ASSUME_NONNULL_END
+
+#endif /* ARTCrypto_Private_h */

ably-ios/ARTCrypto.h

@@ -8,55 +8,51 @@
 
 #import <Foundation/Foundation.h>
 #import "ARTTypes.h"
-#import "ARTLog.h"
 #import "ARTStatus.h"
 
-@class ARTLog;
+ART_ASSUME_NONNULL_BEGIN
 
-@interface ARTIvParameterSpec : NSObject
-@property (nonatomic, weak) ARTLog * logger;
-@property (readonly, nonatomic) NSData *iv;
+@protocol ARTCipherKeyCompatible <NSObject>
+- (NSData *)toData;
+@end
 
-- (instancetype)init UNAVAILABLE_ATTRIBUTE;
-- (instancetype)initWithIv:(NSData *)iv;
-+ (instancetype)ivSpecWithIv:(NSData *)iv;
+@interface NSString (ARTCipherKeyCompatible) <ARTCipherKeyCompatible>
+- (NSData *)toData;
+@end
 
+@interface NSData (ARTCipherKeyCompatible) <ARTCipherKeyCompatible>
+- (NSData *)toData;
 @end
 
-@interface ARTCipherParams : NSObject
-@property (nonatomic, weak) ARTLog *logger;
-@property (readonly, strong, nonatomic) NSString *algorithm;
-@property (readonly, strong, nonatomic) NSData *keySpec;
-@property (readonly, strong, nonatomic) ARTIvParameterSpec *ivSpec;
+@class ARTCipherParams;
 
-- (instancetype)init UNAVAILABLE_ATTRIBUTE;
-- (instancetype)initWithAlgorithm:(NSString *)algorithm keySpec:(NSData *)keySpec ivSpec:(ARTIvParameterSpec *)ivSpec;
-+ (instancetype)cipherParamsWithAlgorithm:(NSString *)algorithm keySpec:(NSData *)keySpec ivSpec:(ARTIvParameterSpec *)ivSpec;
+@protocol ARTCipherParamsCompatible <NSObject>
+- (ARTCipherParams *)toCipherParams;
+@end
 
+@interface NSDictionary (ARTCipherParamsCompatible) <ARTCipherParamsCompatible>
+- (ARTCipherParams *)toCipherParams;
 @end
 
-@protocol ARTChannelCipher
+@interface ARTCipherParams : NSObject <ARTCipherParamsCompatible>
+@property (readonly, strong, nonatomic) NSString *algorithm;
+@property (readonly, strong, nonatomic) NSData *key;
+@property (readonly, nonatomic) NSUInteger keyLength;
+@property (readonly, getter=getMode) NSString *mode;
 
-- (ARTStatus *)encrypt:(NSData *)plaintext output:(NSData **)output;
-- (ARTStatus *)decrypt:(NSData *)ciphertext output:(NSData **)output;
-- (NSString *)cipherName;
-- (size_t) keyLength;
+- (instancetype)init UNAVAILABLE_ATTRIBUTE;
+- (instancetype)initWithAlgorithm:(NSString *)algorithm key:(id<ARTCipherKeyCompatible>)key;
 
+- (ARTCipherParams *)toCipherParams;
 
 @end
 
 @interface ARTCrypto : NSObject
 
-+ (NSString *)defaultAlgorithm;
-+ (int)defaultKeyLength;
-+ (int)defaultBlockLength;
-
-+ (NSData *)generateRandomData:(size_t)length;
-+ (NSData *)generateSecureRandomData:(size_t)length;
-
-+ (ARTCipherParams *)defaultParams;
-+ (ARTCipherParams *)defaultParamsWithKey:(NSData *)key;
-+ (ARTCipherParams *)defaultParamsWithKey:(NSData *)key iv:(NSData *)iv;
-+ (id<ARTChannelCipher>)cipherWithParams:(ARTCipherParams *)params;
++ (ARTCipherParams *)getDefaultParams:(NSDictionary *)values;
++ (NSData *)generateRandomKey;
++ (NSData *)generateRandomKey:(NSUInteger)length;
 
 @end
+
+ART_ASSUME_NONNULL_END