Fix review comments

apple · Feb 2, 2023 · c33a826 · c33a826
1 parent f153e0b
commit c33a826
Show file tree

Hide file tree

Showing 2 changed files with 5 additions and 5 deletions.
diff --git a/Sources/X509/CryptographicMessageSyntax/CMSSignedData.swift b/Sources/X509/CryptographicMessageSyntax/CMSSignedData.swift
@@ -92,7 +92,7 @@ struct CMSSignedData: DERImplicitlyTaggable, Hashable {
 
             // TODO: support multiple signer infos. For this we need to validate that the binary representation of each element is lexicographically sorted.
             guard signerInfos.count <= 1 else {
-                throw Error.multipleDigestAlgorithmsAreNotSupportedYet
+                throw Error.multipleSignerInfosAreNotSupportedYet
             }
 
             return .init(

diff --git a/Sources/X509/CryptographicMessageSyntax/CMSSignerIdentifier.swift b/Sources/X509/CryptographicMessageSyntax/CMSSignerIdentifier.swift
@@ -22,7 +22,7 @@ import SwiftASN1
 ///  ```
 enum CMSSignerIdentifier: DERParseable, DERSerializable, Hashable {
 
-    private static let subjectKeyIdentifierIdentifier = ASN1Identifier(tagWithNumber: 0, tagClass: .contextSpecific)
+    private static let skiIdentifier = ASN1Identifier(tagWithNumber: 0, tagClass: .contextSpecific)
 
     case issuerAndSerialNumber(CMSIssuerAndSerialNumber)
     case subjectKeyIdentifier(Certificate.Extensions.SubjectKeyIdentifier)
@@ -32,8 +32,8 @@ enum CMSSignerIdentifier: DERParseable, DERSerializable, Hashable {
         case CMSIssuerAndSerialNumber.defaultIdentifier:
             self = try .issuerAndSerialNumber(.init(derEncoded: node))
 
-        case Self.subjectKeyIdentifierIdentifier:
-            self = try .subjectKeyIdentifier(.init(keyIdentifier: .init(derEncoded: node, withIdentifier: Self.subjectKeyIdentifierIdentifier)))
+        case Self.skiIdentifier:
+            self = try .subjectKeyIdentifier(.init(keyIdentifier: .init(derEncoded: node, withIdentifier: Self.skiIdentifier)))
 
         default:
             throw ASN1Error.invalidASN1Object
@@ -46,7 +46,7 @@ enum CMSSignerIdentifier: DERParseable, DERSerializable, Hashable {
             try issuerAndSerialNumber.serialize(into: &coder)
 
         case .subjectKeyIdentifier(let subjectKeyIdentifier):
-            try subjectKeyIdentifier.keyIdentifier.serialize(into: &coder, withIdentifier: Self.subjectKeyIdentifierIdentifier)
+            try subjectKeyIdentifier.keyIdentifier.serialize(into: &coder, withIdentifier: Self.skiIdentifier)
 
         }
     }