Skip to content

Fix parsing missing integer values #33

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
schwmi wants to merge 6 commits into
base: master
Choose a base branch
from
Open

Fix parsing missing integer values #33

Show file tree
Hide file tree
Changes from 5 commits
Commits
Show all changes
6 commits
Select commit Hold shift + click to select a range
f853d6b
Make parent and sub properties on ASN1Object public
schwmi Mar 17, 2021
1e33e83
Only allow read access to parent and sub properties
schwmi Mar 17, 2021
4b7a3ef
Expose toIntValue helper
schwmi Mar 17, 2021
0ce4c51
Cleanup
schwmi May 3, 2021
86539b0
Ensure empty weborderLineItem is parsed as nil instead of 0
schwmi May 3, 2021
57c3391
Merge branch 'master' into bugfix/intParsing
schwmi Sep 1, 2021
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions ASN1Decoder/ASN1Decoder.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -199,8 +199,8 @@ enum ASN1Error: Error {
}

extension Data {
func toIntValue() -> UInt64? {
if self.count > 8 { // check if suitable for UInt64
public func toIntValue() -> UInt64? {
if self.count > 8 || self.isEmpty { // check if suitable for UInt64
return nil
}

Expand Down
4 changes: 2 additions & 2 deletions ASN1Decoder/ASN1Object.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -33,9 +33,9 @@ public class ASN1Object: CustomStringConvertible {

public var identifier: ASN1Identifier?

var sub: [ASN1Object]?
public internal(set) var sub: [ASN1Object]?

weak var parent: ASN1Object?
public internal(set) weak var parent: ASN1Object?
Copy link
Copy Markdown
Contributor Author

@schwmi schwmi May 3, 2021

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Those changes come from #32 on which this PR is based on.


public func sub(_ index: Int) -> ASN1Object? {
if let sub = self.sub, index >= 0, index < sub.count {
Expand Down
2 changes: 1 addition & 1 deletion ASN1Decoder/OID.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,7 +22,7 @@ public enum OID: String {
case md5WithRSAEncryption = "1.2.840.113549.1.1.4"
case sha1WithRSAEncryption = "1.2.840.113549.1.1.5"

//Digest algorithms
// Digest algorithms
case sha1 = "1.3.14.3.2.26"
case pkcsSha256 = "1.3.6.1.4.1.22554.1.2.1"
case sha2Family = "1.3.6.1.4.1.22554.1.2"
Expand Down
2 changes: 1 addition & 1 deletion ASN1Decoder/PKCS7_Signature.swift
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -25,7 +25,7 @@ import Foundation

extension PKCS7 {
public var signatures: [SignatureInfo]? {
//Signer infos sequence. https://tools.ietf.org/html/rfc5652#section-5.3
// Signer infos sequence. https://tools.ietf.org/html/rfc5652#section-5.3

guard let signerInfos = mainBlock.sub(4) else {return nil}

Expand Down