Skip to content

Commit ae27dd3

Browse files
committed
Merge pull request kylef#15 from PyYoshi/update-cryptoswift-0.1.1
Update cryptoswift 0.1.1
2 parents 54b631d + 3b07038 commit ae27dd3

File tree

4 files changed

+13
-9
lines changed

4 files changed

+13
-9
lines changed

JSONWebToken.podspec

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ Pod::Spec.new do |spec|
1111
spec.ios.deployment_target = '8.0'
1212
spec.osx.deployment_target = '10.9'
1313
spec.requires_arc = true
14-
spec.dependency 'CryptoSwift', '0.0.14'
14+
spec.dependency 'CryptoSwift', '0.1.1'
1515
spec.module_name = 'JWT'
1616
end
17-

JWT.xcodeproj/project.pbxproj

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,8 +14,8 @@
1414
279D63BB1AD0E3FA0024E2BC /* Claims.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279D63BA1AD0E3FA0024E2BC /* Claims.swift */; };
1515
279D63BD1AD0ED750024E2BC /* Decode.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279D63BC1AD0ED750024E2BC /* Decode.swift */; };
1616
279D63BF1AD0EDC00024E2BC /* Base64.swift in Sources */ = {isa = PBXBuildFile; fileRef = 279D63BE1AD0EDC00024E2BC /* Base64.swift */; };
17-
885619E9E1C342A9D8BD77B7 /* Pods_JWT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 540942F3614C41E3827F2013 /* Pods_JWT.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
18-
EBEC5851F5183DF2D7BFE1AF /* Pods_JWTTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE8198B6E30BA6B8F8125FA7 /* Pods_JWTTests.framework */; settings = {ATTRIBUTES = (Weak, ); }; };
17+
885619E9E1C342A9D8BD77B7 /* Pods_JWT.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = 540942F3614C41E3827F2013 /* Pods_JWT.framework */; };
18+
EBEC5851F5183DF2D7BFE1AF /* Pods_JWTTests.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = CE8198B6E30BA6B8F8125FA7 /* Pods_JWTTests.framework */; };
1919
/* End PBXBuildFile section */
2020

2121
/* Begin PBXContainerItemProxy section */

JWT/JWT.swift

Lines changed: 6 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -55,7 +55,12 @@ public enum Algorithm : CustomStringConvertible {
5555
let keyData = key.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
5656
let messageData = message.dataUsingEncoding(NSUTF8StringEncoding, allowLossyConversion: false)!
5757
let mac = Authenticator.HMAC(key: keyData.arrayOfBytes(), variant:variant)
58-
let result = mac.authenticate(messageData.arrayOfBytes())!
58+
let result: [UInt8]
59+
do {
60+
result = try mac.authenticate(messageData.arrayOfBytes())
61+
} catch {
62+
result = []
63+
}
5964
return base64encode(NSData.withBytes(result))
6065
}
6166

Podfile.lock

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
PODS:
2-
- CryptoSwift (0.0.14)
2+
- CryptoSwift (0.1.1)
33

44
DEPENDENCIES:
5-
- CryptoSwift (= 0.0.14)
5+
- CryptoSwift (= 0.1.1)
66

77
SPEC CHECKSUMS:
8-
CryptoSwift: 5a6b725e2ad65a789f5f435dd434d38eb2c40b46
8+
CryptoSwift: c11640d3d66107efc8333e4131a5173f072b1d61
99

10-
COCOAPODS: 0.39.0.beta.4
10+
COCOAPODS: 0.39.0

0 commit comments

Comments
 (0)