Swift2.0

.coveralls.yml

@@ -0,0 +1 @@
+service_name: travis-ci

.gitignore

@@ -1,3 +1,5 @@
+prepate_command.txt
+CommonCrypto
 # Xcode
 #
 build/

.slather.yml

@@ -0,0 +1,3 @@
+ci_service: travis_ci
+coverage_service: coveralls
+xcodeproj: IDZSwiftCommonCrypto 

.travis.yml

@@ -1,21 +1,24 @@
 language: objective-c
-
+osx_image: xcode7.1
 install:
-- npm install -g swift-playground-builder
+- npm install -g playground
+
+env:
+  matrix:
+    secure: a2fi02GPkxw27jVjW47EkvB/BW/SOIxlmLQJaiZ3xqbKe4udUxKE0ZigD0nVJDmxpiVHv5/Uc9ZQDPtKvvmU9kakusxjBVqMy+IxCYsH4+aDaATdaY9WHvVbARXJGjE/KmKnTfos/P8G8XqXahNKznql/gF2wZNoQIQD49JNk8s=
+
+before_install:
+- bundle install
 
 script:
-# Generate README.playground from README.md
 - echo Available SDKs
 - xcodebuild -showsdks
 - make
-- git config --global push.default simple
-- git diff-files --exit-code; if [[ "$?" == "1" ]]; then git commit -a -m "Playground update from Travis [ci skip]"; git push; fi
-- pushd IDZSwiftCommonCrypto
 - rm -rf CommonCrypto
-- ./GenerateCommonCryptoModule iphonesimulator8.1 .
+- ./GenerateCommonCryptoModule iphonesimulator9.0 .
 - cat CommonCrypto/module.map
 - pwd
-- xcodebuild build -scheme IDZSwiftCommonCrypto -destination 'platform=iOS Simulator,name=iPhone 6,OS=8.1'
-# Remove testing pending solution to https://github.com/travis-ci/travis-ci/issues/2829
-- xcodebuild test -scheme IDZSwiftCommonCrypto -destination 'platform=iOS Simulator,name=iPhone 6,OS=8.1'
-- popd
+- xcodebuild build -scheme IDZSwiftCommonCrypto -destination 'platform=iOS Simulator,name=iPhone 6,OS=9.0'
+- make test
+
+after_success: bundle exec slather coverage --input-format profdata IDZSwiftCommonCrypto.xcodeproj

IDZSwiftCommonCrypto/DemoPlayground.playground/contents.xcplayground → DemoPlayground.playground/contents.xcplayground

@@ -1,5 +1,5 @@
 <?xml version="1.0" encoding="UTF-8" standalone="yes"?>
-<playground version='3.0' sdk='iphonesimulator'>
+<playground version='3.0' sdk='iphonesimulator' runInFullSimulator='YES'>
     <sections>
         <code source-file-name='section-1.swift'/>
     </sections>

IDZSwiftCommonCrypto/DemoPlayground.playground/section-1.swift → DemoPlayground.playground/section-1.swift

@@ -3,17 +3,18 @@ import UIKit
 import CommonCrypto
 import IDZSwiftCommonCrypto
 
-var ss  = ""
+var ss  = "" as NSString
 ss.stringByAppendingPathComponent("hello")
 
-
 // MARK: - Message Digest Demo
 let  s = "The quick brown fox jumps over the lazy dog."
 var md5 = Digest(algorithm: .MD5)
 md5.update(s)
 var digest = md5.final()
 var md5String = hexStringFromArray(digest)
 
+s.MD5
+
 // MARK: - HMAC Demo
 // Data from RFC 2202
 var key = arrayFromHexString("0102030405060708090a0b0c0d0e0f10111213141516171819")
@@ -34,26 +35,41 @@ for (password, salt, rounds, dkLen, expected) in tests
 }
 
 // MARK: - Random Demo
