Merge pull request #8 from lamps-wg/UpdateTov13

Update tov13, fix issues #2 and #3
lamps-wg · Jun 6, 2024 · b7f6a91 · b7f6a91
2 parents de8244a + ad27c83
commit b7f6a91
Show file tree

Hide file tree

Showing 5 changed files with 398 additions and 439 deletions.
diff --git a/Composite-Signatures-2023.asn b/Composite-Signatures-2023.asn
@@ -1,5 +1,5 @@
 
-   Composite-Signatures-2023
+ Composite-Signatures-2023
       { joint-iso-itu-t(2) country(16) us(840) organization(1) entrust(114027)
         algorithm(80) id-composite-signatures-2023 (TBDMOD) }
 
@@ -24,7 +24,7 @@ IMPORTS
     FROM AsymmetricKeyPackageModuleV1
       { iso(1) member-body(2) us(840) rsadsi(113549) pkcs(1)
         pkcs-9(9) smime(16) modules(0)
-        id-mod-asymmetricKeyPkgV1(50) } 
+        id-mod-asymmetricKeyPkgV1(50) }
 
   RSAPublicKey, ECPoint
     FROM PKIXAlgs-2009 
@@ -36,9 +36,9 @@ IMPORTS
     FROM PKIX1-PSS-OAEP-Algorithms-2009
        {iso(1) identified-organization(3) dod(6) internet(1) security(5)
        mechanisms(5) pkix(7) id-mod(0) id-mod-pkix1-rsa-pkalgs-02(54)}
-       
-;       
-        
+
+;
+
 --
 -- Object Identifiers
 --
@@ -73,12 +73,12 @@ CompositeSignatureValue ::= SEQUENCE SIZE (2) OF BIT STRING
 
 -- Composite Signature Value is just a sequence of OCTET STRINGS
 
---   CompositeSignaturePair{FirstSignatureValue, SecondSignatureValue}  ::= 
+--   CompositeSignaturePair{FirstSignatureValue, SecondSignatureValue}  ::=
 --     SEQUENCE {
 --      signaturevalue1 FirstSignatureValue,
 --      signaturevalue2 SecondSignatureValue }
 
-   -- An Explicit Compsite Signature is a set of Signatures which 
+   -- An Explicit Compsite Signature is a set of Signatures which
    -- are composed of OCTET STRINGS
 --   ExplicitCompositeSignatureValue ::= CompositeSignaturePair {
 --       OCTET STRING,OCTET STRING}
@@ -88,8 +88,8 @@ CompositeSignatureValue ::= SEQUENCE SIZE (2) OF BIT STRING
 -- Information Object Classes
 --
 
-pk-CompositeSignature {OBJECT IDENTIFIER:id, 
-  FirstPublicKeyType,SecondPublicKeyType} 
+pk-CompositeSignature {OBJECT IDENTIFIER:id,
+  FirstPublicKeyType,SecondPublicKeyType}
     PUBLIC-KEY ::= {
       IDENTIFIER id
       KEY SEQUENCE {
@@ -99,7 +99,7 @@ pk-CompositeSignature {OBJECT IDENTIFIER:id,
       PARAMS ARE absent
       CERT-KEY-USAGE { digitalSignature, nonRepudiation, keyCertSign, cRLSign}
     } 
-								 							
+
 
 sa-CompositeSignature{OBJECT IDENTIFIER:id, 
    PUBLIC-KEY:publicKeyType } 
@@ -111,239 +111,211 @@ sa-CompositeSignature{OBJECT IDENTIFIER:id,
       }
 
 -- TODO: OID to be replaced by IANA
-id-MLDSA44-RSA2048-PSS-SHA256 OBJECT IDENTIFIER ::= {     
+id-MLDSA44-RSA2048-PSS-SHA256 OBJECT IDENTIFIER ::= {
    joint-iso-itu-t(2) country(16) us(840) organization(1) 
    entrust(114027) algorithm(80) composite(8) signature(1) 1 }
 
 pk-MLDSA44-RSA2048-PSS-SHA256 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA44-RSA2048-PSS-SHA256,
   OCTET STRING, RSAPublicKey}
 
-sa-MLDSA44-RSA2048-PSS-SHA256 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA44-RSA2048-PSS-SHA256 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA44-RSA2048-PSS-SHA256, 
+       id-MLDSA44-RSA2048-PSS-SHA256,
        pk-MLDSA44-RSA2048-PSS-SHA256 }
 
 -- TODO: OID to be replaced by IANA
-id-MLDSA44-RSA2048-PKCS15-SHA256 OBJECT IDENTIFIER ::= {     
+id-MLDSA44-RSA2048-PKCS15-SHA256 OBJECT IDENTIFIER ::= {
    joint-iso-itu-t(2) country(16) us(840) organization(1) 
    entrust(114027) algorithm(80) composite(8) signature(1) 2 }
 
 pk-MLDSA44-RSA2048-PKCS15-SHA256 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA44-RSA2048-PKCS15-SHA256,
   OCTET STRING, RSAPublicKey}
 
-sa-MLDSA44-RSA2048-PKCS15-SHA256 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA44-RSA2048-PKCS15-SHA256 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA44-RSA2048-PKCS15-SHA256, 
-       pk-MLDSA44-RSA2048-PKCS15-SHA256 } 
-    
-       
+       id-MLDSA44-RSA2048-PKCS15-SHA256,
+       pk-MLDSA44-RSA2048-PKCS15-SHA256 }
+
+
 -- TODO: OID to be replaced by IANA
