From 287443a795450f1eea6a14502ec86c711f2387e2 Mon Sep 17 00:00:00 2001 From: John Gray <55205977+johngray-dev@users.noreply.github.com> Date: Fri, 18 Oct 2024 12:08:04 -0400 Subject: [PATCH] Update Composite-MLDSA-2024.asn Update the ASN.1 module to for prehash OIDs and Fix up the pure ones by removing the Hashes for the ED448 and X25519 curves --- Composite-MLDSA-2024.asn | 258 ++++++++++++++++++++++++++++++++++----- 1 file changed, 226 insertions(+), 32 deletions(-) diff --git a/Composite-MLDSA-2024.asn b/Composite-MLDSA-2024.asn index 864946d..79d59ef 100644 --- a/Composite-MLDSA-2024.asn +++ b/Composite-MLDSA-2024.asn @@ -125,6 +125,8 @@ sa-CompositeSignature{OBJECT IDENTIFIER:id, PUBLIC-KEYS {publicKeyType} } +-- PURE Version of OIDS + -- TODO: OID to be replaced by IANA id-MLDSA44-RSA2048-PSS-SHA256 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) @@ -155,18 +157,18 @@ sa-MLDSA44-RSA2048-PKCS15-SHA256 SIGNATURE-ALGORITHM ::= -- TODO: OID to be replaced by IANA -id-MLDSA44-Ed25519-SHA512 OBJECT IDENTIFIER ::= { +id-MLDSA44-Ed25519 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) entrust(114027) algorithm(80) composite(8) signature(1) 23 } -pk-MLDSA44-Ed25519-SHA512 PUBLIC-KEY ::= - pk-CompositeSignature{ id-MLDSA44-Ed25519-SHA512, +pk-MLDSA44-Ed25519 PUBLIC-KEY ::= + pk-CompositeSignature{ id-MLDSA44-Ed25519, EdCompositeSignaturePublicKey} -sa-MLDSA44-Ed25519-SHA512 SIGNATURE-ALGORITHM ::= +sa-MLDSA44-Ed25519 SIGNATURE-ALGORITHM ::= sa-CompositeSignature{ - id-MLDSA44-Ed25519-SHA512, - pk-MLDSA44-Ed25519-SHA512 } + id-MLDSA44-Ed25519, + pk-MLDSA44-Ed25519 } -- TODO: OID to be replaced by IANA @@ -184,21 +186,6 @@ sa-MLDSA44-ECDSA-P256-SHA256 SIGNATURE-ALGORITHM ::= 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) - entrust(114027) algorithm(80) composite(8) signature(1) 25 } - -pk-MLDSA44-ECDSA-brainpoolP256r1-SHA256 PUBLIC-KEY ::= - pk-CompositeSignature{ id-MLDSA44-ECDSA-brainpoolP256r1-SHA256, - EcCompositeSignaturePublicKey} - -sa-MLDSA44-ECDSA-brainpoolP256r1-SHA256 SIGNATURE-ALGORITHM ::= - sa-CompositeSignature{ - 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) @@ -288,18 +275,18 @@ sa-MLDSA65-ECDSA-brainpoolP256r1-SHA512 SIGNATURE-ALGORITHM ::= -- TODO: OID to be replaced by IANA -id-MLDSA65-Ed25519-SHA512 OBJECT IDENTIFIER ::= { +id-MLDSA65-Ed25519 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) entrust(114027) algorithm(80) composite(8) signature(1) 30 } -pk-MLDSA65-Ed25519-SHA512 PUBLIC-KEY ::= - pk-CompositeSignature{ id-MLDSA65-Ed25519-SHA512, +pk-MLDSA65-Ed25519 PUBLIC-KEY ::= + pk-CompositeSignature{ id-MLDSA65-Ed25519, EdCompositeSignaturePublicKey} -sa-MLDSA65-Ed25519-SHA512 SIGNATURE-ALGORITHM ::= +sa-MLDSA65-Ed25519 SIGNATURE-ALGORITHM ::= sa-CompositeSignature{ - id-MLDSA65-Ed25519-SHA512, - pk-MLDSA65-Ed25519-SHA512 } + id-MLDSA65-Ed25519, + pk-MLDSA65-Ed25519 } -- TODO: OID to be replaced by IANA @@ -333,17 +320,224 @@ sa-MLDSA87-ECDSA-brainpoolP384r1-SHA512 SIGNATURE-ALGORITHM ::= -- TODO: OID to be replaced by IANA -id-MLDSA87-Ed448-SHA512 OBJECT IDENTIFIER ::= { +id-MLDSA87-Ed448 OBJECT IDENTIFIER ::= { joint-iso-itu-t(2) country(16) us(840) organization(1) entrust(114027) algorithm(80) composite(8) signature(1) 33 } -pk-MLDSA87-Ed448-SHA512 PUBLIC-KEY ::= - pk-CompositeSignature{ id-MLDSA87-Ed448-SHA512, +pk-MLDSA87-Ed448 PUBLIC-KEY ::= + pk-CompositeSignature{ id-MLDSA87-Ed448, EdCompositeSignaturePublicKey} sa-MLDSA87-Ed448-SHA512 SIGNATURE-ALGORITHM ::= sa-CompositeSignature{ - id-MLDSA87-Ed448-SHA512, - pk-MLDSA87-Ed448-SHA512 } + id-MLDSA87-Ed448, + pk-MLDSA87-Ed448 } + +-- PreHash Version of the OIDs +-- TODO: OID to be replaced by IANA +id-HashMLDSA44-RSA2048-PSS-SHA256 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 40 } + +pk-HashMLDSA44-RSA2048-PSS-SHA256 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA44-RSA2048-PSS-SHA256, + RsaCompositeSignaturePublicKey} + +sa-HashMLDSA44-RSA2048-PSS-SHA256 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA44-RSA2048-PSS-SHA256, + pk-HashMLDSA44-RSA2048-PSS-SHA256 } + +-- TODO: OID to be replaced by IANA +id-HashMLDSA44-RSA2048-PKCS15-SHA256 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 41 } + +pk-HashMLDSA44-RSA2048-PKCS15-SHA256 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA44-RSA2048-PKCS15-SHA256, + RsaCompositeSignaturePublicKey} + +sa-HashMLDSA44-RSA2048-PKCS15-SHA256 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA44-RSA2048-PKCS15-SHA256, + pk-HashMLDSA44-RSA2048-PKCS15-SHA256 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA44-Ed25519-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 42 } + +pk-HashMLDSA44-Ed25519-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA44-Ed25519-SHA512, + EdCompositeSignaturePublicKey} + +sa-HashMLDSA44-Ed25519-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA44-Ed25519-SHA512, + pk-HashMLDSA44-Ed25519-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA44-ECDSA-P256-SHA256 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 43 } + +pk-HashMLDSA44-ECDSA-P256-SHA256 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA44-ECDSA-P256-SHA256, + EcCompositeSignaturePublicKey} + +sa-HashMLDSA44-ECDSA-P256-SHA256 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA44-ECDSA-P256-SHA256, + pk-HashMLDSA44-ECDSA-P256-SHA256 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA65-RSA3072-PSS-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 44 } + +pk-HashMLDSA65-RSA3072-PSS-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA65-RSA3072-PSS-SHA512, + RsaCompositeSignaturePublicKey} + +sa-HashMLDSA65-RSA3072-PSS-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA65-RSA3072-PSS-SHA512, + pk-HashMLDSA65-RSA3072-PSS-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA65-RSA3072-PKCS15-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 45 } + +pk-HashMLDSA65-RSA3072-PKCS15-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA65-RSA3072-PKCS15-SHA512, + RsaCompositeSignaturePublicKey} + +sa-HashMLDSA65-RSA3072-PKCS15-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA65-RSA3072-PKCS15-SHA512, + pk-HashMLDSA65-RSA3072-PKCS15-SHA512 } + +-- TODO: OID to be replaced by IANA +id-HashMLDSA65-RSA4096-PSS-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 46 } + +pk-HashMLDSA65-RSA4096-PSS-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA65-RSA4096-PSS-SHA512, + RsaCompositeSignaturePublicKey} + +sa-HashMLDSA65-RSA4096-PSS-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA65-RSA4096-PSS-SHA512, + pk-HashMLDSA65-RSA4096-PSS-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA65-RSA4096-PKCS15-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 47 } + +pk-HashMLDSA65-RSA4096-PKCS15-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA65-RSA4096-PKCS15-SHA512, + RsaCompositeSignaturePublicKey} + +sa-HashMLDSA65-RSA4096-PKCS15-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA65-RSA4096-PKCS15-SHA512, + pk-HashMLDSA65-RSA4096-PKCS15-SHA512 } + +-- TODO: OID to be replaced by IANA +id-HashMLDSA65-ECDSA-P384-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 48 } + +pk-HashMLDSA65-ECDSA-P384-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA65-ECDSA-P384-SHA512, + EcCompositeSignaturePublicKey} + +sa-HashMLDSA65-ECDSA-P256-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA65-ECDSA-P384-SHA512, + pk-HashMLDSA65-ECDSA-P384-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA65-ECDSA-brainpoolP256r1-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 49 } + +pk-HashMLDSA65-ECDSA-brainpoolP256r1-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA65-ECDSA-brainpoolP256r1-SHA512, + EcCompositeSignaturePublicKey} + +sa-HashMLDSA65-ECDSA-brainpoolP256r1-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA65-ECDSA-brainpoolP256r1-SHA512, + pk-HashMLDSA65-ECDSA-brainpoolP256r1-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA65-Ed25519-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 50 } + +pk-HashMLDSA65-Ed25519-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA65-Ed25519-SHA512, + EdCompositeSignaturePublicKey} + +sa-HashMLDSA65-Ed25519-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA65-Ed25519-SHA512, + pk-HashMLDSA65-Ed25519-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA87-ECDSA-P384-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 51 } + +pk-HashMLDSA87-ECDSA-P384-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA87-ECDSA-P384-SHA512, + EcCompositeSignaturePublicKey} + +sa-HashMLDSA87-ECDSA-P384-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA87-ECDSA-P384-SHA512, + pk-HashMLDSA87-ECDSA-P384-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA87-ECDSA-brainpoolP384r1-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 52 } + +pk-HashMLDSA87-ECDSA-brainpoolP384r1-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA87-ECDSA-brainpoolP384r1-SHA512, + EcCompositeSignaturePublicKey} + +sa-HashMLDSA87-ECDSA-brainpoolP384r1-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA87-ECDSA-brainpoolP384r1-SHA512, + pk-HashMLDSA87-ECDSA-brainpoolP384r1-SHA512 } + + +-- TODO: OID to be replaced by IANA +id-HashMLDSA87-Ed448-SHA512 OBJECT IDENTIFIER ::= { + joint-iso-itu-t(2) country(16) us(840) organization(1) + entrust(114027) algorithm(80) composite(8) signature(1) 53 } + +pk-HashMLDSA87-Ed448-SHA512 PUBLIC-KEY ::= + pk-CompositeSignature{ id-HashMLDSA87-Ed448-SHA512, + EdCompositeSignaturePublicKey} + +sa-HashMLDSA87-Ed448-SHA512 SIGNATURE-ALGORITHM ::= + sa-CompositeSignature{ + id-HashMLDSA87-Ed448-SHA512, + pk-HashMLDSA87-Ed448-SHA512 } END