Merge branch 'develop'

CHANGELOG

@@ -1,3 +1,10 @@
+0.3
+- Swift 2.2 support
+- use generators for cipher block modes should reduce memory overload.
+- add OFB block mode
+- add PCBC block mode
+- String.decryptBase64ToString to decrypt Base64 encoded strings
+
 0.2.3
 - enable bitcode setting for Debug on an Apple TV
 - faster compilation times

CryptoSwift.podspec

@@ -1,6 +1,6 @@
 Pod::Spec.new do |s|
   s.name         = "CryptoSwift"
-  s.version      = "0.2.3"
+  s.version      = "0.3"
   s.summary      = "Cryptography in Swift. SHA, MD5, CRC, Poly1305, HMAC, ChaCha20, Rabbit, AES."
   s.description  = "Cryptography functions and helpers for Swift implemented in Swift. SHA, MD5, CRC, Poly1305, HMAC, ChaCha20, Rabbit, AES."
   s.homepage     = "https://github.com/krzyzanowskim/CryptoSwift"

README.md

@@ -31,8 +31,10 @@ Good mood
 - [SHA256](http://tools.ietf.org/html/rfc6234)
 - [SHA384](http://tools.ietf.org/html/rfc6234)
 - [SHA512](http://tools.ietf.org/html/rfc6234)
-- [CRC32](http://en.wikipedia.org/wiki/Cyclic_redundancy_check) (not hash)
-- [CRC16](http://en.wikipedia.org/wiki/Cyclic_redundancy_check) (not hash)
+
+#### Cyclic Redundancy Check (CRC)
+- [CRC32](http://en.wikipedia.org/wiki/Cyclic_redundancy_check)
+- [CRC16](http://en.wikipedia.org/wiki/Cyclic_redundancy_check)
 
 #####Cipher
 - [AES-128, AES-192, AES-256](http://csrc.nist.gov/publications/fips/fips197/fips-197.pdf)
@@ -276,7 +278,7 @@ let bytes:[UInt8] = data.arrayOfBytes()
 
 ##Author
 
-Cryptoswift is owned and maintained by Marcin Krzyżanowski. You can follow me on Twitter at [@krzyzanowskim](http://twitter.com/krzyzanowskim) for project updates and releases.
+CryptoSwift is owned and maintained by Marcin Krzyżanowski. You can follow me on Twitter at [@krzyzanowskim](http://twitter.com/krzyzanowskim) for project updates and releases.
 
 [Marcin Krzyżanowski](http://www.krzyzanowskim.com)
 

Sources/CryptoSwift/BlockMode/CipherBlockMode.swift

@@ -6,8 +6,6 @@
 //  Copyright © 2016 Marcin Krzyzanowski. All rights reserved.
 //
 
-import Foundation
-
 public enum CipherBlockMode {
     case ECB, CBC, PCBC, CFB, OFB, CTR
 

Sources/CryptoSwift/Info.plist

@@ -15,7 +15,7 @@
 	<key>CFBundlePackageType</key>
 	<string>FMWK</string>
 	<key>CFBundleShortVersionString</key>
-	<string>0.2.3</string>
+	<string>0.3</string>
 	<key>CFBundleSignature</key>
 	<string>????</string>
 	<key>CFBundleVersion</key>