Merge pull request #1 from vmaraccini/whitespace-normalization

Whitespace normalization

Author: vmaraccini

ASN1Decoder/ASN1Decoder.h

@@ -16,4 +16,3 @@ FOUNDATION_EXPORT const unsigned char ASN1DecoderVersionString[];
 
 // In this header, you should import all the public headers of your framework using statements like #import <ASN1Decoder/PublicHeader.h>
 
-

ASN1Decoder/ASN1Identifier.swift

@@ -25,14 +25,13 @@ import Foundation
 
 
 public class ASN1Identifier : CustomStringConvertible {
-    
     public enum Class : UInt8 {
         case universal = 0x00
         case application = 0x40
         case contextSpecific = 0x80
         case `private` = 0xC0
     }
-    
+
     public enum TagNumber: UInt8 {
         case endOfContent = 0x00
         case boolean = 0x01
@@ -64,15 +63,13 @@ public class ASN1Identifier : CustomStringConvertible {
         case characterString = 0x1D
         case bmpString = 0x1E
     }
-    
+
     var rawValue: UInt8
-    
-    
+
     init(rawValue: UInt8) {
         self.rawValue = rawValue
     }
-    
-    
+
     public func typeClass() -> Class {
         for tc in [Class.application, Class.contextSpecific, Class.private] {
             if (rawValue & tc.rawValue) == tc.rawValue {
@@ -81,18 +78,18 @@ public class ASN1Identifier : CustomStringConvertible {
         }
         return .universal
     }
-    
+
     public func isPrimitive() -> Bool {
         return (rawValue & 0x20) == 0
     }
     public func isConstructed() -> Bool {
         return (rawValue & 0x20) != 0
     }
-    
+
     public func tagNumber() -> TagNumber {
         return TagNumber(rawValue: rawValue & 0x1F) ?? .endOfContent
     }
-    
+
     public var description: String {
         if typeClass() == .universal {
             return String(describing: tagNumber())
@@ -102,4 +99,3 @@ public class ASN1Identifier : CustomStringConvertible {
         }
     }
 }
-

ASN1Decoder/ASN1Object.swift

@@ -21,39 +21,32 @@
 //  OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE
 //  SOFTWARE.
 
-
 import Foundation
 
-
 public class ASN1Object : CustomStringConvertible {
-    
-    init() {
-    }
-    
     /// This property contains the DER encoded object
     public var rawValue: Data?
-    
+
     /// This property contains the decoded Swift object whenever is possible
     public var value: Any?
-    
-    
+
     public var identifier: ASN1Identifier?
-    
+
     var sub: [ASN1Object]?
-    
+
     weak var parent: ASN1Object?
-    
+
     public func sub(_ index: Int) -> ASN1Object? {
         if let sub = self.sub, index >= 0 && index < sub.count {
             return sub[index]
         }
         return nil
     }
-    
+
     public func subCount() -> Int {
         return sub?.count ?? 0
     }
-    
+
     public func findOid(_ oid: String) -> ASN1Object? {
         for child in sub ?? [] {
             if child.identifier?.tagNumber() == .objectIdentifier {
@@ -68,11 +61,11 @@ public class ASN1Object : CustomStringConvertible {
         }
         return nil
     }
-    
+
     public var description: String {
         return printAsn1()
     }
-    
+
     fileprivate func printAsn1(insets: String = "") -> String {
         var output = insets
         output.append(identifier?.description.uppercased() ?? "")
@@ -90,8 +83,8 @@ public class ASN1Object : CustomStringConvertible {
         output.append(sub != nil && sub!.count > 0 ? insets + "}\n" : "")
         return output
     }
-    
-    
+
+
     static let oidDecodeMap:[String:String] = [
         "0.4.0.1862.1.1" : "etsiQcsCompliance",
         "0.4.0.1862.1.3" : "etsiQcsRetentionPeriod",
@@ -152,8 +145,4 @@ public class ASN1Object : CustomStringConvertible {
         "2.5.4.8" : "stateOrProvinceName",
         "2.5.4.9" : "streetAddress"
     ]
-    
-
 }
-
-

ASN1Decoder/Asn1Decoder.swift

@@ -222,18 +222,18 @@ public class ASN1DERDecoder {
         }
         return Data(bytes: byteArray)
     }
-    
+
     // Decode DER OID bytes to String with dot notation
     private static func decodeOid(contentData: inout Data) -> String {
         if contentData.isEmpty {
             return ""
         }
-        
+
         var oid: String = ""
-        
+
         let first = Int(contentData.remove(at: 0))
         oid.append("\(first / 40).\(first % 40)")
-        
+
         var t = 0
         while contentData.count > 0 {
             let n = Int(contentData.remove(at: 0))
@@ -246,7 +246,6 @@ public class ASN1DERDecoder {
         return oid
     }
 
-    
     private static func dateFormatter(contentData: inout Data, formats: [String]) -> Date? {
         if let str = String(data: contentData, encoding: .utf8) {
             for format in formats {
@@ -262,31 +261,22 @@ public class ASN1DERDecoder {
     }
 }
 
-
-
 enum ASN1Error: Error {
     case parseError
     case outOfBuffer
 }
 
-
-
 extension Data {
-    
     func toIntValue() -> UInt64? {
-        
         if self.count > 8 { // check if suitable for UInt64
             return nil
         }
-        
+
         var value: UInt64 = 0
-        
         for (i,b) in self.enumerated() {
             let v = UInt64(b) << UInt64(8*(count-i-1))
             value += v
         }
-        
         return value
     }
-    
 }