Error reason fixes - mostly a small reordering 'make update' doesn't quite agree with the ordering of error reasons from recent development / merge. Reviewed-by: Jakub Zelenka <jakub.zelenka@openssl.foundation> Reviewed-by: Igor Ustinov <igus@openssl.foundation> MergeDate: Fri Jul 31 10:50:04 2026 (Merged from https://github.com/openssl/openssl/pull/32131)
diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 7b3b917..730adb2 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt
@@ -893,8 +893,9 @@ OSSL_FN_R_INPUT_NOT_REDUCED:103:input not reduced OSSL_FN_R_INVALID_RANGE:106:invalid range OSSL_FN_R_INVALID_SHIFT:102:invalid shift -OSSL_FN_R_NO_INVERSE:104:no inverse OSSL_FN_R_NOT_A_SQUARE:109:not a square +OSSL_FN_R_NO_INVERSE:104:no inverse +OSSL_FN_R_OVERFLOW:108:overflow OSSL_FN_R_P_IS_NOT_PRIME:110:p is not prime OSSL_FN_R_RESULT_ARG_TOO_SMALL:100:result arg too small OSSL_FN_R_TOO_MANY_ITERATIONS:107:too many iterations
diff --git a/crypto/fn/fn_err.c b/crypto/fn/fn_err.c index 6126e0c..7f817a4 100644 --- a/crypto/fn/fn_err.c +++ b/crypto/fn/fn_err.c
@@ -16,15 +16,18 @@ static const ERR_STRING_DATA OSSL_FN_str_reasons[] = { { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_BITS_TOO_SMALL), "bits too small" }, { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_DIV_BY_ZERO), "div by zero" }, - { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_INPUT_NOT_REDUCED), "input not reduced" }, + { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_INPUT_NOT_REDUCED), + "input not reduced" }, { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_INVALID_RANGE), "invalid range" }, { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_INVALID_SHIFT), "invalid shift" }, - { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_NO_INVERSE), "no inverse" }, { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_NOT_A_SQUARE), "not a square" }, + { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_NO_INVERSE), "no inverse" }, { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_OVERFLOW), "overflow" }, { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_P_IS_NOT_PRIME), "p is not prime" }, - { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_RESULT_ARG_TOO_SMALL), "result arg too small" }, - { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_TOO_MANY_ITERATIONS), "too many iterations" }, + { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_RESULT_ARG_TOO_SMALL), + "result arg too small" }, + { ERR_PACK(ERR_LIB_OSSL_FN, 0, OSSL_FN_R_TOO_MANY_ITERATIONS), + "too many iterations" }, { 0, NULL } };
diff --git a/include/crypto/fnerr.h b/include/crypto/fnerr.h index 742547d..0496b4e 100644 --- a/include/crypto/fnerr.h +++ b/include/crypto/fnerr.h
@@ -29,8 +29,8 @@ #define OSSL_FN_R_INPUT_NOT_REDUCED 103 #define OSSL_FN_R_INVALID_RANGE 106 #define OSSL_FN_R_INVALID_SHIFT 102 -#define OSSL_FN_R_NO_INVERSE 104 #define OSSL_FN_R_NOT_A_SQUARE 109 +#define OSSL_FN_R_NO_INVERSE 104 #define OSSL_FN_R_OVERFLOW 108 #define OSSL_FN_R_P_IS_NOT_PRIME 110 #define OSSL_FN_R_RESULT_ARG_TOO_SMALL 100