-id-MLDSA44-Ed25519-SHA512 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA44-Ed25519-SHA512 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 3 }
 
 pk-MLDSA44-Ed25519-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA44-Ed25519-SHA512,
   OCTET STRING, ECPoint}
 
-sa-MLDSA44-Ed25519-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA44-Ed25519-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
        id-MLDSA44-Ed25519-SHA512, 
        pk-MLDSA44-Ed25519-SHA512 } 
-       
-       
+
+
 -- TODO: OID to be replaced by IANA
-id-MLDSA44-ECDSA-P256-SHA256 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA44-ECDSA-P256-SHA256 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 4 }
 
 pk-MLDSA44-ECDSA-P256-SHA256 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA44-ECDSA-P256-SHA256,
   OCTET STRING, ECPoint}
 
-sa-MLDSA44-ECDSA-P256-SHA256 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA44-ECDSA-P256-SHA256 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA44-ECDSA-P256-SHA256, 
-       pk-MLDSA44-ECDSA-P256-SHA256 }   
+       id-MLDSA44-ECDSA-P256-SHA256,
+       pk-MLDSA44-ECDSA-P256-SHA256 }
 
 
 -- TODO: OID to be replaced by IANA
-id-MLDSA44-ECDSA-brainpoolP256r1-SHA256 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA44-ECDSA-brainpoolP256r1-SHA256 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 5 }
 
 pk-MLDSA44-ECDSA-brainpoolP256r1-SHA256 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA44-ECDSA-brainpoolP256r1-SHA256,
   OCTET STRING, ECPoint}
 
-sa-MLDSA44-ECDSA-brainpoolP256r1-SHA256 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA44-ECDSA-brainpoolP256r1-SHA256 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA44-ECDSA-brainpoolP256r1-SHA256, 
-       pk-MLDSA44-ECDSA-brainpoolP256r1-SHA256 }  
-       
+       id-MLDSA44-ECDSA-brainpoolP256r1-SHA256,
+       pk-MLDSA44-ECDSA-brainpoolP256r1-SHA256 }
+
 
 -- TODO: OID to be replaced by IANA
-id-MLDSA65-RSA3072-PSS-SHA512 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA65-RSA3072-PSS-SHA512 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 6 }
 
 pk-MLDSA65-RSA3072-PSS-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA65-RSA3072-PSS-SHA512,
   OCTET STRING, RSAPublicKey}
 
-sa-MLDSA65-RSA3072-PSS-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA65-RSA3072-PSS-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA65-RSA3072-PSS-SHA512, 
-       pk-MLDSA65-RSA3072-PSS-SHA512 }   
-       
-    
+       id-MLDSA65-RSA3072-PSS-SHA512,
+       pk-MLDSA65-RSA3072-PSS-SHA512 }
+
+
 -- TODO: OID to be replaced by IANA
