Browse Source

calculate -> authenticate

Marcin Krzyżanowski 11 years ago
parent
commit
ef1ef21f68
4 changed files with 4 additions and 4 deletions
  1. 1 1
      CryptoSwift/Authenticator.swift
  2. 1 1
      CryptoSwift/NSDataExtension.swift
  3. 0 1
      CryptoSwift/Poly1305.swift
  4. 2 1
      README.md

+ 1 - 1
CryptoSwift/Authenticator.swift

@@ -24,7 +24,7 @@ public enum Authenticator {
     
     
     :returns: 16-byte message authentication code
     :returns: 16-byte message authentication code
     */
     */
-    public func calculate(message: NSData) -> NSData? {
+    public func authenticate(message: NSData) -> NSData? {
         switch (self) {
         switch (self) {
         case .Poly1305(let key):
         case .Poly1305(let key):
             return CryptoSwift.Poly1305.authenticate(key: key, message: message)
             return CryptoSwift.Poly1305.authenticate(key: key, message: message)

+ 1 - 1
CryptoSwift/NSDataExtension.swift

@@ -69,7 +69,7 @@ extension NSData {
     }
     }
     
     
     public func authenticate(authenticator: Authenticator) -> NSData? {
     public func authenticate(authenticator: Authenticator) -> NSData? {
-        return authenticator.calculate(self)
+        return authenticator.authenticate(self)
     }
     }
 }
 }
 
 

+ 0 - 1
CryptoSwift/Poly1305.swift

@@ -88,7 +88,6 @@ public class Poly1305 {
     
     
     :returns: Message Authentication Code
     :returns: Message Authentication Code
     */
     */
-    
     class internal func authenticate(# key: NSData, message: NSData) -> NSData? {
     class internal func authenticate(# key: NSData, message: NSData) -> NSData? {
         if let mac = Poly1305.authenticate(key: key.bytes(), message: message.bytes()) {
         if let mac = Poly1305.authenticate(key: key.bytes(), message: message.bytes()) {
             return NSData(bytes: mac, length: mac.count)
             return NSData(bytes: mac, length: mac.count)

+ 2 - 1
README.md

@@ -99,7 +99,8 @@ with extensions
 	
 	
 Message authenticators
 Message authenticators
 
 
-	let mac = Authenticator.Poly1305(key: key, message: msg).calculate()
+	// Calculate Message Authentication Code (MAC) for message
+	let mac = Authenticator.Poly1305(key: key).authenticate(message)
     
     
 ##Contact
 ##Contact
 Marcin Krzyżanowski [@krzyzanowskim](http://twitter.com/krzyzanowskim)
 Marcin Krzyżanowski [@krzyzanowskim](http://twitter.com/krzyzanowskim)