SwiftPM
This commit is contained in:
parent
714cc6e263
commit
ae1103d64d
|
@ -60,7 +60,11 @@ screenshots
|
|||
|
||||
#build output
|
||||
/outputs
|
||||
.build
|
||||
|
||||
# Playgrounds
|
||||
timeline.xctimeline
|
||||
playground.xcworkspace
|
||||
|
||||
#SwiftPM
|
||||
.swiftpm
|
||||
|
|
|
@ -0,0 +1,201 @@
|
|||
Apache License
|
||||
Version 2.0, January 2004
|
||||
http://www.apache.org/licenses/
|
||||
|
||||
TERMS AND CONDITIONS FOR USE, REPRODUCTION, AND DISTRIBUTION
|
||||
|
||||
1. Definitions.
|
||||
|
||||
"License" shall mean the terms and conditions for use, reproduction,
|
||||
and distribution as defined by Sections 1 through 9 of this document.
|
||||
|
||||
"Licensor" shall mean the copyright owner or entity authorized by
|
||||
the copyright owner that is granting the License.
|
||||
|
||||
"Legal Entity" shall mean the union of the acting entity and all
|
||||
other entities that control, are controlled by, or are under common
|
||||
control with that entity. For the purposes of this definition,
|
||||
"control" means (i) the power, direct or indirect, to cause the
|
||||
direction or management of such entity, whether by contract or
|
||||
otherwise, or (ii) ownership of fifty percent (50%) or more of the
|
||||
outstanding shares, or (iii) beneficial ownership of such entity.
|
||||
|
||||
"You" (or "Your") shall mean an individual or Legal Entity
|
||||
exercising permissions granted by this License.
|
||||
|
||||
"Source" form shall mean the preferred form for making modifications,
|
||||
including but not limited to software source code, documentation
|
||||
source, and configuration files.
|
||||
|
||||
"Object" form shall mean any form resulting from mechanical
|
||||
transformation or translation of a Source form, including but
|
||||
not limited to compiled object code, generated documentation,
|
||||
and conversions to other media types.
|
||||
|
||||
"Work" shall mean the work of authorship, whether in Source or
|
||||
Object form, made available under the License, as indicated by a
|
||||
copyright notice that is included in or attached to the work
|
||||
(an example is provided in the Appendix below).
|
||||
|
||||
"Derivative Works" shall mean any work, whether in Source or Object
|
||||
form, that is based on (or derived from) the Work and for which the
|
||||
editorial revisions, annotations, elaborations, or other modifications
|
||||
represent, as a whole, an original work of authorship. For the purposes
|
||||
of this License, Derivative Works shall not include works that remain
|
||||
separable from, or merely link (or bind by name) to the interfaces of,
|
||||
the Work and Derivative Works thereof.
|
||||
|
||||
"Contribution" shall mean any work of authorship, including
|
||||
the original version of the Work and any modifications or additions
|
||||
to that Work or Derivative Works thereof, that is intentionally
|
||||
submitted to Licensor for inclusion in the Work by the copyright owner
|
||||
or by an individual or Legal Entity authorized to submit on behalf of
|
||||
the copyright owner. For the purposes of this definition, "submitted"
|
||||
means any form of electronic, verbal, or written communication sent
|
||||
to the Licensor or its representatives, including but not limited to
|
||||
communication on electronic mailing lists, source code control systems,
|
||||
and issue tracking systems that are managed by, or on behalf of, the
|
||||
Licensor for the purpose of discussing and improving the Work, but
|
||||
excluding communication that is conspicuously marked or otherwise
|
||||
designated in writing by the copyright owner as "Not a Contribution."
|
||||
|
||||
"Contributor" shall mean Licensor and any individual or Legal Entity
|
||||
on behalf of whom a Contribution has been received by Licensor and
|
||||
subsequently incorporated within the Work.
|
||||
|
||||
2. Grant of Copyright License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
copyright license to reproduce, prepare Derivative Works of,
|
||||
publicly display, publicly perform, sublicense, and distribute the
|
||||
Work and such Derivative Works in Source or Object form.
|
||||
|
||||
3. Grant of Patent License. Subject to the terms and conditions of
|
||||
this License, each Contributor hereby grants to You a perpetual,
|
||||
worldwide, non-exclusive, no-charge, royalty-free, irrevocable
|
||||
(except as stated in this section) patent license to make, have made,
|
||||
use, offer to sell, sell, import, and otherwise transfer the Work,
|
||||
where such license applies only to those patent claims licensable
|
||||
by such Contributor that are necessarily infringed by their
|
||||
Contribution(s) alone or by combination of their Contribution(s)
|
||||
with the Work to which such Contribution(s) was submitted. If You
|
||||
institute patent litigation against any entity (including a
|
||||
cross-claim or counterclaim in a lawsuit) alleging that the Work
|
||||
or a Contribution incorporated within the Work constitutes direct
|
||||
or contributory patent infringement, then any patent licenses
|
||||
granted to You under this License for that Work shall terminate
|
||||
as of the date such litigation is filed.
|
||||
|
||||
4. Redistribution. You may reproduce and distribute copies of the
|
||||
Work or Derivative Works thereof in any medium, with or without
|
||||
modifications, and in Source or Object form, provided that You
|
||||
meet the following conditions:
|
||||
|
||||
(a) You must give any other recipients of the Work or
|
||||
Derivative Works a copy of this License; and
|
||||
|
||||
(b) You must cause any modified files to carry prominent notices
|
||||
stating that You changed the files; and
|
||||
|
||||
(c) You must retain, in the Source form of any Derivative Works
|
||||
that You distribute, all copyright, patent, trademark, and
|
||||
attribution notices from the Source form of the Work,
|
||||
excluding those notices that do not pertain to any part of
|
||||
the Derivative Works; and
|
||||
|
||||
(d) If the Work includes a "NOTICE" text file as part of its
|
||||
distribution, then any Derivative Works that You distribute must
|
||||
include a readable copy of the attribution notices contained
|
||||
within such NOTICE file, excluding those notices that do not
|
||||
pertain to any part of the Derivative Works, in at least one
|
||||
of the following places: within a NOTICE text file distributed
|
||||
as part of the Derivative Works; within the Source form or
|
||||
documentation, if provided along with the Derivative Works; or,
|
||||
within a display generated by the Derivative Works, if and
|
||||
wherever such third-party notices normally appear. The contents
|
||||
of the NOTICE file are for informational purposes only and
|
||||
do not modify the License. You may add Your own attribution
|
||||
notices within Derivative Works that You distribute, alongside
|
||||
or as an addendum to the NOTICE text from the Work, provided
|
||||
that such additional attribution notices cannot be construed
|
||||
as modifying the License.
|
||||
|
||||
You may add Your own copyright statement to Your modifications and
|
||||
may provide additional or different license terms and conditions
|
||||
for use, reproduction, or distribution of Your modifications, or
|
||||
for any such Derivative Works as a whole, provided Your use,
|
||||
reproduction, and distribution of the Work otherwise complies with
|
||||
the conditions stated in this License.
|
||||
|
||||
5. Submission of Contributions. Unless You explicitly state otherwise,
|
||||
any Contribution intentionally submitted for inclusion in the Work
|
||||
by You to the Licensor shall be under the terms and conditions of
|
||||
this License, without any additional terms or conditions.
|
||||
Notwithstanding the above, nothing herein shall supersede or modify
|
||||
the terms of any separate license agreement you may have executed
|
||||
with Licensor regarding such Contributions.
|
||||
|
||||
6. Trademarks. This License does not grant permission to use the trade
|
||||
names, trademarks, service marks, or product names of the Licensor,
|
||||
except as required for reasonable and customary use in describing the
|
||||
origin of the Work and reproducing the content of the NOTICE file.
|
||||
|
||||
7. Disclaimer of Warranty. Unless required by applicable law or
|
||||
agreed to in writing, Licensor provides the Work (and each
|
||||
Contributor provides its Contributions) on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or
|
||||
implied, including, without limitation, any warranties or conditions
|
||||
of TITLE, NON-INFRINGEMENT, MERCHANTABILITY, or FITNESS FOR A
|
||||
PARTICULAR PURPOSE. You are solely responsible for determining the
|
||||
appropriateness of using or redistributing the Work and assume any
|
||||
risks associated with Your exercise of permissions under this License.
|
||||
|
||||
8. Limitation of Liability. In no event and under no legal theory,
|
||||
whether in tort (including negligence), contract, or otherwise,
|
||||
unless required by applicable law (such as deliberate and grossly
|
||||
negligent acts) or agreed to in writing, shall any Contributor be
|
||||
liable to You for damages, including any direct, indirect, special,
|
||||
incidental, or consequential damages of any character arising as a
|
||||
result of this License or out of the use or inability to use the
|
||||
Work (including but not limited to damages for loss of goodwill,
|
||||
work stoppage, computer failure or malfunction, or any and all
|
||||
other commercial damages or losses), even if such Contributor
|
||||
has been advised of the possibility of such damages.
|
||||
|
||||
9. Accepting Warranty or Additional Liability. While redistributing
|
||||
the Work or Derivative Works thereof, You may choose to offer,
|
||||
and charge a fee for, acceptance of support, warranty, indemnity,
|
||||
or other liability obligations and/or rights consistent with this
|
||||
License. However, in accepting such obligations, You may act only
|
||||
on Your own behalf and on Your sole responsibility, not on behalf
|
||||
of any other Contributor, and only if You agree to indemnify,
|
||||
defend, and hold each Contributor harmless for any liability
|
||||
incurred by, or claims asserted against, such Contributor by reason
|
||||
of your accepting any such warranty or additional liability.
|
||||
|
||||
END OF TERMS AND CONDITIONS
|
||||
|
||||
APPENDIX: How to apply the Apache License to your work.
|
||||
|
||||
To apply the Apache License to your work, attach the following
|
||||
boilerplate notice, with the fields enclosed by brackets "{}"
|
||||
replaced with your own identifying information. (Don't include
|
||||
the brackets!) The text should be enclosed in the appropriate
|
||||
comment syntax for the file format. We also recommend that a
|
||||
file or class name and description of purpose be included on the
|
||||
same "printed page" as the copyright notice for easier
|
||||
identification within third-party archives.
|
||||
|
||||
Copyright {yyyy} {name of copyright owner}
|
||||
|
||||
Licensed under the Apache License, Version 2.0 (the "License");
|
||||
you may not use this file except in compliance with the License.
|
||||
You may obtain a copy of the License at
|
||||
|
||||
http://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS,
|
||||
WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
|
||||
See the License for the specific language governing permissions and
|
||||
limitations under the License.
|
|
@ -13,11 +13,11 @@
|
|||
s.author = { "Francisco Gindre" => "francisco.gindre@gmail.com" }
|
||||
s.source = { :git => "https://github.com/zcash-hackworks/MnemonicSwift.git", :tag => s.version }
|
||||
s.source_files = "MnemonicSwift/**/*.swift",
|
||||
s.swift_version = "5.1"
|
||||
s.swift_version = "5.3"
|
||||
s.ios.deployment_target = "13.0"
|
||||
s.osx.deployment_target = "10.15"
|
||||
|
||||
s.framework = "CryptoKit"
|
||||
s.framework = "Crypto"
|
||||
s.test_spec "Tests" do |test_spec|
|
||||
test_spec.source_files = "Tests/*.swift"
|
||||
test_spec.resources = ["Tests/*.json"]
|
||||
|
|
|
@ -3,7 +3,7 @@
|
|||
archiveVersion = 1;
|
||||
classes = {
|
||||
};
|
||||
objectVersion = 51;
|
||||
objectVersion = 52;
|
||||
objects = {
|
||||
|
||||
/* Begin PBXBuildFile section */
|
||||
|
@ -11,6 +11,9 @@
|
|||
0DDAF3A52408728600EA9427 /* PKC5.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0DDAF3A32408728600EA9427 /* PKC5.swift */; };
|
||||
122777029525BA9CC4F9A958 /* Mnemonic.swift in Sources */ = {isa = PBXBuildFile; fileRef = 12B9024EB02AB18E1F44789A /* Mnemonic.swift */; };
|
||||
2A51344C2F30A6CE1A391BCF /* MnemonicSwiftTests.swift in Sources */ = {isa = PBXBuildFile; fileRef = 0A5EC633D7524CD344B44513 /* MnemonicSwiftTests.swift */; };
|
||||
2E8756142768CFA5000BBABD /* Crypto in Frameworks */ = {isa = PBXBuildFile; productRef = 2E8756132768CFA5000BBABD /* Crypto */; };
|
||||
2E8756182768D6DF000BBABD /* Crypto in Frameworks */ = {isa = PBXBuildFile; productRef = 2E8756172768D6DF000BBABD /* Crypto */; };
|
||||
2E87561A2768D702000BBABD /* Crypto in Frameworks */ = {isa = PBXBuildFile; productRef = 2E8756192768D702000BBABD /* Crypto */; };
|
||||
422A84796316566997821D77 /* vectors.json in Resources */ = {isa = PBXBuildFile; fileRef = C3E5287598681E0527694214 /* vectors.json */; };
|
||||
81D18E658D26212E4D7647D8 /* String+MnemonicData.swift in Sources */ = {isa = PBXBuildFile; fileRef = 256E6CB62D82160ACBA1512E /* String+MnemonicData.swift */; };
|
||||
8DC3D3DA23DBEAD93257DE4F /* MnemonicSwift.framework in Frameworks */ = {isa = PBXBuildFile; fileRef = DC7EE929BD11BA8AB38F9C19 /* MnemonicSwift.framework */; };
|
||||
|
@ -102,6 +105,7 @@
|
|||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
985214FD923DB7C6DDBA36EF /* MnemonicSwift.framework in Frameworks */,
|
||||
2E8756142768CFA5000BBABD /* Crypto in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
@ -109,6 +113,7 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
2E87561A2768D702000BBABD /* Crypto in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
@ -116,6 +121,7 @@
|
|||
isa = PBXFrameworksBuildPhase;
|
||||
buildActionMask = 2147483647;
|
||||
files = (
|
||||
2E8756182768D6DF000BBABD /* Crypto in Frameworks */,
|
||||
);
|
||||
runOnlyForDeploymentPostprocessing = 0;
|
||||
};
|
||||
|
@ -198,6 +204,9 @@
|
|||
dependencies = (
|
||||
);
|
||||
name = MnemonicSwift_iOS;
|
||||
packageProductDependencies = (
|
||||
2E8756172768D6DF000BBABD /* Crypto */,
|
||||
);
|
||||
productName = MnemonicSwift_iOS;
|
||||
productReference = 7DCB97C4881969FDB72C61DB /* MnemonicSwift.framework */;
|
||||
productType = "com.apple.product-type.framework";
|
||||
|
@ -215,6 +224,9 @@
|
|||
dependencies = (
|
||||
);
|
||||
name = MnemonicSwift_macOS;
|
||||
packageProductDependencies = (
|
||||
2E8756192768D702000BBABD /* Crypto */,
|
||||
);
|
||||
productName = MnemonicSwift_macOS;
|
||||
productReference = DC7EE929BD11BA8AB38F9C19 /* MnemonicSwift.framework */;
|
||||
productType = "com.apple.product-type.framework";
|
||||
|
@ -253,6 +265,9 @@
|
|||
33E8B97F445A81D3D3B6D0B7 /* PBXTargetDependency */,
|
||||
);
|
||||
name = MnemonicSwiftTests_iOS;
|
||||
packageProductDependencies = (
|
||||
2E8756132768CFA5000BBABD /* Crypto */,
|
||||
);
|
||||
productName = MnemonicSwiftTests_iOS;
|
||||
productReference = 1645FE576891F45DC72864F6 /* MnemonicSwiftTests.xctest */;
|
||||
productType = "com.apple.product-type.bundle.unit-test";
|
||||
|
@ -263,7 +278,7 @@
|
|||
1EE727346083BF37696D380B /* Project object */ = {
|
||||
isa = PBXProject;
|
||||
attributes = {
|
||||
LastUpgradeCheck = 1020;
|
||||
LastUpgradeCheck = 1310;
|
||||
};
|
||||
buildConfigurationList = F5079FB8BED8C51BDEEB8C7C /* Build configuration list for PBXProject "MnemonicSwift" */;
|
||||
compatibilityVersion = "Xcode 10.0";
|
||||
|
@ -274,6 +289,9 @@
|
|||
en,
|
||||
);
|
||||
mainGroup = A44468790B8FFF397004AD5A;
|
||||
packageReferences = (
|
||||
2E8756122768CFA5000BBABD /* XCRemoteSwiftPackageReference "swift-crypto" */,
|
||||
);
|
||||
projectDirPath = "";
|
||||
projectRoot = "";
|
||||
targets = (
|
||||
|
@ -606,6 +624,7 @@
|
|||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
|
@ -664,6 +683,7 @@
|
|||
CLANG_WARN_OBJC_IMPLICIT_RETAIN_SELF = YES;
|
||||
CLANG_WARN_OBJC_LITERAL_CONVERSION = YES;
|
||||
CLANG_WARN_OBJC_ROOT_CLASS = YES_ERROR;
|
||||
CLANG_WARN_QUOTED_INCLUDE_IN_FRAMEWORK_HEADER = YES;
|
||||
CLANG_WARN_RANGE_LOOP_ANALYSIS = YES;
|
||||
CLANG_WARN_STRICT_PROTOTYPES = YES;
|
||||
CLANG_WARN_SUSPICIOUS_MOVE = YES;
|
||||
|
@ -775,6 +795,35 @@
|
|||
defaultConfigurationName = Debug;
|
||||
};
|
||||
/* End XCConfigurationList section */
|
||||
|
||||
/* Begin XCRemoteSwiftPackageReference section */
|
||||
2E8756122768CFA5000BBABD /* XCRemoteSwiftPackageReference "swift-crypto" */ = {
|
||||
isa = XCRemoteSwiftPackageReference;
|
||||
repositoryURL = "https://github.com/apple/swift-crypto.git";
|
||||
requirement = {
|
||||
kind = upToNextMajorVersion;
|
||||
minimumVersion = 2.0.0;
|
||||
};
|
||||
};
|
||||
/* End XCRemoteSwiftPackageReference section */
|
||||
|
||||
/* Begin XCSwiftPackageProductDependency section */
|
||||
2E8756132768CFA5000BBABD /* Crypto */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 2E8756122768CFA5000BBABD /* XCRemoteSwiftPackageReference "swift-crypto" */;
|
||||
productName = Crypto;
|
||||
};
|
||||
2E8756172768D6DF000BBABD /* Crypto */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 2E8756122768CFA5000BBABD /* XCRemoteSwiftPackageReference "swift-crypto" */;
|
||||
productName = Crypto;
|
||||
};
|
||||
2E8756192768D702000BBABD /* Crypto */ = {
|
||||
isa = XCSwiftPackageProductDependency;
|
||||
package = 2E8756122768CFA5000BBABD /* XCRemoteSwiftPackageReference "swift-crypto" */;
|
||||
productName = Crypto;
|
||||
};
|
||||
/* End XCSwiftPackageProductDependency section */
|
||||
};
|
||||
rootObject = 1EE727346083BF37696D380B /* Project object */;
|
||||
}
|
||||
|
|
|
@ -2,6 +2,6 @@
|
|||
<Workspace
|
||||
version = "1.0">
|
||||
<FileRef
|
||||
location = "self:/Users/pacu/Repos/ECC/MnemonicSwift/MnemonicSwift.xcodeproj">
|
||||
location = "self:">
|
||||
</FileRef>
|
||||
</Workspace>
|
||||
|
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
{
|
||||
"package": "swift-crypto",
|
||||
"repositoryURL": "https://github.com/apple/swift-crypto.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "9c53b7a758bb849a7df1bd2314395f5f0c14306f",
|
||||
"version": "2.0.3"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"version": 1
|
||||
}
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1150"
|
||||
LastUpgradeVersion = "1310"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
@ -1,6 +1,6 @@
|
|||
<?xml version="1.0" encoding="UTF-8"?>
|
||||
<Scheme
|
||||
LastUpgradeVersion = "1160"
|
||||
LastUpgradeVersion = "1310"
|
||||
version = "1.3">
|
||||
<BuildAction
|
||||
parallelizeBuildables = "YES"
|
||||
|
|
|
@ -1,40 +1,41 @@
|
|||
// Copyright Keefer Taylor, 2018
|
||||
// Copyright Electric Coin Company, 2020
|
||||
|
||||
import Foundation
|
||||
|
||||
public extension UInt8 {
|
||||
func mnemonicBits() -> [String] {
|
||||
let totalBitsCount = MemoryLayout<UInt8>.size * 8
|
||||
|
||||
var bitsArray = [String](repeating: "0", count: totalBitsCount)
|
||||
|
||||
for j in 0 ..< totalBitsCount {
|
||||
let bitVal: UInt8 = 1 << UInt8(totalBitsCount - 1 - j)
|
||||
let check = self & bitVal
|
||||
|
||||
if check != 0 {
|
||||
bitsArray[j] = "1"
|
||||
}
|
||||
func mnemonicBits() -> [String] {
|
||||
let totalBitsCount = MemoryLayout<UInt8>.size * 8
|
||||
|
||||
var bitsArray = [String](repeating: "0", count: totalBitsCount)
|
||||
|
||||
for j in 0 ..< totalBitsCount {
|
||||
let bitVal: UInt8 = 1 << UInt8(totalBitsCount - 1 - j)
|
||||
let check = self & bitVal
|
||||
|
||||
if check != 0 {
|
||||
bitsArray[j] = "1"
|
||||
}
|
||||
}
|
||||
return bitsArray
|
||||
}
|
||||
return bitsArray
|
||||
}
|
||||
}
|
||||
|
||||
public extension Data {
|
||||
func toBitArray() -> [String] {
|
||||
var toReturn = [String]()
|
||||
for num in [UInt8](self) {
|
||||
toReturn.append(contentsOf: num.mnemonicBits())
|
||||
func toBitArray() -> [String] {
|
||||
var toReturn = [String]()
|
||||
for num in [UInt8](self) {
|
||||
toReturn.append(contentsOf: num.mnemonicBits())
|
||||
}
|
||||
return toReturn
|
||||
}
|
||||
return toReturn
|
||||
}
|
||||
}
|
||||
public extension Array where Element == UInt8 {
|
||||
func toBitArray() -> [String] {
|
||||
var toReturn = [String]()
|
||||
for num in self {
|
||||
toReturn.append(contentsOf: num.mnemonicBits())
|
||||
}
|
||||
return toReturn
|
||||
var toReturn = [String]()
|
||||
for num in self {
|
||||
toReturn.append(contentsOf: num.mnemonicBits())
|
||||
}
|
||||
return toReturn
|
||||
}
|
||||
}
|
||||
|
|
|
@ -1,8 +1,10 @@
|
|||
// Copyright Keefer Taylor, 2018
|
||||
// Copyright Electric Coin Company, 2020
|
||||
import CryptoKit
|
||||
|
||||
import Crypto
|
||||
import Foundation
|
||||
import Security
|
||||
|
||||
public enum MnemonicLanguageType {
|
||||
case english
|
||||
case chinese
|
||||
|
@ -125,7 +127,7 @@ public enum Mnemonic {
|
|||
|
||||
do {
|
||||
let bytes =
|
||||
try PKCS5.PBKDF2SHA512(password: passwordBytes, salt: [UInt8](saltData), iterations: iterations)
|
||||
try PKCS5.PBKDF2SHA512(password: passwordBytes, salt: [UInt8](saltData), iterations: iterations)
|
||||
return bytes
|
||||
} catch {
|
||||
throw MnemonicError.invalidInput
|
||||
|
@ -143,20 +145,22 @@ public enum Mnemonic {
|
|||
/// - `MnemonicError.entropyCreationFailed` if random bytes created for entropy fails
|
||||
/// - `MnemonicError.InvalidHexString` when an invalid string is given
|
||||
/// - `MnemonicError.invalidBitString` when the resulting bitstring generates an invalid word index
|
||||
public static func generateMnemonic(strength: Int, language: MnemonicLanguageType = .english) throws
|
||||
-> String {
|
||||
guard strength % 32 == 0 else {
|
||||
throw MnemonicError.invalidInput
|
||||
}
|
||||
|
||||
let count = strength / 8
|
||||
var bytes = [UInt8](repeating: 0, count: count)
|
||||
|
||||
guard SecRandomCopyBytes(kSecRandomDefault, count, &bytes) == errSecSuccess else {
|
||||
throw MnemonicError.entropyCreationFailed
|
||||
}
|
||||
|
||||
return try mnemonicString(from: bytes.hexString, language: language)
|
||||
public static func generateMnemonic(
|
||||
strength: Int,
|
||||
language: MnemonicLanguageType = .english
|
||||
) throws -> String {
|
||||
guard strength % 32 == 0 else {
|
||||
throw MnemonicError.invalidInput
|
||||
}
|
||||
|
||||
let count = strength / 8
|
||||
var bytes = [UInt8](repeating: 0, count: count)
|
||||
|
||||
guard SecRandomCopyBytes(kSecRandomDefault, count, &bytes) == errSecSuccess else {
|
||||
throw MnemonicError.entropyCreationFailed
|
||||
}
|
||||
|
||||
return try mnemonicString(from: bytes.hexString, language: language)
|
||||
}
|
||||
|
||||
/// Validate that the given string is a valid mnemonic phrase according to BIP-39
|
||||
|
@ -196,7 +200,7 @@ public enum Mnemonic {
|
|||
let checksumLength = mnemonicComponents.count / 3
|
||||
|
||||
guard checksumLength == wordCount.checksumLength else {
|
||||
throw MnemonicError.checksumError
|
||||
throw MnemonicError.checksumError
|
||||
}
|
||||
|
||||
let dataBitsLength = seedBits.count - checksumLength
|
||||
|
@ -237,16 +241,16 @@ public enum Mnemonic {
|
|||
/// - Throws: `MnemonicError.invalidInput` if the given String cannot be converted to Data
|
||||
static func normalizedString(_ string: String) throws -> Data {
|
||||
guard let data = string.data(using: .utf8, allowLossyConversion: true),
|
||||
let dataString = String(data: data, encoding: .utf8),
|
||||
let normalizedData = dataString.data(using: .utf8, allowLossyConversion: false) else {
|
||||
throw MnemonicError.invalidInput
|
||||
}
|
||||
let dataString = String(data: data, encoding: .utf8),
|
||||
let normalizedData = dataString.data(using: .utf8, allowLossyConversion: false) else {
|
||||
throw MnemonicError.invalidInput
|
||||
}
|
||||
return normalizedData
|
||||
}
|
||||
}
|
||||
|
||||
extension PKCS5 {
|
||||
public static func PBKDF2SHA512(password: String, salt: String, iterations: Int = 2_048, keyLength: Int = 64) throws -> Array<UInt8> {
|
||||
public static func PBKDF2SHA512(password: String, salt: String, iterations: Int = 2_048, keyLength: Int = 64) throws -> [UInt8] {
|
||||
|
||||
let saltData = try Mnemonic.normalizedString(salt)
|
||||
|
||||
|
|
|
@ -4,8 +4,8 @@
|
|||
//
|
||||
// Created by Liu Pengpeng on 2019/10/10.
|
||||
// Modifed by Francisco Gindre on 2020/02/02
|
||||
|
||||
import CommonCrypto
|
||||
import CryptoKit
|
||||
import Foundation
|
||||
|
||||
public struct PKCS5 {
|
||||
|
@ -13,7 +13,7 @@ public struct PKCS5 {
|
|||
case invalidInput
|
||||
}
|
||||
|
||||
public static func PBKDF2SHA512(password: Array<Int8>, salt: Array<UInt8>, iterations: Int = 2_048, keyLength: Int = 64) throws -> Array<UInt8> {
|
||||
public static func PBKDF2SHA512(password: [Int8], salt: [UInt8], iterations: Int = 2_048, keyLength: Int = 64) throws -> [UInt8] {
|
||||
var bytes = [UInt8](repeating: 0, count: keyLength)
|
||||
|
||||
try bytes.withUnsafeMutableBytes { (outputBytes: UnsafeMutableRawBufferPointer) in
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
// Copyright Keefer Taylor, 2018
|
||||
// Copyright Electric Coin Company, 2020
|
||||
|
||||
import Foundation
|
||||
|
||||
extension String {
|
||||
|
|
|
@ -0,0 +1,42 @@
|
|||
The SwiftCrypto Project
|
||||
=======================
|
||||
|
||||
Please visit the SwiftCrypto web site for more information:
|
||||
|
||||
* https://github.com/apple/swift-crypto
|
||||
|
||||
Copyright 2019 The SwiftCrypto Project
|
||||
|
||||
The SwiftCrypto Project licenses this file to you under the Apache License,
|
||||
version 2.0 (the "License"); you may not use this file except in compliance
|
||||
with the License. You may obtain a copy of the License at:
|
||||
|
||||
https://www.apache.org/licenses/LICENSE-2.0
|
||||
|
||||
Unless required by applicable law or agreed to in writing, software
|
||||
distributed under the License is distributed on an "AS IS" BASIS, WITHOUT
|
||||
WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the
|
||||
License for the specific language governing permissions and limitations
|
||||
under the License.
|
||||
|
||||
Also, please refer to each LICENSE.<component>.txt file, which is located in
|
||||
the 'license' directory of the distribution file, for the license terms of the
|
||||
components that this product depends on.
|
||||
|
||||
-------------------------------------------------------------------------------
|
||||
|
||||
This product contains test vectors from Google's wycheproof project.
|
||||
|
||||
* LICENSE (Apache License 2.0):
|
||||
* https://github.com/google/wycheproof/blob/master/LICENSE
|
||||
* HOMEPAGE:
|
||||
* https://github.com/google/wycheproof
|
||||
|
||||
---
|
||||
|
||||
This product contains a derivation of various scripts from SwiftNIO.
|
||||
|
||||
* LICENSE (Apache License 2.0):
|
||||
* https://www.apache.org/licenses/LICENSE-2.0
|
||||
* HOMEPAGE:
|
||||
* https://github.com/apple/swift-nio
|
|
@ -0,0 +1,16 @@
|
|||
{
|
||||
"object": {
|
||||
"pins": [
|
||||
{
|
||||
"package": "swift-crypto",
|
||||
"repositoryURL": "https://github.com/apple/swift-crypto.git",
|
||||
"state": {
|
||||
"branch": null,
|
||||
"revision": "9c53b7a758bb849a7df1bd2314395f5f0c14306f",
|
||||
"version": "2.0.3"
|
||||
}
|
||||
}
|
||||
]
|
||||
},
|
||||
"version": 1
|
||||
}
|
|
@ -0,0 +1,32 @@
|
|||
// swift-tools-version:5.3.0
|
||||
|
||||
import PackageDescription
|
||||
|
||||
let package = Package(
|
||||
name: "MnemonicSwift",
|
||||
platforms: [
|
||||
.iOS(.v13),
|
||||
.macOS(.v10_15)
|
||||
],
|
||||
products: [
|
||||
.library(
|
||||
name: "MnemonicSwift",
|
||||
targets: ["MnemonicSwift"])
|
||||
],
|
||||
dependencies: [
|
||||
.package(url: "https://github.com/apple/swift-crypto.git", "1.0.0" ..< "3.0.0")
|
||||
],
|
||||
targets: [
|
||||
.target(
|
||||
name: "MnemonicSwift",
|
||||
dependencies: [.product(name: "Crypto", package: "swift-crypto")],
|
||||
path: "MnemonicSwift",
|
||||
exclude: ["Info.plist"]),
|
||||
.testTarget(
|
||||
name: "MnemonicSwiftTests",
|
||||
dependencies: ["MnemonicSwift"],
|
||||
path: "Tests",
|
||||
exclude: ["Info.plist"],
|
||||
resources: [.copy("vectors.json")])
|
||||
]
|
||||
)
|
|
@ -4,7 +4,7 @@
|
|||
|
||||
An implementation of BIP39 in Swift. MnemonicSwift supports both English and Chinese mnemonics.
|
||||
|
||||
This library is a fork of [MnemonicKit](https://github.com/keefertaylor/MnemonicKit). This fork provides provides support for BIP39 using CryptoKit.
|
||||
This library is a fork of [MnemonicKit](https://github.com/keefertaylor/MnemonicKit). This fork provides provides support for BIP39 using Crypto.
|
||||
|
||||
**NOTE to 1.0.0 users**: If you are using 1.0.0 in your project, we no longer maintain that version. Upgrade to 2.0.0 immediately.
|
||||
|
||||
|
|
|
@ -1,5 +1,6 @@
|
|||
// Copyright Keefer Taylor, 2018
|
||||
// Copyright Electric Coin Company, 2020
|
||||
|
||||
@testable import MnemonicSwift
|
||||
import XCTest
|
||||
|
||||
|
@ -18,11 +19,11 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
/// Test that MnemonicSwift can generate mnemonic strings from hex representations.
|
||||
func testGenerateMnemonicFromHex() throws {
|
||||
guard let vectors = MnemonicSwiftTests.dictionaryFromTestInputFile(),
|
||||
let testCases = vectors[englishTestCases] as? [[String]] else {
|
||||
XCTFail("Failed to parse input file.")
|
||||
return
|
||||
}
|
||||
|
||||
let testCases = vectors[englishTestCases] as? [[String]] else {
|
||||
XCTFail("Failed to parse input file.")
|
||||
return
|
||||
}
|
||||
|
||||
for testCase in testCases {
|
||||
let expectedMnemonicString = testCase[mnenomicStringIndex]
|
||||
let hexRepresentation = testCase[hexRepresentationIndex]
|
||||
|
@ -35,11 +36,11 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
/// Test that MnemonicSwift can generate deterministic seed strings strings without a passphrase.
|
||||
func testGenerateDeterministicSeedStringWithPassphrase() throws {
|
||||
guard let vectors = MnemonicSwiftTests.dictionaryFromTestInputFile(),
|
||||
let testCases = vectors[englishTestCases] as? [[String]] else {
|
||||
XCTFail("Failed to parse input file.")
|
||||
return
|
||||
}
|
||||
|
||||
let testCases = vectors[englishTestCases] as? [[String]] else {
|
||||
XCTFail("Failed to parse input file.")
|
||||
return
|
||||
}
|
||||
|
||||
for testCase in testCases {
|
||||
let mnemonicString = testCase[mnenomicStringIndex]
|
||||
let expectedDeterministicSeedString = testCase[deterministicSeedStringIndex]
|
||||
|
@ -52,18 +53,17 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
}
|
||||
|
||||
static func dictionaryFromTestInputFile() -> [String: Any]? {
|
||||
let testBundle = Bundle(for: self)
|
||||
guard let url = testBundle.url(forResource: "vectors", withExtension: "json") else {
|
||||
guard let url = Bundle.module.url(forResource: "vectors", withExtension: "json") else {
|
||||
return nil
|
||||
}
|
||||
|
||||
do {
|
||||
let data = try Data(contentsOf: url)
|
||||
let options: JSONSerialization.ReadingOptions = [.allowFragments, .mutableContainers, .mutableLeaves]
|
||||
let options: JSONSerialization.ReadingOptions = [.allowFragments, .mutableContainers, .mutableLeaves]
|
||||
guard let parsedDictionary =
|
||||
try JSONSerialization.jsonObject(with: data, options: options) as? [String: Any] else {
|
||||
return nil
|
||||
}
|
||||
try JSONSerialization.jsonObject(with: data, options: options) as? [String: Any] else {
|
||||
return nil
|
||||
}
|
||||
return parsedDictionary
|
||||
} catch {
|
||||
return nil
|
||||
|
@ -86,8 +86,8 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
|
||||
XCTAssertNoThrow(try {
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 32).components(separatedBy: " ").count, 3)
|
||||
}())
|
||||
|
||||
}())
|
||||
|
||||
XCTAssertNoThrow(try {
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 64).components(separatedBy: " ").count, 6)
|
||||
}())
|
||||
|
@ -97,21 +97,20 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
}())
|
||||
|
||||
XCTAssertNoThrow(try {
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 160).components(separatedBy: " ").count, 15)
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 160).components(separatedBy: " ").count, 15)
|
||||
}())
|
||||
|
||||
XCTAssertNoThrow(try {
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 192).components(separatedBy: " ").count, 18)
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 192).components(separatedBy: " ").count, 18)
|
||||
}())
|
||||
|
||||
XCTAssertNoThrow(try {
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 224).components(separatedBy: " ").count, 21)
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 224).components(separatedBy: " ").count, 21)
|
||||
}())
|
||||
|
||||
XCTAssertNoThrow(try {
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 256).components(separatedBy: " ").count, 24)
|
||||
XCTAssertEqual(try Mnemonic.generateMnemonic(strength: 256).components(separatedBy: " ").count, 24)
|
||||
}())
|
||||
|
||||
}
|
||||
|
||||
/// Test valid chinese and english mnemonics are determined to be Invalid.
|
||||
|
@ -235,10 +234,15 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
|
||||
XCTAssertNoThrow(try Mnemonic.deterministicSeedBytes(from: x))
|
||||
XCTAssertThrowsError(try Mnemonic.deterministicSeedBytes(from: y))
|
||||
|
||||
XCTAssertEqual(try Mnemonic.deterministicSeedBytes(from: x), try Mnemonic.deterministicSeedBytes(from: " " + x))
|
||||
XCTAssertEqual(try Mnemonic.deterministicSeedBytes(from: x), try Mnemonic.deterministicSeedBytes(from: x + "\n"))
|
||||
|
||||
|
||||
XCTAssertEqual(
|
||||
try Mnemonic.deterministicSeedBytes(from: x),
|
||||
try Mnemonic.deterministicSeedBytes(from: " " + x)
|
||||
)
|
||||
XCTAssertEqual(
|
||||
try Mnemonic.deterministicSeedBytes(from: x),
|
||||
try Mnemonic.deterministicSeedBytes(from: x + "\n")
|
||||
)
|
||||
}
|
||||
|
||||
func testSwapTwoWords() {
|
||||
|
@ -256,7 +260,7 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
}
|
||||
|
||||
func testBitStringArrayToData() {
|
||||
let validBitString = "10000000"+"00010000"+"00001111"+"11110000"
|
||||
let validBitString = "10000000" + "00010000" + "00001111" + "11110000"
|
||||
|
||||
let uints: [UInt8] = [128, 16, 15, 240]
|
||||
let expectedDataArray = Data(uints)
|
||||
|
@ -268,13 +272,10 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
}
|
||||
|
||||
func testBitStringArrayToDataFailsOnIncorrectString() {
|
||||
|
||||
let bendersDream = "10000000"+"00010000"+"00020111"+"11110000"
|
||||
|
||||
let bendersDream = "10000000" + "00010000" + "00020111" + "11110000"
|
||||
let result = bendersDream.bitStringToBytes()
|
||||
|
||||
XCTAssertNil(result)
|
||||
|
||||
}
|
||||
|
||||
func testInvalidMnemonicData() {
|
||||
|
@ -286,11 +287,8 @@ class MnemonicSwiftTests: XCTestCase {
|
|||
let expectedData = Data([0xf1, 0xf1, 0xf1])
|
||||
|
||||
XCTAssertEqual(validMnemonicData.mnemonicData(), expectedData)
|
||||
|
||||
XCTAssertEqual(invalidMnemonicData.mnemonicData(), nil)
|
||||
|
||||
XCTAssertEqual(veryInvalidMnemonicData.mnemonicData(), nil)
|
||||
|
||||
}
|
||||
|
||||
func testPad() {
|
||||
|
|
Loading…
Reference in New Issue