-id-MLDSA65-RSA3072-PKCS15-SHA512 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA65-RSA3072-PKCS15-SHA512 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 7 }
 
 pk-MLDSA65-RSA3072-PKCS15-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA65-RSA3072-PKCS15-SHA512,
   OCTET STRING, RSAPublicKey}
 
-sa-MLDSA65-RSA3072-PKCS15-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA65-RSA3072-PKCS15-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA65-RSA3072-PKCS15-SHA512, 
-       pk-MLDSA65-RSA3072-PKCS15-SHA512 } 
-                                                 
-      
+       id-MLDSA65-RSA3072-PKCS15-SHA512,
+       pk-MLDSA65-RSA3072-PKCS15-SHA512 }
+
+
 -- TODO: OID to be replaced by IANA
-id-MLDSA65-ECDSA-P256-SHA512 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA65-ECDSA-P256-SHA512 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 8 }
 
 pk-MLDSA65-ECDSA-P256-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA65-ECDSA-P256-SHA512,
   OCTET STRING, ECPoint}
 
-sa-MLDSA65-ECDSA-P256-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA65-ECDSA-P256-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA65-ECDSA-P256-SHA512, 
+       id-MLDSA65-ECDSA-P256-SHA512,
        pk-MLDSA65-ECDSA-P256-SHA512 }
 
 
 -- TODO: OID to be replaced by IANA
-id-MLDSA65-ECDSA-brainpoolP256r1-SHA512 OBJECT IDENTIFIER ::= {     
+id-MLDSA65-ECDSA-brainpoolP256r1-SHA512 OBJECT IDENTIFIER ::= {
    joint-iso-itu-t(2) country(16) us(840) organization(1) 
    entrust(114027) algorithm(80) composite(8) signature(1) 9 }
 
 pk-id-MLDSA65-ECDSA-brainpoolP256r1-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA65-ECDSA-brainpoolP256r1-SHA512,
   OCTET STRING, ECPoint}
 
-sa-id-MLDSA65-ECDSA-brainpoolP256r1-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-id-MLDSA65-ECDSA-brainpoolP256r1-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA65-ECDSA-brainpoolP256r1-SHA512, 
-       pk-id-MLDSA65-ECDSA-brainpoolP256r1-SHA512 }       
+       id-MLDSA65-ECDSA-brainpoolP256r1-SHA512,
+       pk-id-MLDSA65-ECDSA-brainpoolP256r1-SHA512 }
 
 
 -- TODO: OID to be replaced by IANA
-id-MLDSA65-Ed25519-SHA512 OBJECT IDENTIFIER ::= {     
+id-MLDSA65-Ed25519-SHA512 OBJECT IDENTIFIER ::= {
    joint-iso-itu-t(2) country(16) us(840) organization(1) 
    entrust(114027) algorithm(80) composite(8) signature(1) 10 }
 
 pk-MLDSA65-Ed25519-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA65-Ed25519-SHA512,
   OCTET STRING, ECPoint}
 
-sa-MLDSA65-Ed25519-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA65-Ed25519-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA65-Ed25519-SHA512, 
-       pk-MLDSA65-Ed25519-SHA512 } 
-       
-       
+       id-MLDSA65-Ed25519-SHA512,
+       pk-MLDSA65-Ed25519-SHA512 }
+
+
 -- TODO: OID to be replaced by IANA
-id-MLDSA87-ECDSA-P384-SHA512 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA87-ECDSA-P384-SHA512 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 11 }
 
 pk-MLDSA87-ECDSA-P384-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA87-ECDSA-P384-SHA512,
   OCTET STRING, ECPoint}
 
-sa-MLDSA87-ECDSA-P384-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA87-ECDSA-P384-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA87-ECDSA-P384-SHA512, 
-       pk-MLDSA87-ECDSA-P384-SHA512 }   
-       
-  
+       id-MLDSA87-ECDSA-P384-SHA512,
+       pk-MLDSA87-ECDSA-P384-SHA512 }
+
+
 -- TODO: OID to be replaced by IANA
