Skip to content
This repository has been archived by the owner on Sep 11, 2023. It is now read-only.

Commit

Permalink
Update to Kitura-Next
Browse files Browse the repository at this point in the history
  • Loading branch information
solarise9 committed Oct 29, 2020
1 parent 8ea901f commit ec75d4f
Show file tree
Hide file tree
Showing 9 changed files with 19 additions and 19 deletions.
4 changes: 2 additions & 2 deletions .github/CONTRIBUTING.md
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
# Contributing to IBM-Swift
# Contributing to Kitura-Next

We welcome contributions, and request you follow these guidelines.

Expand All @@ -18,7 +18,7 @@ trying to do and what went wrong. Provide as much context as possible so we can
### Contributor License Agreement

In order for us to accept pull-requests, the contributor must first complete
a Contributor License Agreement (CLA). Please see our [CLA repo](http://github.com/IBM-Swift/CLA) for more information.
a Contributor License Agreement (CLA). Please see our [CLA repo](http://github.com/Kitura-Next/CLA) for more information.

This clarifies the intellectual property license granted with any contribution. It is for your protection as a
Contributor as well as the protection of IBM and its customers; it does not
Expand Down
2 changes: 1 addition & 1 deletion .travis.yml
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ matrix:
env: SWIFT_SNAPSHOT=$SWIFT_DEVELOPMENT_SNAPSHOT

before_install:
- git clone https://github.com/IBM-Swift/Package-Builder.git
- git clone https://github.com/Kitura-Next/Package-Builder.git

script:
- openssl version
Expand Down
4 changes: 2 additions & 2 deletions BlueRSA.podspec
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@ Pod::Spec.new do |s|
s.name = "BlueRSA"
s.version = "1.0.34"
s.summary = "Swift cross-platform RSA crypto library using CommonCrypto/libcrypto via Package Manager."
s.homepage = "https://github.com/IBM-Swift/BlueRSA"
s.homepage = "https://github.com/Kitura-Next/BlueRSA"
s.license = { :type => "Apache License, Version 2.0" }
s.author = "IBM"
s.module_name = 'CryptorRSA'
Expand All @@ -12,7 +12,7 @@ s.osx.deployment_target = "10.12"
s.ios.deployment_target = "10.3"
s.tvos.deployment_target = "10.3"
s.watchos.deployment_target = "3.3"
s.source = { :git => "https://github.com/IBM-Swift/BlueRSA.git", :tag => s.version }
s.source = { :git => "https://github.com/Kitura-Next/BlueRSA.git", :tag => s.version }
s.source_files = "Sources/CryptorRSA/*.swift"
s.pod_target_xcconfig = {
'SWIFT_VERSION' => '5.0',
Expand Down
2 changes: 1 addition & 1 deletion Package.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var targetDependencies: [Target.Dependency] = []

#if os(Linux)

dependencies.append(.package(url: "https://github.com/IBM-Swift/OpenSSL.git", from: "2.2.0"))
dependencies.append(.package(url: "https://github.com/Kitura-Next/OpenSSL.git", from: "2.2.0"))
targetDependencies.append(.byName(name: "OpenSSL"))

#endif
Expand Down
4 changes: 2 additions & 2 deletions Package@swift-4.0.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ var targetDependencies: [Target.Dependency] = []

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)

let CryptoLibUrl = "https://github.com/IBM-Swift/CommonCrypto.git"
let CryptoLibUrl = "https://github.com/Kitura-Next/CommonCrypto.git"
let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.0")

#elseif os(Linux)

let CryptoLibUrl = "https://github.com/IBM-Swift/OpenSSL.git"
let CryptoLibUrl = "https://github.com/Kitura-Next/OpenSSL.git"
let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.1")
targetDependencies.append(.byName(name: "OpenSSL"))

Expand Down
4 changes: 2 additions & 2 deletions Package@swift-4.1.swift
Original file line number Diff line number Diff line change
Expand Up @@ -26,12 +26,12 @@ var targetDependencies: [Target.Dependency] = []

#if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)

let CryptoLibUrl = "https://github.com/IBM-Swift/CommonCrypto.git"
let CryptoLibUrl = "https://github.com/Kitura-Next/CommonCrypto.git"
let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.0")

#elseif os(Linux)

let CryptoLibUrl = "https://github.com/IBM-Swift/OpenSSL.git"
let CryptoLibUrl = "https://github.com/Kitura-Next/OpenSSL.git"
let CryptoLibVersion: Package.Dependency.Requirement = .upToNextMajor(from: "1.0.1")
targetDependencies.append(.byName(name: "OpenSSL"))

Expand Down
2 changes: 1 addition & 1 deletion Package@swift-4.2.swift
Original file line number Diff line number Diff line change
Expand Up @@ -28,7 +28,7 @@ var targetDependencies: [Target.Dependency] = []

#if os(Linux)

dependencies.append(.package(url: "https://github.com/IBM-Swift/OpenSSL.git", from: "2.2.0"))
dependencies.append(.package(url: "https://github.com/Kitura-Next/OpenSSL.git", from: "2.2.0"))
targetDependencies.append(.byName(name: "OpenSSL"))

#endif
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,9 +1,9 @@
<p align="center">
<a href="https://www.kitura.io/packages.html#all">
<img src="https://img.shields.io/badge/docs-kitura.io-1FBCE4.svg" alt="APIDoc">
<a href="https://www.kituranext.org/packages.html#all">
<img src="https://img.shields.io/badge/docs-kitura-1FBCE4.svg" alt="APIDoc">
</a>
<a href="https://travis-ci.org/IBM-Swift/BlueRSA">
<img src="https://travis-ci.org/IBM-Swift/BlueRSA.svg?branch=master" alt="Build Status - Master">
<a href="https://travis-ci.org/Kitura-Next/BlueRSA">
<img src="https://travis-ci.org/Kitura-Next/BlueRSA.svg?branch=master" alt="Build Status - Master">
</a>
<img src="https://img.shields.io/badge/os-macOS-green.svg?style=flat" alt="macOS">
<img src="https://img.shields.io/badge/os-iOS-green.svg?style=flat" alt="iOS">
Expand Down Expand Up @@ -79,15 +79,15 @@ To run the supplied unit tests for **CryptorRSA** from the command line:
To include BlueRSA into a Swift Package Manager package, add it to the `dependencies` attribute defined in your `Package.swift` file. You can select the version using the `majorVersion` and `minor` parameters. For example:
```
dependencies: [
.Package(url: "https://github.com/IBM-Swift/BlueRSA", majorVersion: <majorVersion>, minor: <minor>)
.Package(url: "https://github.com/Kitura-Next/BlueRSA", majorVersion: <majorVersion>, minor: <minor>)
]
```

#### Carthage

To include BlueRSA in a project using Carthage, add a line to your `Cartfile` with the GitHub organization and project names and version. For example:
```
github "IBM-Swift/BlueRSA" ~> <majorVersion>.<minor>
github "Kitura-Next/BlueRSA" ~> <majorVersion>.<minor>
```

### Before starting
Expand Down Expand Up @@ -315,4 +315,4 @@ We love to talk server-side Swift and Kitura. Join our [Slack](http://swift-at-i

## License

This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/IBM-Swift/BlueRSA/blob/master/LICENSE).
This library is licensed under Apache 2.0. Full license text is available in [LICENSE](https://github.com/Kitura-Next/BlueRSA/blob/master/LICENSE).
2 changes: 1 addition & 1 deletion Sources/CryptorRSA/CryptorRSA.swift
Original file line number Diff line number Diff line change
Expand Up @@ -938,7 +938,7 @@ public class CryptorRSA {
// Unlike other return values above, this return indicates if signature verifies or not
rc = signature.data.withUnsafeBytes({ (sig: UnsafeRawBufferPointer) -> Int32 in
// Wrapper for OpenSSL EVP_DigestVerifyFinal function defined in
// IBM-Swift/OpenSSL/shim.h, to provide compatibility with OpenSSL
// Kitura-Next/OpenSSL/shim.h, to provide compatibility with OpenSSL
// 1.0.1 and 1.0.2 on Ubuntu 14.04 and 16.04, respectively.
return SSL_EVP_digestVerifyFinal_wrapper(md_ctx, sig.baseAddress?.assumingMemoryBound(to: UInt8.self), signature.data.count)
})
Expand Down

0 comments on commit ec75d4f

Please sign in to comment.