Fix reason value collision for CMP_R_UNEXPECTED_SENDER

Reviewed-by: Hugo Landau <hlandau@openssl.org>
Reviewed-by: Neil Horman <nhorman@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/23323)

diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt
index b999ec3363d8cfe31eea59331f873e94cfbd3154..8d302e07d624d9953346d2fe3906eaf3efa13bba 100644 (file)
--- a/crypto/err/openssl.txt
+++ b/crypto/err/openssl.txt
@@ -278,7 +278,7 @@ CMP_R_UNEXPECTED_PKIBODY:133:unexpected pkibody
 CMP_R_UNEXPECTED_PKISTATUS:185:unexpected pkistatus
 CMP_R_UNEXPECTED_POLLREQ:105:unexpected pollreq
 CMP_R_UNEXPECTED_PVNO:153:unexpected pvno
-CMP_R_UNEXPECTED_SENDER:104:unexpected sender
+CMP_R_UNEXPECTED_SENDER:197:unexpected sender
 CMP_R_UNKNOWN_ALGORITHM_ID:134:unknown algorithm id
 CMP_R_UNKNOWN_CERT_TYPE:135:unknown cert type
 CMP_R_UNKNOWN_PKISTATUS:186:unknown pkistatus

diff --git a/include/openssl/cmperr.h b/include/openssl/cmperr.h
index 111d4c9e2fea39b05975a622ea7ca2b78c801b4b..aba6a9352ed3981133f92535756db13b421f3d31 100644 (file)
--- a/include/openssl/cmperr.h
+++ b/include/openssl/cmperr.h
@@ -104,7 +104,7 @@
 #  define CMP_R_UNEXPECTED_PKISTATUS                       185
 #  define CMP_R_UNEXPECTED_POLLREQ                         105
 #  define CMP_R_UNEXPECTED_PVNO                            153
-#  define CMP_R_UNEXPECTED_SENDER                          104
+#  define CMP_R_UNEXPECTED_SENDER                          197
 #  define CMP_R_UNKNOWN_ALGORITHM_ID                       134
 #  define CMP_R_UNKNOWN_CERT_TYPE                          135
 #  define CMP_R_UNKNOWN_PKISTATUS                          186