Skip to content

Commit

Permalink
Updates for the new swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a builds.
Browse files Browse the repository at this point in the history
  • Loading branch information
Bill Abt committed Jun 22, 2016
1 parent eef99bc commit 30ba41b
Show file tree
Hide file tree
Showing 3 changed files with 10 additions and 12 deletions.
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -36,7 +36,7 @@ let package = Package(
targets: [Target(name: "SSLService")],
dependencies: [
.Package(url: url, majorVersion: majorVersion, minor: minorVersion),
.Package(url: "https://github.com/IBM-Swift/BlueSocket.git", majorVersion: 0, minor: 5),
.Package(url: "https://github.com/IBM-Swift/BlueSocket.git", majorVersion: 0, minor: 6),
],
exclude: ["SSLService.xcodeproj", "README.md", "Sources/Info.plist"]
)
10 changes: 4 additions & 6 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -10,25 +10,23 @@ SSL Add-on framework for [BlueSocket](https://github.com/IBM-Swift/BlueSocket.gi
## Prerequisites

### Swift
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-09-a` toolchain *or*
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-05-31-a` toolchain *or*
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-06-a` toolchain (*Recommended*)
* Swift Open Source `swift-DEVELOPMENT-SNAPSHOT-2016-06-20-a` toolchain (**Minimum REQUIRED for latest release**)

### OS X

* OS X 10.11.0 (*El Capitan*) or higher
* Xcode Version 7.3.1 (7D1012) or higher and one of the above toolchains (*Recommended*)
* Xcode Version 8.0 beta (8S128d) or higher using the above toolchain (*Recommended*)
* OpenSSL: openssl-1.0.2g or higher. Available via `brew install openssl`.

### Linux

* Ubuntu 15.10 (or 14.04 but only tested on 15.10)
* One of the Swift Open Source toolchains listed above
* The Swift Open Source toolchain listed above
* OpenSSL is provided by the distribution

### Package Dependencies

* BlueSocket v0.5.17 or higher
* BlueSocket v0.6.0 or higher
* OpenSSL-OSX v0.2.4 or higher for OS X
* OpenSSL v0.2.0 or higher for Linux

Expand Down
10 changes: 5 additions & 5 deletions Sources/SSLService.swift
Original file line number Diff line number Diff line change
Expand Up @@ -439,7 +439,7 @@ public class SSLService : SSLServiceDelegate {
// - First the CA...
if let caFile = configuration.caCertificateFilePath {

if !NSFileManager.default().fileExists(atPath: caFile) {
if !FileManager.default().fileExists(atPath: caFile) {

throw SSLError.fail(Int(ENOENT), "CA Certificate doesn't exist in current directory.")
}
Expand All @@ -448,7 +448,7 @@ public class SSLService : SSLServiceDelegate {
if let caPath = configuration.caCertificateDirPath {

var isDir: ObjCBool = false
if !NSFileManager.default().fileExists(atPath: caPath, isDirectory: &isDir) {
if !FileManager.default().fileExists(atPath: caPath, isDirectory: &isDir) {

throw SSLError.fail(Int(ENOENT), "CA Certificate directory path doesn't exist.")
}
Expand All @@ -461,7 +461,7 @@ public class SSLService : SSLServiceDelegate {
// - Then the certificate file...
if let certFilePath = configuration.certificateFilePath {

if !NSFileManager.default().fileExists(atPath: certFilePath) {
if !FileManager.default().fileExists(atPath: certFilePath) {

throw SSLError.fail(Int(ENOENT), "Certificate doesn't exist at specified path.")
}
Expand All @@ -470,7 +470,7 @@ public class SSLService : SSLServiceDelegate {
// - Now the key file...
if let keyFilePath = configuration.keyFilePath {

if !NSFileManager.default().fileExists(atPath: keyFilePath) {
if !FileManager.default().fileExists(atPath: keyFilePath) {

throw SSLError.fail(Int(ENOENT), "Key file doesn't exist at specified path.")
}
Expand All @@ -479,7 +479,7 @@ public class SSLService : SSLServiceDelegate {
// - Finally, if present, the certificate chain path...
if let chainPath = configuration.certificateChainFilePath {

if !NSFileManager.default().fileExists(atPath: chainPath) {
if !FileManager.default().fileExists(atPath: chainPath) {

throw SSLError.fail(Int(ENOENT), "Certificate chain doesn't exist at specified path.")
}
Expand Down

0 comments on commit 30ba41b

Please sign in to comment.