Merge pull request #167 from t-ae/follow-crypt-api-change

tanner0101 · web-flow · commit 02edf2b060ea · 2018-04-21T01:41:57.000-04:00
Follow API change in Crypto
diff --git a/Sources/MySQL/Connection/MySQLConnection+Authenticate.swift b/Sources/MySQL/Connection/MySQLConnection+Authenticate.swift
@@ -33,9 +33,9 @@ extension MySQLConnection {
                     throw MySQLError(identifier: "salt", reason: "Server-supplied salt too short.", source: .capture())
                 }
                 let salt = Data(handshake.authPluginData[..<20])
-                let passwordHash = try SHA1.digest(password)
-                let passwordDoubleHash = try SHA1.digest(passwordHash)
-                var hash = try SHA1.digest(salt + passwordDoubleHash)
+                let passwordHash = try SHA1.hash(password)
+                let passwordDoubleHash = try SHA1.hash(passwordHash)
+                var hash = try SHA1.hash(salt + passwordDoubleHash)
                 for i in 0..<20 {
                     hash[i] = hash[i] ^ passwordHash[i]
                 }

Original file line number	Diff line number	Diff line change
`@@ -33,9 +33,9 @@ extension MySQLConnection {`
`33`	`33`	`throw MySQLError(identifier: "salt", reason: "Server-supplied salt too short.", source: .capture())`
`34`	`34`	`}`
`35`	`35`	`let salt = Data(handshake.authPluginData[..<20])`
`36`		`- let passwordHash = try SHA1.digest(password)`
`37`		`- let passwordDoubleHash = try SHA1.digest(passwordHash)`
`38`		`- var hash = try SHA1.digest(salt + passwordDoubleHash)`
	`36`	`+ let passwordHash = try SHA1.hash(password)`
	`37`	`+ let passwordDoubleHash = try SHA1.hash(passwordHash)`
	`38`	`+ var hash = try SHA1.hash(salt + passwordDoubleHash)`
`39`	`39`	`for i in 0..<20 {`
`40`	`40`	`hash[i] = hash[i] ^ passwordHash[i]`
`41`	`41`	`}`