updating Turnstile + TurnstileCrypto to 8-18

.swift-version

@@ -1 +1 @@
-DEVELOPMENT-SNAPSHOT-2016-07-25-a
+DEVELOPMENT-SNAPSHOT-2016-08-18-a

Sources/Turnstile/Core/Subject.swift

@@ -35,7 +35,7 @@ public class Subject {
     public func login(credentials: Credentials, persist: Bool = false) throws {
         let account = try turnstile.realm.authenticate(credentials: credentials)
         let sessionID: String? = persist ? turnstile.sessionManager.createSession(user: self) : nil
-        let credentialType = credentials.dynamicType
+        let credentialType = type(of: credentials)
 
         authDetails = AuthenticationDetails(account: account, sessionID: sessionID, credentialType: credentialType)
     }

Sources/Turnstile/Realm/MemoryRealm.swift

@@ -49,11 +49,11 @@ public class MemoryRealm: Realm {
 /**
  Account object representing an account in the MemoryRealm.
  */
-private struct MemoryAccount: Account {
-    private var accountID: String
-    private let realm: Realm.Type = MemoryRealm.self
+fileprivate struct MemoryAccount: Account {
+    fileprivate var accountID: String
+    fileprivate let realm: Realm.Type = MemoryRealm.self
 
-    private init(id: String) {
+    fileprivate init(id: String) {
         accountID = id
     }
 }

Sources/TurnstileCrypto/BCrypt.swift

@@ -455,11 +455,11 @@ public class BCrypt {
     private func initKey() {
         // p = P_orig
         p = UnsafeMutablePointer<Int32>.allocate(capacity: BCrypt.P_orig.count)
-        p.initialize(from: UnsafeMutablePointer<Int32>(BCrypt.P_orig), count: BCrypt.P_orig.count)
+        p.initialize(from: UnsafeMutableRawPointer(mutating: BCrypt.P_orig).assumingMemoryBound(to: Int32.self), count: BCrypt.P_orig.count)
 
         // s = S_orig
         s = UnsafeMutablePointer<Int32>.allocate(capacity: BCrypt.S_orig.count)
-        s.initialize(from: UnsafeMutablePointer<Int32>(BCrypt.S_orig), count: BCrypt.S_orig.count)
+        s.initialize(from: UnsafeMutableRawPointer(mutating: BCrypt.S_orig).assumingMemoryBound(to: Int32.self), count: BCrypt.S_orig.count)
     }
 
     private func deinitKey() {
@@ -478,7 +478,7 @@ public class BCrypt {
         let plen  : Int = 18
         let slen  : Int = 1024
 
-        let keyPointer : UnsafeMutablePointer<Int8> = UnsafeMutablePointer<Int8>(key)
+        let keyPointer : UnsafeMutablePointer<Int8> = UnsafeMutablePointer<Int8>(mutating: key)
         let keyLength : Int = key.count
 
         for i in 0..<plen {
@@ -512,9 +512,9 @@ public class BCrypt {
 
 
 
-        let keyPointer: UnsafeMutablePointer<Int8> = UnsafeMutablePointer<Int8>(key)
+        let keyPointer: UnsafeMutablePointer<Int8> = UnsafeMutablePointer<Int8>(mutating: key)
         let keyLength: Int = key.count
-        let dataPointer: UnsafeMutablePointer<Int8> = UnsafeMutablePointer<Int8>(data)
+        let dataPointer: UnsafeMutablePointer<Int8> = UnsafeMutablePointer<Int8>(mutating: data)
         let dataLength: Int = data.count
 
         for i in 0..<plen {
@@ -561,7 +561,7 @@ public struct BCryptSalt {
     public let data: [UInt8]
 
     // temp for while old code is still Int8
-    private var dataInt8: [Int8] {
+    fileprivate var dataInt8: [Int8] {
         return data.map({Int8(bitPattern: $0)})
     }
 

Sources/TurnstileCrypto/URandom.swift

@@ -55,8 +55,7 @@ public class URandom: Random {
     /// Get a random int16
     public var int16: Int16 {
         let bytes = read(numBytes: 2)
-        let pointer = UnsafeMutablePointer<Int16>(bytes)
-        return pointer.pointee
+        return UnsafeMutableRawPointer(mutating: bytes).assumingMemoryBound(to: Int16.self).pointee
     }
 
     /// Get a random uint16
@@ -67,8 +66,7 @@ public class URandom: Random {
     /// Get a random int32
     public var int32: Int32 {
         let bytes = read(numBytes: 4)
-        let pointer = UnsafeMutablePointer<Int32>(bytes)
-        return pointer.pointee
+        return UnsafeMutableRawPointer(mutating: bytes).assumingMemoryBound(to: Int32.self).pointee
     }
 
     /// Get a random uint32
@@ -79,8 +77,7 @@ public class URandom: Random {
     /// Get a random int64
     public var int64: Int64 {
         let bytes = read(numBytes: 8)
-        let pointer = UnsafeMutablePointer<Int64>(bytes)
-        return pointer.pointee
+        return UnsafeMutableRawPointer(mutating: bytes).assumingMemoryBound(to: Int64.self).pointee
     }
 
     /// Get a random uint64
@@ -90,9 +87,8 @@ public class URandom: Random {
 
     /// Get a random int
     public var int: Int {
-        let bytes = read(numBytes: sizeof(Int.self))
-        let pointer = UnsafeMutablePointer<Int>(bytes)
-        return pointer.pointee
+        let bytes = read(numBytes: MemoryLayout<Int>.size)
+        return UnsafeMutableRawPointer(mutating: bytes).assumingMemoryBound(to: Int.self).pointee
     }
 
     /// Get a random uint

Tests/LinuxMain.swift

@@ -1,7 +1,7 @@
 import XCTest
-@testable import TurnstileTestSuite
-@testable import TurnstileCryptoTestSuite
-@testable import TurnstileWebTestSuite
+@testable import TurnstileTests
+@testable import TurnstileCryptoTests
+@testable import TurnstileWebTests
 
 XCTMain([
      testCase(SubjectTests.allTests),