-id-MLDSA87-ECDSA-brainpoolP384r1-SHA512 OBJECT IDENTIFIER ::= {     
+id-MLDSA87-ECDSA-brainpoolP384r1-SHA512 OBJECT IDENTIFIER ::= {
    joint-iso-itu-t(2) country(16) us(840) organization(1) 
    entrust(114027) algorithm(80) composite(8) signature(1) 12 }
 
 pk-MLDSA87-ECDSA-brainpoolP384r1-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA87-ECDSA-brainpoolP384r1-SHA512,
   OCTET STRING, ECPoint}
 
-sa-MLDSA87-ECDSA-brainpoolP384r1-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA87-ECDSA-brainpoolP384r1-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA87-ECDSA-brainpoolP384r1-SHA512, 
-       pk-MLDSA87-ECDSA-brainpoolP384r1-SHA512 } 
-       
-       
+       id-MLDSA87-ECDSA-brainpoolP384r1-SHA512,
+       pk-MLDSA87-ECDSA-brainpoolP384r1-SHA512 }
+
+
 -- TODO: OID to be replaced by IANA
-id-MLDSA87-Ed448-SHA512 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-MLDSA87-Ed448-SHA512 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 13 }
 
 pk-MLDSA87-Ed448-SHA512 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-MLDSA87-Ed448-SHA512,
   OCTET STRING, ECPoint}
 
-sa-MLDSA87-Ed448-SHA512 SIGNATURE-ALGORITHM ::= 
+sa-MLDSA87-Ed448-SHA512 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-MLDSA87-Ed448-SHA512, 
-       pk-MLDSA87-Ed448-SHA512 }  
+       id-MLDSA87-Ed448-SHA512,
+       pk-MLDSA87-Ed448-SHA512 }
 
 -- TODO: OID to be replaced by IANA
-id-Falon512-ECDSA-P256-SHA256 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
+id-Falon512-ECDSA-P256-SHA256 OBJECT IDENTIFIER ::= {
+   joint-iso-itu-t(2) country(16) us(840) organization(1)
    entrust(114027) algorithm(80) composite(8) signature(1) 14 }
 
 pk-Falon512-ECDSA-P256-SHA256 PUBLIC-KEY ::=
   pk-CompositeSignature{ id-Falon512-ECDSA-P256-SHA256,
   OCTET STRING, ECPoint}
 
-sa-Falon512-ECDSA-P256-SHA256 SIGNATURE-ALGORITHM ::= 
+sa-Falon512-ECDSA-P256-SHA256 SIGNATURE-ALGORITHM ::=
     sa-CompositeSignature{
-       id-Falon512-ECDSA-P256-SHA256, 
-       pk-Falon512-ECDSA-P256-SHA256 } 
-
--- TODO: OID to be replaced by IANA
-id-Falcon512-ECDSA-brainpoolP256r1-SHA256 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
-   entrust(114027) algorithm(80) composite(8) signature(1) 15 }
+       id-Falon512-ECDSA-P256-SHA256,
+       pk-Falon512-ECDSA-P256-SHA256 }
 
-pk-Falcon512-ECDSA-brainpoolP256r1-SHA256 PUBLIC-KEY ::=
-  pk-CompositeSignature{ id-Falcon512-ECDSA-brainpoolP256r1-SHA256,
-  OCTET STRING, ECPoint}
-
-sa-Falcon512-ECDSA-brainpoolP256r1-SHA256 SIGNATURE-ALGORITHM ::= 
-    sa-CompositeSignature{
-       id-Falcon512-ECDSA-brainpoolP256r1-SHA256, 
-       pk-Falcon512-ECDSA-brainpoolP256r1-SHA256 } 
-
--- TODO: OID to be replaced by IANA
-id-Falcon512-Ed25519-SHA512 OBJECT IDENTIFIER ::= {     
-   joint-iso-itu-t(2) country(16) us(840) organization(1) 
-   entrust(114027) algorithm(80) composite(8) signature(1) 16 }
-
-pk-Falcon512-Ed25519-SHA512 PUBLIC-KEY ::=
-  pk-CompositeSignature{ id-Falcon512-Ed25519-SHA512,
-  OCTET STRING, ECPoint}
-
-sa-Falcon512-Ed25519-SHA512 SIGNATURE-ALGORITHM ::= 
-    sa-CompositeSignature{
-       id-Falcon512-Ed25519-SHA512, 
-       pk-Falcon512-Ed25519-SHA512 }                                      
-
 
 END