Remove remaining whitespace changes

Kitura · Feb 26, 2019 · fd6adcd · fd6adcd
1 parent 7248cd9
commit fd6adcd
Show file tree

Hide file tree

Showing 4 changed files with 41 additions and 40 deletions.
diff --git a/Sources/CryptorRSA/CryptorRSADigest.swift b/Sources/CryptorRSA/CryptorRSADigest.swift
@@ -105,8 +105,8 @@ extension Data {
 				case .sha512:
 					return CC_LONG(CC_SHA512_DIGEST_LENGTH)
 
-				case .gcm:
-					return CC_LONG(CC_SHA1_DIGEST_LENGTH)
+                case .gcm:
+                    return CC_LONG(CC_SHA1_DIGEST_LENGTH)
 				}
 
 			#endif

diff --git a/Sources/CryptorRSA/CryptorRSAKey.swift b/Sources/CryptorRSA/CryptorRSAKey.swift
@@ -39,9 +39,9 @@ extension CryptorRSA {
 		public typealias NativeKey = OpaquePointer?
 
 	#else
-
+	
 		public typealias NativeKey = SecKey
-
+	
 	#endif
 
 	// MARK: Class Functions
@@ -400,7 +400,7 @@ extension CryptorRSA {
 
 			return PublicKey(with: key!)
 
-		#endif        
+		#endif		
 	}
 
 	// MARK: -- Private Key Creation
@@ -515,7 +515,7 @@ extension CryptorRSA {
 			let data = dataIn
 
 		#endif
-        
+		
 		return try PrivateKey(with: data)
 	}
 
@@ -558,15 +558,15 @@ extension CryptorRSA {
 
 		let dataIn = try Data(contentsOf: URL(fileURLWithPath: path))
 
-        #if os(Linux)
+		#if os(Linux)
 
 			let data = CryptorRSA.convertDerToPem(from: dataIn, type: .privateType)
 
-        #else
-        
-            let data = dataIn
-        
-        #endif
+		#else
+		
+			let data = dataIn
+		
+		#endif
 
 		return try PrivateKey(with: data)
 	}
@@ -668,10 +668,10 @@ extension CryptorRSA {
 			/// Create a key using a native key.
 			///
 			/// - Parameters:
-			///        - nativeKey:        Pointer to RSA key structure.
-			///        - type:                Type of key.
+			///		- nativeKey:		Pointer to RSA key structure.
+			///		- type:				Type of key.
 			///
-			/// - Returns:                New `RSAKey` instance.
+			/// - Returns:				New `RSAKey` instance.
 			///
 			internal init(with nativeKey: UnsafeMutablePointer<EVP_PKEY>, type: KeyType) {
 
@@ -791,22 +791,22 @@ extension CryptorRSA {
 			super.init(with: nativeKey, type: .publicType)
 		}
 
-        #if os(Linux) && !swift(>=4.1)
-        
-            ///
-            /// Create a key using a native key.
-            ///
-            /// - Parameters:
-            ///        - nativeKey:        Pointer to RSA key structure.
-            ///
-            /// - Returns:                New `RSAKey` instance.
-            ///
-            public init(with nativeKey: UnsafeMutablePointer<EVP_PKEY>) {
-                
-                super.init(with: nativeKey, type: .publicType)
-            }
-        
-        #endif
+		#if os(Linux) && !swift(>=4.1)
+		
+			///
+			/// Create a key using a native key.
+			///
+			/// - Parameters:
+			///		- nativeKey:		Pointer to RSA key structure.
+			///
+			/// - Returns:				New `RSAKey` instance.
+			///
+			public init(with nativeKey: UnsafeMutablePointer<EVP_PKEY>) {
+				
+				super.init(with: nativeKey, type: .publicType)
+			}
+		
+		#endif
 	}
 
 	// MARK: -

diff --git a/Sources/CryptorRSA/CryptorRSAUtilities.swift b/Sources/CryptorRSA/CryptorRSAUtilities.swift
@@ -20,7 +20,7 @@
 //
 
 #if os(macOS) || os(iOS) || os(tvOS) || os(watchOS)
-    import CommonCrypto
+	import CommonCrypto
 #elseif os(Linux)
 	import OpenSSL
 #endif
@@ -49,6 +49,7 @@ public extension CryptorRSA {
 	static func createKey(from keyData: Data, type: CryptorRSA.RSAKey.KeyType) throws ->  NativeKey {
 
 		let keyData = keyData
+
 		// Create a memory BIO...
 		let bio = BIO_new(BIO_s_mem())
 
@@ -151,15 +152,15 @@ public extension CryptorRSA {
 	/// Create a key from key data.
 	///
 	/// - Parameters:
-	///        - keyData:            `Data` representation of the key.
-	///        - type:                Type of key data.
+	///		- keyData:			`Data` representation of the key.
+	///		- type:				Type of key data.
 	///
-	///    - Returns:                `SecKey` representation of the key.
+	///	- Returns:				`SecKey` representation of the key.
 	///
 	static func createKey(from keyData: Data, type: CryptorRSA.RSAKey.KeyType) throws ->  NativeKey {
 
 		var keyData = keyData
-		
+        
 		let keyClass = type == .publicType ? kSecAttrKeyClassPublic : kSecAttrKeyClassPrivate
 
 		let sizeInBits = keyData.count * MemoryLayout<UInt8>.size
@@ -173,7 +174,7 @@ public extension CryptorRSA {
 
 			throw Error(code: ERR_ADD_KEY, reason: "Couldn't create key reference from key data")
 		}
-		
+        
 		return key
 
 	}

diff --git a/Tests/CryptorRSATests/CryptorRSATests.swift b/Tests/CryptorRSATests/CryptorRSATests.swift
@@ -99,7 +99,7 @@ class CryptorRSATests: XCTestCase {
             let data = try Data(contentsOf: filePath)
             let publicKey = try? CryptorRSA.createPublicKey(extractingFrom: data)
             XCTAssertNotNil(publicKey)
-            XCTAssertTrue(publicKey?.type == .publicType)
+            XCTAssertTrue(publicKey!.type == .publicType)
         }
 	}
 
@@ -113,7 +113,7 @@ class CryptorRSATests: XCTestCase {
             let data = try Data(contentsOf: filePath)
             let publicKey = try? CryptorRSA.createPublicKey(extractingFrom: data)
             XCTAssertNotNil(publicKey)
-            XCTAssertTrue(publicKey?.type == .publicType)
+            XCTAssertTrue(publicKey!.type == .publicType)
         }
 	}
 
@@ -207,7 +207,7 @@ class CryptorRSATests: XCTestCase {
             XCTFail()
             return
         }
-
+        
 		let keys = CryptorRSA.PublicKey.publicKeys(withPEM: input)
 		XCTAssertEqual(keys.count, 9)