Cleaned up project and updated dependencies

Author: tobihagemann

CryptomatorCryptoLib.xcodeproj/project.pbxproj

@@ -154,12 +154,12 @@
 				4A7C21362451F2AC00DE81E6 /* Info.plist */,
 				9EB822C0248AF82200879838 /* AesCtr.swift */,
 				9E44EEA524599C6900A37B01 /* AesSiv.swift */,
+				9E97DC8C25F77BA40046C83E /* ContentCryptor.swift */,
 				74F0F753248FC89B00B4C26D /* CryptoError.swift */,
 				9E9BB811245412E900F9FF51 /* Cryptor.swift */,
 				74F0F7592490C1EB00B4C26D /* CryptoSupport.swift */,
 				9E9BB8132454708600F9FF51 /* Masterkey.swift */,
 				74B4D38C2588CD60006C0567 /* MasterkeyFile.swift */,
-				9E97DC8C25F77BA40046C83E /* ContentCryptor.swift */,
 			);
 			path = CryptomatorCryptoLib;
 			sourceTree = "<group>";
@@ -320,7 +320,7 @@
 			isa = PBXProject;
 			attributes = {
 				LastSwiftUpdateCheck = 1140;
-				LastUpgradeCheck = 1240;
+				LastUpgradeCheck = 1250;
 				ORGANIZATIONNAME = "Skymatic GmbH";
 				TargetAttributes = {
 					4A7C21312451F2AC00DE81E6 = {
@@ -788,7 +788,7 @@
 			repositoryURL = "https://github.com/norio-nomura/Base32.git";
 			requirement = {
 				kind = upToNextMinorVersion;
-				minimumVersion = 0.8.0;
+				minimumVersion = 0.9.0;
 			};
 		};
 /* End XCRemoteSwiftPackageReference section */

CryptomatorCryptoLib.xcodeproj/project.xcworkspace/xcshareddata/swiftpm/Package.resolved

@@ -1,6 +1,6 @@
 <?xml version="1.0" encoding="UTF-8"?>
 <Scheme
-   LastUpgradeVersion = "1240"
+   LastUpgradeVersion = "1250"
    version = "1.3">
    <BuildAction
       parallelizeBuildables = "YES"

CryptomatorCryptoLib.xcodeproj/xcshareddata/xcschemes/CryptomatorCryptoLib.xcscheme

@@ -0,0 +1,67 @@
+<?xml version="1.0" encoding="UTF-8"?>
+<Scheme
+   LastUpgradeVersion = "1250"
+   version = "1.3">
+   <BuildAction
+      parallelizeBuildables = "YES"
+      buildImplicitDependencies = "YES">
+      <BuildActionEntries>
+         <BuildActionEntry
+            buildForTesting = "YES"
+            buildForRunning = "YES"
+            buildForProfiling = "YES"
+            buildForArchiving = "YES"
+            buildForAnalyzing = "YES">
+            <BuildableReference
+               BuildableIdentifier = "primary"
+               BlueprintIdentifier = "749260CD25B17A9A004B3426"
+               BuildableName = "scrypt.framework"
+               BlueprintName = "scrypt"
+               ReferencedContainer = "container:CryptomatorCryptoLib.xcodeproj">
+            </BuildableReference>
+         </BuildActionEntry>
+      </BuildActionEntries>
+   </BuildAction>
+   <TestAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      shouldUseLaunchSchemeArgsEnv = "YES">
+      <Testables>
+      </Testables>
+   </TestAction>
+   <LaunchAction
+      buildConfiguration = "Debug"
+      selectedDebuggerIdentifier = "Xcode.DebuggerFoundation.Debugger.LLDB"
+      selectedLauncherIdentifier = "Xcode.DebuggerFoundation.Launcher.LLDB"
+      launchStyle = "0"
+      useCustomWorkingDirectory = "NO"
+      ignoresPersistentStateOnLaunch = "NO"
+      debugDocumentVersioning = "YES"
+      debugServiceExtension = "internal"
+      allowLocationSimulation = "YES">
+   </LaunchAction>
+   <ProfileAction
+      buildConfiguration = "Release"
+      shouldUseLaunchSchemeArgsEnv = "YES"
+      savedToolIdentifier = ""
+      useCustomWorkingDirectory = "NO"
+      debugDocumentVersioning = "YES">
+      <MacroExpansion>
+         <BuildableReference
+            BuildableIdentifier = "primary"
+            BlueprintIdentifier = "749260CD25B17A9A004B3426"
+            BuildableName = "scrypt.framework"
+            BlueprintName = "scrypt"
+            ReferencedContainer = "container:CryptomatorCryptoLib.xcodeproj">
+         </BuildableReference>
+      </MacroExpansion>
+   </ProfileAction>
+   <AnalyzeAction
+      buildConfiguration = "Debug">
+   </AnalyzeAction>
+   <ArchiveAction
+      buildConfiguration = "Release"
+      revealArchiveInOrganizer = "YES">
+   </ArchiveAction>
+</Scheme>

CryptomatorCryptoLib.xcodeproj/xcshareddata/xcschemes/scrypt.xcscheme

@@ -20,7 +20,7 @@ let package = Package(
 		.library(name: "CryptomatorCryptoLib", targets: ["CryptomatorCryptoLib"])
 	],
 	dependencies: [
-		.package(url: "https://github.com/norio-nomura/Base32.git", .upToNextMinor(from: "0.8.0"))
+		.package(url: "https://github.com/norio-nomura/Base32.git", .upToNextMinor(from: "0.9.0"))
 	],
 	targets: [
 		.target(name: "CryptomatorCryptoLib", dependencies: ["Base32", "scrypt"]),

Package.resolved

@@ -20,7 +20,7 @@ protocol ContentCryptor {
 	 - Parameter key: The encryption key.
 	 - Parameter nonce: The nonce/IV to use.
 	 - Parameter ad: Associated data, which needs to be authenticated during decryption.
-	 - Returns: Nonce/IV + ciphertext + MAC/tag, as a concatenated byte array
+	 - Returns: Nonce/IV + ciphertext + MAC/tag, as a concatenated byte array.
 	 */
 	func encrypt(_ chunk: [UInt8], key: [UInt8], nonce: [UInt8], ad: [UInt8]...) throws -> [UInt8]
 
@@ -30,18 +30,18 @@ protocol ContentCryptor {
 	 - Parameter chunk: The nonce/IV + ciphertext + MAC/tag, as a concatenated byte array.
 	 - Parameter key: The encryption key.
 	 - Parameter ad: Associated data, which needs to be authenticated during decryption.
-	 - Returns: The original cleartext
+	 - Returns: The original cleartext.
 	 */
 	func decrypt(_ chunk: [UInt8], key: [UInt8], ad: [UInt8]...) throws -> [UInt8]
 }
 
 class CtrThenHmacContentCryptor: ContentCryptor {
-	private let macKey: [UInt8]
-	private let cryptoSupport: CryptoSupport
-
 	let nonceLen = kCCBlockSizeAES128
 	let tagLen = Int(CC_SHA256_DIGEST_LENGTH)
 
+	private let macKey: [UInt8]
+	private let cryptoSupport: CryptoSupport
+
 	init(macKey: [UInt8], cryptoSupport: CryptoSupport) {
 		self.macKey = macKey
 		self.cryptoSupport = cryptoSupport

Package.swift

@@ -6,13 +6,9 @@
 //  Copyright © 2020 Skymatic GmbH. All rights reserved.
 //
 
+import Base32
 import CommonCrypto
 import Foundation
-#if COCOAPODS
-import SwiftBase32
-#else
-import Base32
-#endif
 
 public extension Data {
 	init?(base64UrlEncoded base64String: String, options: Data.Base64DecodingOptions = []) {
@@ -65,16 +61,16 @@ struct FileHeader {
 
 public class Cryptor {
 	private let fileHeaderLegacyPayloadSize = 8
-	private let cleartextChunkSize = 32 * 1024
-	private var ciphertextChunkSize: Int {
-		return contentCryptor.nonceLen + cleartextChunkSize + contentCryptor.tagLen
-	}
-
 	public var fileHeaderSize: Int {
 		let fileHeaderPayloadSize = fileHeaderLegacyPayloadSize + kCCKeySizeAES256
 		return contentCryptor.nonceLen + fileHeaderPayloadSize + contentCryptor.tagLen
 	}
 
+	private let cleartextChunkSize = 32 * 1024
+	private var ciphertextChunkSize: Int {
+		return contentCryptor.nonceLen + cleartextChunkSize + contentCryptor.tagLen
+	}
+
 	private let masterkey: Masterkey
 	private let cryptoSupport: CryptoSupport
 	private let contentCryptor: ContentCryptor

Sources/CryptomatorCryptoLib/ContentCryptor.swift

@@ -8,11 +8,7 @@
 
 import CommonCrypto
 import Foundation
-#if COCOAPODS
-import CryptomatorCryptoLib.scrypt
-#else
 import scrypt
-#endif
 
 struct Content: Codable, Equatable {
 	let version: Int

Sources/CryptomatorCryptoLib/Cryptor.swift

@@ -15,10 +15,4 @@ FOUNDATION_EXPORT double scryptVersionNumber;
 FOUNDATION_EXPORT const unsigned char scryptVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <scrypt/PublicHeader.h>
-#if COCOAPODS
-#import "crypto_scrypt.h"
-#else
 #import <scrypt/crypto_scrypt.h>
-#endif
-
-