-var randomBytes = hexStringFromArray(Random.generateBytes(16))
+var randomBytes = hexStringFromArray(try Random.generateBytes(16))
+
+do {
+    try Random.generateBytesThrow(16)
+}
+catch let e {
+    print("generateBytesThrow threw \(e)")
+}
+
+
+do {
+    try Random.generateBytesThrow(16)
+}
+catch {
+    print("generateBytesThrow threw an error (expected).")
+}
+
 
 // MARK: - Crypto Demo
+// Test data from NIST Special Publication 
+// F.1.1 p24
+// http://csrc.nist.gov/publications/nistpubs/800-38a/sp800-38a.pdf
 func test_StreamCryptor_AES_ECB() {
-    var key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
-    var plainText = arrayFromHexString("6bc1bee22e409f96e93d7e117393172a")
-    var expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97")
+    let key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
+    let plainText = arrayFromHexString("6bc1bee22e409f96e93d7e117393172a")
+    let expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97")
 
-    var aesEncrypt = StreamCryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>())
+    let aesEncrypt = StreamCryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>())
     var cipherText : [UInt8] = []
     var dataOut = Array<UInt8>(count:plainText.count, repeatedValue:UInt8(0))
-    var (byteCount, status) = aesEncrypt.update(plainText, byteArrayOut: &dataOut)
+    let (byteCount, status) = aesEncrypt.update(plainText, byteArrayOut: &dataOut)
     dataOut
     "\(status)"
     status
 
-
-    var c = UIColor.redColor()
-
-
     cipherText += dataOut[0..<Int(byteCount)]
     //(byteCount, status) = aesEncrypt.final(&dataOut)
     //assert(byteCount == 0, "Final byte count is 0")
@@ -64,11 +80,11 @@ func test_StreamCryptor_AES_ECB() {
 test_StreamCryptor_AES_ECB()
 // Single block ECB mode
 func test_Cryptor_AES_ECB_1() {
-    var key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
-    var plainText = arrayFromHexString("6bc1bee22e409f96e93d7e117393172a")
-    var expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97")
+    let key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
+    let plainText = arrayFromHexString("6bc1bee22e409f96e93d7e117393172a")
+    let expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97")
 
-    var cipherText = Cryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>()).update(plainText)?.final()
+    let cipherText = Cryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>()).update(plainText)?.final()
 
     assert(expectedCipherText.count == cipherText!.count , "Counts are as expected")
     assert(expectedCipherText == cipherText!, "Obtained expected cipher text")
@@ -79,14 +95,14 @@ test_Cryptor_AES_ECB_1()
 // Double repeated block ECB mode 
 // Shows weakness of ECB mode -- same plaintext block gets same ciphertext
 func test_Cryptor_AES_ECB_2() {
-    var key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
+    let key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
     var plainText = arrayFromHexString("6bc1bee22e409f96e93d7e117393172a")
     var expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97")
 
     plainText += plainText
     expectedCipherText += expectedCipherText
 
-    var cipherText = Cryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>()).update(plainText)?.final()
+    let cipherText = Cryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>()).update(plainText)?.final()
 
     assert(expectedCipherText.count == cipherText!.count , "Counts are as expected")
     assert(expectedCipherText == cipherText!, "Obtained expected cipher text")
