Post-merge make update

Reviewed-by: Tim Hudson <tjh@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
Reviewed-by: Tomas Mraz <tomas@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/26715)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index 1ab859823370d5b540ede96dac93e44e830b22ca..c7a3cf23b1f5bac22162f63f7bde35062ee2bc3b 100644 (file)
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -1131,7 +1131,8 @@ PROV_R_MISSING_SEED:140:missing seed
 PROV_R_MISSING_SESSION_ID:133:missing session id
 PROV_R_MISSING_TYPE:134:missing type
 PROV_R_MISSING_XCGHASH:135:missing xcghash
-PROV_R_ML_KEM_NO_FORMAT:251:ml kem no format
+PROV_R_ML_DSA_NO_FORMAT:245:ml dsa no format
+PROV_R_ML_KEM_NO_FORMAT:246:ml kem no format
 PROV_R_MODULE_INTEGRITY_FAILURE:214:module integrity failure
 PROV_R_NOT_A_PRIVATE_KEY:221:not a private key
 PROV_R_NOT_A_PUBLIC_KEY:220:not a public key
@@ -1143,7 +1144,7 @@ PROV_R_NO_INSTANCE_ALLOWED:242:no instance allowed
 PROV_R_NO_KEY_SET:114:no key set
 PROV_R_NO_PARAMETERS_SET:177:no parameters set
 PROV_R_NULL_LENGTH_POINTER:247:null length pointer
-PROV_R_NULL_OUTPUT_BUFFER:245:null output buffer
+PROV_R_NULL_OUTPUT_BUFFER:248:null output buffer
 PROV_R_ONESHOT_CALL_OUT_OF_ORDER:239:oneshot call out of order
 PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE:178:\
        operation not supported for this keytype
@@ -1175,17 +1176,16 @@ PROV_R_UNABLE_TO_INITIALISE_CIPHERS:208:unable to initialise ciphers
 PROV_R_UNABLE_TO_LOAD_SHA256:147:unable to load sha256
 PROV_R_UNABLE_TO_LOCK_PARENT:201:unable to lock parent
 PROV_R_UNABLE_TO_RESEED:204:unable to reseed
-PROV_R_UNEXPECTED_KEY_OID:249:unexpected key oid
-PROV_R_UNEXPECTED_KEY_PARAMETERS:250:unexpected key parameters
+PROV_R_UNEXPECTED_KEY_PARAMETERS:249:unexpected key parameters
 PROV_R_UNSUPPORTED_CEK_ALG:145:unsupported cek alg
 PROV_R_UNSUPPORTED_KEY_SIZE:153:unsupported key size
 PROV_R_UNSUPPORTED_MAC_TYPE:137:unsupported mac type
 PROV_R_UNSUPPORTED_NUMBER_OF_ROUNDS:152:unsupported number of rounds
-PROV_R_UNSUPPORTED_SELECTION:248:unsupported selection
+PROV_R_UNSUPPORTED_SELECTION:250:unsupported selection
 PROV_R_UPDATE_CALL_OUT_OF_ORDER:240:update call out of order
 PROV_R_URI_AUTHORITY_UNSUPPORTED:223:uri authority unsupported
 PROV_R_VALUE_ERROR:138:value error
-PROV_R_WRONG_CIPHERTEXT_SIZE:246:wrong ciphertext size
+PROV_R_WRONG_CIPHERTEXT_SIZE:251:wrong ciphertext size
 PROV_R_WRONG_FINAL_BLOCK_LENGTH:107:wrong final block length
 PROV_R_WRONG_OUTPUT_BUFFER_SIZE:139:wrong output buffer size
 PROV_R_XOF_DIGESTS_NOT_ALLOWED:183:xof digests not allowed

diff --git a/include/openssl/proverr.h b/include/openssl/proverr.h
index d4cc811410ab6d02970cc00786a08ab228aa63e2..0d61b733dc59b3206238ebefa91f46a132ba4af1 100644 (file)
--- a/include/openssl/proverr.h
+++ b/include/openssl/proverr.h
@@ -109,7 +109,8 @@
 # define PROV_R_MISSING_SESSION_ID                        133
 # define PROV_R_MISSING_TYPE                              134
 # define PROV_R_MISSING_XCGHASH                           135
