Make framework friendly

- Adapt to Curve25159Kit renaming - Explicit import - move non-framework compatible includes out of header // FREEBIE
2017-08-18 16:15:43 -04:00 · 2017-08-18 16:15:43 -04:00 · c1925e77fc
commit c1925e77fc
parent 6e9d5e8c3d
16 changed files with 25 additions and 58 deletions
--- a/AxolotlKit.podspec
+++ b/AxolotlKit.podspec
@ -14,7 +14,7 @@ Pod::Spec.new do |s|
  s.ios.deployment_target = "6.0"
  s.osx.deployment_target = "10.8"
  s.requires_arc          = true
-  s.dependency            '25519',   '~> 2.0.1'
+  s.dependency            'Curve25519Kit',   '~> 2.1.0'
  s.dependency            'HKDFKit', '~> 0.0.3'
  s.dependency            'ProtocolBuffers', '~> 1.9.8'
  s.dependency            'CocoaLumberjack'
--- a/AxolotlKit/Classes/Prekeys/PreKeyRecord.h
+++ b/AxolotlKit/Classes/Prekeys/PreKeyRecord.h
@ -1,12 +1,8 @@
 //
-//  PreKeyRecord.h
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 26/07/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import <Foundation/Foundation.h>


--- a/AxolotlKit/Classes/Prekeys/SignedPrekeyRecord.h
+++ b/AxolotlKit/Classes/Prekeys/SignedPrekeyRecord.h
@ -4,7 +4,7 @@

 #import <Foundation/Foundation.h>
 #import "PreKeyRecord.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>

@interface SignedPreKeyRecord : PreKeyRecord <NSSecureCoding>

--- a/AxolotlKit/Classes/Ratchet/AxolotlParameters.h
+++ b/AxolotlKit/Classes/Ratchet/AxolotlParameters.h
@ -1,13 +1,9 @@
 //
-//  AxolotlParameters.h
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 22/07/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import <Foundation/Foundation.h>
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>

@protocol AxolotlParameters <NSObject>

--- a/AxolotlKit/Classes/Ratchet/ChainKey.m
+++ b/AxolotlKit/Classes/Ratchet/ChainKey.m
@ -4,7 +4,7 @@

 #import "ChainKey.h"
 #import "TSDerivedSecrets.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import <CommonCrypto/CommonCrypto.h>

@implementation ChainKey
--- a/AxolotlKit/Classes/Ratchet/RKCK.m
+++ b/AxolotlKit/Classes/Ratchet/RKCK.m
@ -1,13 +1,9 @@
 //
-//  RKCK.m
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 1/15/14.
-//  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import "RKCK.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import "TSDerivedSecrets.h"

@implementation RKCK
--- a/AxolotlKit/Classes/Ratchet/RatchetingSession.m
+++ b/AxolotlKit/Classes/Ratchet/RatchetingSession.m
@ -1,9 +1,5 @@
 //
-//  RatchetingSession.m
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 26/07/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import "RatchetingSession.h"
@ -13,7 +9,7 @@
 #import "RootKey.h"
 #import "SessionState.h"
 #import <HKDFKit/HKDFKit.h>
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import "ChainKey.h"

@interface DHEResult : NSObject
--- a/AxolotlKit/Classes/Ratchet/ReceivingChain.h
+++ b/AxolotlKit/Classes/Ratchet/ReceivingChain.h
@ -1,14 +1,10 @@
 //
-//  ReceivingChain.h
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 02/09/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import <Foundation/Foundation.h>
 #import "Chain.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>

@interface ReceivingChain : NSObject <Chain, NSSecureCoding>

--- a/AxolotlKit/Classes/Ratchet/RootKey.m
+++ b/AxolotlKit/Classes/Ratchet/RootKey.m
@ -5,7 +5,7 @@
 #import "RootKey.h"
 #import "TSDerivedSecrets.h"
 #import "RKCK.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import "ChainKey.h"

 static NSString* const kCoderData      = @"kCoderData";
--- a/AxolotlKit/Classes/Ratchet/SendingChain.h
+++ b/AxolotlKit/Classes/Ratchet/SendingChain.h
@ -1,15 +1,11 @@
 //
-//  SendingChain.h
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 02/09/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import <Foundation/Foundation.h>
 #import "Chain.h"

-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>

@interface SendingChain : NSObject <Chain, NSSecureCoding>

--- a/AxolotlKit/Classes/Ratchet/TSDerivedSecrets.m
+++ b/AxolotlKit/Classes/Ratchet/TSDerivedSecrets.m
@ -4,7 +4,7 @@

 #import "TSDerivedSecrets.h"
 #import "HKDFKit.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>

@implementation TSDerivedSecrets

--- a/AxolotlKit/Classes/SessionCipher.m
+++ b/AxolotlKit/Classes/SessionCipher.m
@ -3,8 +3,8 @@
 //

 #import "SessionCipher.h"
-#import <25519/Curve25519.h>
-#import <25519/Ed25519.h>
+#import <Curve25519Kit/Curve25519.h>
+#import <Curve25519Kit/Ed25519.h>

 #import "NSData+keyVersionByte.h"

--- a/AxolotlKit/Classes/Sessions/SessionBuilder.m
+++ b/AxolotlKit/Classes/Sessions/SessionBuilder.m
@ -15,8 +15,8 @@
 #import "PreKeyWhisperMessage.h"
 #import "RatchetingSession.h"

-#import <25519/Curve25519.h>
-#import <25519/Ed25519.h>
+#import <Curve25519Kit/Curve25519.h>
+#import <Curve25519Kit/Ed25519.h>

 #import "PrekeyBundle.h"

--- a/AxolotlKit/Classes/Sessions/SessionState.m
+++ b/AxolotlKit/Classes/Sessions/SessionState.m
@ -2,7 +2,7 @@
 //  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import "SessionState.h"
 #import "ReceivingChain.h"
 #import "SendingChain.h"
--- a/AxolotlKit/Classes/Utility/SerializationUtilities.h
+++ b/AxolotlKit/Classes/Utility/SerializationUtilities.h
@ -1,13 +1,8 @@
 //
-//  SerializationUtilities.h
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 26/10/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import <Foundation/Foundation.h>
-#import <CommonCrypto/CommonCrypto.h>

 #define MAC_LENGTH 8

--- a/AxolotlKit/Classes/Utility/SerializationUtilities.m
+++ b/AxolotlKit/Classes/Utility/SerializationUtilities.m
@ -1,13 +1,9 @@
 //
-//  SerializationUtilities.m
-//  AxolotlKit
-//
-//  Created by Frederic Jacobs on 26/10/14.
-//  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
+//  Copyright (c) 2017 Open Whisper Systems. All rights reserved.
 //

 #import "SerializationUtilities.h"
-
+#import <CommonCrypto/CommonCrypto.h>

@implementation SerializationUtilities