Fix docs/comments with ASN.1 private key syntax

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Shane Lontis <shane.lontis@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/26674)

diff --git a/doc/man7/EVP_PKEY-ML-DSA.pod b/doc/man7/EVP_PKEY-ML-DSA.pod
index 4cd072f67d5281d14e4d70d9511c1b110115e8c9..c647c4f5093e432df98f07af61903643c2caa8c9 100644 (file)
--- a/doc/man7/EVP_PKEY-ML-DSA.pod
+++ b/doc/man7/EVP_PKEY-ML-DSA.pod
@@ -127,11 +127,11 @@ B<ξ> seed and the secret key B<sk> are present in the private key as part of
 the DER encoding of the ASN.1 sequence:
 
     ML-DSA-PrivateKey ::= CHOICE {
-      seed [0] IMPLICIT OCTET STRING SIZE (32),
-      expandedKey OCTET STRING SIZE (2560 | 4032 | 4896)
+      seed [0] IMPLICIT OCTET STRING (SIZE (32)),
+      expandedKey OCTET STRING (SIZE (2560 | 4032 | 4896)),
       both SEQUENCE {
-        seed OCTET STRING SIZE (32),
-        expandedKey OCTET STRING SIZE (2560 | 4032 | 4896) } }
+        seed OCTET STRING (SIZE (32)),
+        expandedKey OCTET STRING (SIZE (2560 | 4032 | 4896)) } }
 
 If the C<seed-priv> format is not included in the list, this format will not be
 recognised on input.

diff --git a/providers/implementations/encode_decode/ml_dsa_codecs.c b/providers/implementations/encode_decode/ml_dsa_codecs.c
index 365133d6c84d5aa15ac14b4397227581b504d12f..e7be0094cc686ea7b44b13ffa8a48bdf83dfc238 100644 (file)
--- a/providers/implementations/encode_decode/ml_dsa_codecs.c
+++ b/providers/implementations/encode_decode/ml_dsa_codecs.c
@@ -22,11 +22,11 @@
  * corresponding to the "either or both" variants of:
  *
  *  ML-DSA-PrivateKey ::= CHOICE {
- *    seed [0] IMPLICIT OCTET STRING SIZE (32),
- *    expandedKey OCTET STRING SIZE (2560 | 4032 | 4896)
+ *    seed [0] IMPLICIT OCTET STRING (SIZE (32)),
+ *    expandedKey OCTET STRING (SIZE (2560 | 4032 | 4896)),
  *    both SEQUENCE {
- *      seed OCTET STRING SIZE (32),
- *      expandedKey OCTET STRING SIZE (2560 | 4032 | 4896) } }
+ *      seed OCTET STRING (SIZE (32)),
+ *      expandedKey OCTET STRING (SIZE (2560 | 4032 | 4896)) } }
  *
  * one more for a historical OQS encoding:
  *

diff --git a/providers/implementations/encode_decode/ml_dsa_codecs.h b/providers/implementations/encode_decode/ml_dsa_codecs.h
index 4bbcaae259ba7509b5dedd0a030f3aa69488da1a..87993415fbaf58b9faa9bcea4d1c3080fa21e977 100644 (file)
--- a/providers/implementations/encode_decode/ml_dsa_codecs.h
+++ b/providers/implementations/encode_decode/ml_dsa_codecs.h
@@ -36,11 +36,11 @@ typedef struct {
  * corresponding to the "either or both" variants of:
  *
  *  ML-DSA-PrivateKey ::= CHOICE {
- *    seed [0] IMPLICIT OCTET STRING SIZE (32),
- *    expandedKey OCTET STRING SIZE (2560 | 4032 | 4896)
+ *    seed [0] IMPLICIT OCTET STRING (SIZE (32)),
+ *    expandedKey OCTET STRING (SIZE (2560 | 4032 | 4896)),
  *    both SEQUENCE {
- *      seed OCTET STRING SIZE (32),
- *      expandedKey OCTET STRING SIZE (2560 | 4032 | 4896) } }
+ *      seed OCTET STRING (SIZE (32)),
+ *      expandedKey OCTET STRING (SIZE (2560 | 4032 | 4896)) } }
  *
  * one more for a historical OQS encoding:
  *