Skip to content
This repository has been archived by the owner on Apr 9, 2021. It is now read-only.

Commit

Permalink
Upgrading dependencies and passing infer tests.
Browse files Browse the repository at this point in the history
  • Loading branch information
FredericJacobs committed Jun 14, 2015
1 parent 9c646e4 commit ffc922b
Show file tree
Hide file tree
Showing 5 changed files with 26 additions and 18 deletions.
6 changes: 3 additions & 3 deletions AxolotlKit.podspec
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
Pod::Spec.new do |s|
s.name = "AxolotlKit"
s.version = "0.6.3"
s.version = "0.7"
s.summary = "AxolotlKit is a Free implementation of the Axolotl protocol in Objective-C"
s.homepage = "https://github.com/WhisperSystems/AxolotlKit"
s.license = "GPLv2"
Expand All @@ -13,7 +13,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', '~> 1.9'
s.dependency '25519', '~> 2.0.1'
s.dependency 'HKDFKit', '~> 0.0.3'
s.dependency 'ProtocolBuffers', '~> 1.9.7'
s.dependency 'ProtocolBuffers', '~> 1.9.8'
end
10 changes: 8 additions & 2 deletions AxolotlKit/Classes/Crypto/AES-CBC.m
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,10 @@ +(NSData*)encryptCBCMode:(NSData*)data withKey:(NSData*)key withIV:(NSData*)iv{
&bytesEncrypted);

if (cryptStatus == kCCSuccess){
return [NSData dataWithBytesNoCopy:buffer length:bytesEncrypted];
NSData *data = [NSData dataWithBytes:buffer length:bytesEncrypted];
free(buffer);

return data;
} else{
free(buffer);
@throw [NSException exceptionWithName:CipherException reason:@"We encountered an issue while encrypting." userInfo:nil];
Expand All @@ -55,7 +58,10 @@ +(NSData*) decryptCBCMode:(NSData*)data withKey:(NSData*)key withIV:(NSData*)iv
&bytesDecrypted);

if (cryptStatus == kCCSuccess) {
return [NSData dataWithBytesNoCopy:buffer length:bytesDecrypted];
NSData *plaintext = [NSData dataWithBytes:buffer length:bytesDecrypted];
free(buffer);

return plaintext;
} else{
free(buffer);
@throw [NSException exceptionWithName:CipherException reason:@"We encountered an issue while decrypting." userInfo:nil];
Expand Down
14 changes: 8 additions & 6 deletions AxolotlKit/Classes/Sessions/SessionBuilder.m
Original file line number Diff line number Diff line change
Expand Up @@ -59,12 +59,14 @@ - (instancetype)initWithSessionStore:(id<SessionStore>)sessionStore
deviceId:(int)deviceId{
self = [super init];

_sessionStore = sessionStore;
_prekeyStore = preKeyStore;
_signedPreKeyStore = signedPreKeyStore;
_identityStore = identityKeyStore;
_recipientId = recipientId;
_deviceId = deviceId;
if (self) {
_sessionStore = sessionStore;
_prekeyStore = preKeyStore;
_signedPreKeyStore = signedPreKeyStore;
_identityStore = identityKeyStore;
_recipientId = recipientId;
_deviceId = deviceId;
}

return self;
}
Expand Down
2 changes: 1 addition & 1 deletion Podfile
Original file line number Diff line number Diff line change
Expand Up @@ -2,6 +2,6 @@ platform :ios, '6.0'

link_with ["AxolotlKit", "AxolotlKitTests"]

pod '25519', '~> 1.9', :inhibit_warnings => true
pod '25519', '~> 2.0.1', :inhibit_warnings => true
pod 'HKDFKit', '~> 0.0.3'
pod 'ProtocolBuffers', '~> 1.9.7'
12 changes: 6 additions & 6 deletions Podfile.lock
Original file line number Diff line number Diff line change
@@ -1,16 +1,16 @@
PODS:
- 25519 (1.8)
- 25519 (2.0.1)
- HKDFKit (0.0.3)
- ProtocolBuffers (1.9.7)

DEPENDENCIES:
- 25519 (~> 1.8)
- 25519 (~> 2.0.1)
- HKDFKit (~> 0.0.3)
- ProtocolBuffers (~> 1.9.7)

SPEC CHECKSUMS:
25519: 601ffb5d258aa33d642062d6fa4096db210e02e7
HKDFKit: 5998cf1bbb611e7ecc6bd3eaaef8c7a7da7be949
ProtocolBuffers: 37fdd327d36856f965ea9029b5ec0c7120e3a452
'25519': cd3f6f0658ac9dd4f95d7fb906378e1d0649c46c
HKDFKit: c058305d6f64b84f28c50bd7aa89574625bcb62a
ProtocolBuffers: 0682a66dec85e5a45bd53a2f44b8b987a0ba845f

COCOAPODS: 0.35.0
COCOAPODS: 0.37.2

0 comments on commit ffc922b

Please sign in to comment.