|
|
@@ -41,7 +41,7 @@ Good mood
|
|
|
|
|
|
###Contribution
|
|
|
|
|
|
-For latest version, please check **develop** branch. This is latest development version that will be marged to **master** branch at some point.
|
|
|
+For latest version, please check **develop** branch. This is latest development version that will be merged into **master** branch at some point.
|
|
|
|
|
|
##Installation
|
|
|
|
|
|
@@ -49,7 +49,7 @@ To install CryptoSwift, add it as a submodule to your project (on the top level
|
|
|
|
|
|
git submodule add https://github.com/krzyzanowskim/CryptoSwift.git
|
|
|
|
|
|
-Then, drag the CryptoSwift.xcodeproj file into your Xcode project, and add CryptoSwift.framework as a dependency for your target.
|
|
|
+Then, drag the CryptoSwift.xcodeproj file into your Xcode project, and add CryptoSwift.framework as a dependency to your target.
|
|
|
|
|
|
#####iOS and OSX
|
|
|
By default project is setup for iOS. You need to switch to OSX SDK manually [see #8](https://github.com/krzyzanowskim/CryptoSwift/issues/8)
|
|
|
@@ -68,7 +68,7 @@ pod 'CryptoSwift'
|
|
|
import CryptoSwift
|
|
|
```
|
|
|
|
|
|
-Generally you should use `CryptoSwift.Hash`,`CryptoSwift.Cipher` enums or convenience extensions
|
|
|
+Generally you should use `CryptoSwift.Hash`, `CryptoSwift.Cipher` enums or convenience extensions
|
|
|
|
|
|
Hash enum usage
|
|
|
```swift
|
|
|
@@ -102,7 +102,7 @@ if let hash = "123".md5() {
|
|
|
}
|
|
|
```
|
|
|
|
|
|
-Some content-encryption algorithms assume the input length is a multiple of k octets, where k is greater than one. For such algorithms, the input shall be padded
|
|
|
+Some content-encryption algorithms assume the input length is a multiple of k octets, where k is greater than one. For such algorithms, the input shall be padded.
|
|
|
|
|
|
```swift
|
|
|
let paddedData = PKCS7(data: dataToEncrypt).addPadding(AES.blockSizeBytes())
|
|
|
@@ -166,14 +166,14 @@ let mac = Authenticator.Poly1305(key: key).authenticate(message)
|
|
|
##Contact
|
|
|
Marcin Krzyżanowski [@krzyzanowskim](http://twitter.com/krzyzanowskim)
|
|
|
|
|
|
-##Licence
|
|
|
+##License
|
|
|
|
|
|
Copyright (C) 2014 Marcin Krzyżanowski <marcin.krzyzanowski@gmail.com>
|
|
|
This software is provided 'as-is', without any express or implied warranty.
|
|
|
|
|
|
In no event will the authors be held liable for any damages arising from the use of this software.
|
|
|
|
|
|
-Permission is granted to anyone to use this software for any purpose,including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
|
|
|
+Permission is granted to anyone to use this software for any purpose, including commercial applications, and to alter it and redistribute it freely, subject to the following restrictions:
|
|
|
|
|
|
- The origin of this software must not be misrepresented; you must not claim that you wrote the original software. If you use this software in a product, an acknowledgment in the product documentation is required.
|
|
|
- Altered source versions must be plainly marked as such, and must not be misrepresented as being the original software.
|
Ayaka Nonaka