Framework friendly

- Adapt to Curve25519Kit renaming
- Move non-modular CommonCrypto.h into .m files

// FREEBIE

AxolotlKit/Classes/Prekeys/PreKeyRecord.h

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Frederic Jacobs. All rights reserved.
 //
 
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import <Foundation/Foundation.h>
 
 

AxolotlKit/Classes/Prekeys/SignedPrekeyRecord.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "PreKeyRecord.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 
 @interface SignedPreKeyRecord : PreKeyRecord <NSSecureCoding>
 

AxolotlKit/Classes/Protobuffs/WhisperTextProtocol.pb.h

@@ -1,6 +1,6 @@
 // Generated by the protocol buffer compiler.  DO NOT EDIT!
 
-#import "ProtocolBuffers.h"
+#import <ProtocolBuffers/ProtocolBuffers.h>
 
 // @@protoc_insertion_point(imports)
 

AxolotlKit/Classes/Ratchet/AxolotlParameters.h

@@ -7,7 +7,7 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 
 @protocol AxolotlParameters <NSObject>
 

AxolotlKit/Classes/Ratchet/RKCK.m

@@ -7,7 +7,7 @@
 //
 
 #import "RKCK.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import "TSDerivedSecrets.h"
 
 @implementation RKCK

AxolotlKit/Classes/Ratchet/RatchetingSession.m

@@ -13,7 +13,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

AxolotlKit/Classes/Ratchet/ReceivingChain.h

@@ -8,7 +8,7 @@
 
 #import <Foundation/Foundation.h>
 #import "Chain.h"
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 
 @interface ReceivingChain : NSObject <Chain, NSSecureCoding>
 

AxolotlKit/Classes/Ratchet/RootKey.m

@@ -9,7 +9,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";

AxolotlKit/Classes/Ratchet/SendingChain.h

@@ -9,7 +9,7 @@
 #import <Foundation/Foundation.h>
 #import "Chain.h"
 
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 
 @interface SendingChain : NSObject <Chain, NSSecureCoding>
 

AxolotlKit/Classes/SessionCipher.m

@@ -8,8 +8,8 @@
 
 #import "SessionCipher.h"
 
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
-#import <25519/Ed25519.h>
+#import <Curve25519Kit/Ed25519.h>
 
 #import "NSData+keyVersionByte.h"
 
@@ -287,4 +287,4 @@
     return record.sessionState.version;
 }
 
-@end
+@end

AxolotlKit/Classes/Sessions/SessionBuilder.m

@@ -19,8 +19,8 @@
 #import "PreKeyWhisperMessage.h"
 #import "RatchetingSession.h"
 
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
-#import <25519/Ed25519.h>
+#import <Curve25519Kit/Ed25519.h>
 
 #import "PrekeyBundle.h"
 

AxolotlKit/Classes/Sessions/SessionState.m

@@ -6,7 +6,7 @@
 //  Copyright (c) 2014 Open Whisper Systems. All rights reserved.
 //
 
-#import <25519/Curve25519.h>
+#import <Curve25519Kit/Curve25519.h>
 #import "SessionState.h"
 #import "ReceivingChain.h"
 #import "SendingChain.h"

AxolotlKit/Classes/Utility/SerializationUtilities.h

@@ -7,7 +7,6 @@
 //
 
 #import <Foundation/Foundation.h>
-#import <CommonCrypto/CommonCrypto.h>
 
 #define MAC_LENGTH 8
 

AxolotlKit/Classes/Utility/SerializationUtilities.m

@@ -7,7 +7,7 @@
 //
 
 #import "SerializationUtilities.h"
-
+#import <CommonCrypto/CommonCrypto.h>
 
 @implementation SerializationUtilities