@@ -99,27 +115,29 @@ test_Cryptor_AES_ECB_2()
 
 // Single block ECB mode
 func test_Cryptor_AES_ECB_Short() {
-    var key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
-    var plainText = arrayFromHexString("6bc1bee22e409f96e93d7e11739317")
-    var expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97")
+    let key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
+    let plainText = arrayFromHexString("6bc1bee22e409f96e93d7e11739317")
+    let expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97")
 
-    var cryptor = Cryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>())
-    var cipherText = cryptor.update(plainText)?.final()
+    let cryptor = Cryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode, key:key, iv:Array<UInt8>())
+    let cipherText = cryptor.update(plainText)?.final()
     if(cipherText == nil)
     {
-        println("Encryption failed (as expected) with status \(cryptor.status)")
+        print("Encryption failed (as expected) with status \(cryptor.status)")
     }
 }
 
 test_Cryptor_AES_ECB_Short()
 
 func test_Cryptor_AES_ECB_Short_Padding() {
-    var key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
-    var plainText = arrayFromHexString("6bc1bee22e409f96e93d7e11739317")
-    var expectedCipherText = arrayFromHexString("21ea2ba3e445a0ef710a7c26618d1975")
+    let key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
+    let plainText = arrayFromHexString("6bc1bee22e409f96e93d7e11739317")
+    let expectedCipherText = arrayFromHexString("21ea2ba3e445a0ef710a7c26618d1975")
 
-    var cryptor = Cryptor(operation:.Encrypt, algorithm:.AES, options:.ECBMode | .PKCS7Padding, key:key, iv:Array<UInt8>())
-    var cipherText = cryptor.update(plainText)?.final()
+    let cryptor = Cryptor(operation:.Encrypt,
+        algorithm:.AES,
+        options:[.ECBMode,.PKCS7Padding], key:key, iv:Array<UInt8>())
+    let cipherText = cryptor.update(plainText)?.final()
     assert(cipherText != nil)
     assert(cipherText! == expectedCipherText)
 }
@@ -130,13 +148,13 @@ func test_Cryptor_AES_ECB_Short_Padding() {
 //test_Cryptor_AES_CBC_1()
 
 func test_Cryptor_AES_CBC_2() {
-    var key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
+    let key = arrayFromHexString("2b7e151628aed2a6abf7158809cf4f3c")
     var plainText = arrayFromHexString("6bc1bee22e409f96e93d7e117393172a")
-    var expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97025c61efee87e604cd1b12ce9dde5c51")
+    let expectedCipherText = arrayFromHexString("3ad77bb40d7a3660a89ecaf32466ef97025c61efee87e604cd1b12ce9dde5c51")
 
     plainText += plainText
 
-    var optionalCipherText = Cryptor(operation:.Encrypt, algorithm:.AES, options:.None, key:key, iv:Array<UInt8>()).update(plainText)?.final()
+    let optionalCipherText = Cryptor(operation:.Encrypt, algorithm:.AES, options:.None, key:key, iv:Array<UInt8>()).update(plainText)?.final()
     if let cipherText = optionalCipherText
     {
 

Gemfile

@@ -0,0 +1,3 @@
+# Gemfile
+source 'https://rubygems.org'
+gem 'slather', :git => "https://github.com/mattdelves/slather.git", :branch => "feature-profdata"

Gemfile.lock

@@ -0,0 +1,44 @@
+GIT
+  remote: https://github.com/mattdelves/slather.git
+  revision: d09ce4f5d5928bebdd121f621f530f1751a6c2c9
+  branch: feature-profdata
+  specs:
+    slather (1.8.1)
+      clamp (~> 0.6)
+      nokogiri (~> 1.6.3)
+      xcodeproj (~> 0.27.2)
+
+GEM
+  remote: https://rubygems.org/
+  specs:
+    activesupport (4.2.4)
+      i18n (~> 0.7)
+      json (~> 1.7, >= 1.7.7)
+      minitest (~> 5.1)
+      thread_safe (~> 0.3, >= 0.3.4)
+      tzinfo (~> 1.1)
+    claide (0.9.1)
+    clamp (0.6.5)
+    colored (1.2)
+    i18n (0.7.0)
+    json (1.8.3)
+    mini_portile (0.6.2)
+    minitest (5.8.2)
+    nokogiri (1.6.6.2)
+      mini_portile (~> 0.6.0)
+    thread_safe (0.3.5)
+    tzinfo (1.2.2)
+      thread_safe (~> 0.1)
+    xcodeproj (0.27.2)
+      activesupport (>= 3)
+      claide (~> 0.9.1)
+      colored (~> 1.2)
+
+PLATFORMS
+  ruby
+
+DEPENDENCIES
+  slather!
+
+BUNDLED WITH
+   1.10.6