-# define PROV_R_ML_KEM_NO_FORMAT                          251
+# define PROV_R_ML_DSA_NO_FORMAT                          245
+# define PROV_R_ML_KEM_NO_FORMAT                          246
 # define PROV_R_MODULE_INTEGRITY_FAILURE                  214
 # define PROV_R_NOT_A_PRIVATE_KEY                         221
 # define PROV_R_NOT_A_PUBLIC_KEY                          220
@@ -121,7 +122,7 @@
 # define PROV_R_NO_KEY_SET                                114
 # define PROV_R_NO_PARAMETERS_SET                         177
 # define PROV_R_NULL_LENGTH_POINTER                       247
-# define PROV_R_NULL_OUTPUT_BUFFER                        245
+# define PROV_R_NULL_OUTPUT_BUFFER                        248
 # define PROV_R_ONESHOT_CALL_OUT_OF_ORDER                 239
 # define PROV_R_OPERATION_NOT_SUPPORTED_FOR_THIS_KEYTYPE  178
 # define PROV_R_OUTPUT_BUFFER_TOO_SMALL                   106
@@ -149,17 +150,16 @@
 # define PROV_R_UNABLE_TO_LOAD_SHA256                     147
 # define PROV_R_UNABLE_TO_LOCK_PARENT                     201
 # define PROV_R_UNABLE_TO_RESEED                          204
-# define PROV_R_UNEXPECTED_KEY_OID                        249
-# define PROV_R_UNEXPECTED_KEY_PARAMETERS                 250
+# define PROV_R_UNEXPECTED_KEY_PARAMETERS                 249
 # define PROV_R_UNSUPPORTED_CEK_ALG                       145
 # define PROV_R_UNSUPPORTED_KEY_SIZE                      153
 # define PROV_R_UNSUPPORTED_MAC_TYPE                      137
 # define PROV_R_UNSUPPORTED_NUMBER_OF_ROUNDS              152
-# define PROV_R_UNSUPPORTED_SELECTION                     248
+# define PROV_R_UNSUPPORTED_SELECTION                     250
 # define PROV_R_UPDATE_CALL_OUT_OF_ORDER                  240
 # define PROV_R_URI_AUTHORITY_UNSUPPORTED                 223
 # define PROV_R_VALUE_ERROR                               138
-# define PROV_R_WRONG_CIPHERTEXT_SIZE                     246
+# define PROV_R_WRONG_CIPHERTEXT_SIZE                     251
 # define PROV_R_WRONG_FINAL_BLOCK_LENGTH                  107
 # define PROV_R_WRONG_OUTPUT_BUFFER_SIZE                  139
 # define PROV_R_XOF_DIGESTS_NOT_ALLOWED                   183

diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index 55edc3218b7d08975de44cb388b5c45fde13f2bd..ea727e8334d5068b6502d2dbe10d7abb9fff21c5 100644 (file)
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -153,6 +153,7 @@ static const ERR_STRING_DATA PROV_str_reasons[] = {
      "missing session id"},
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_TYPE), "missing type"},
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MISSING_XCGHASH), "missing xcghash"},
+    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ML_DSA_NO_FORMAT), "ml dsa no format"},
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_ML_KEM_NO_FORMAT), "ml kem no format"},
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_MODULE_INTEGRITY_FAILURE),
      "module integrity failure"},
@@ -220,8 +221,6 @@ static const ERR_STRING_DATA PROV_str_reasons[] = {
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_LOCK_PARENT),
      "unable to lock parent"},
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNABLE_TO_RESEED), "unable to reseed"},
-    {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNEXPECTED_KEY_OID),
-     "unexpected key oid"},
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNEXPECTED_KEY_PARAMETERS),
      "unexpected key parameters"},
     {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_UNSUPPORTED_CEK_ALG),