summaryrefslogtreecommitdiff
path: root/providers/common/provider_err.c
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2019-08-12 13:14:51 +0200
committerRichard Levitte <levitte@openssl.org>2019-08-15 22:12:25 +0200
commitf73eb733eeeb50df0068d01efaa3221cadb07389 (patch)
tree9ec914d06af87842b9681b4e7cbfe9bbd46c0697 /providers/common/provider_err.c
parent25446a66b69a28c85d178e4454d2caed75d75293 (diff)
downloadopenssl-new-f73eb733eeeb50df0068d01efaa3221cadb07389.tar.gz
Adjust some provider reason codes
BLAKE2 MACs came with a set of new reason codes. Those talking about lengths are consistently called PROV_R_INVALID_FOO_LENGTH, for any name FOO. The cipher messages were briefer. In the interest of having more humanly readable messages, we adjust the reasons used by the ciphers (that's just IV length and key length). Reviewed-by: Matt Caswell <matt@openssl.org> Reviewed-by: Shane Lontis <shane.lontis@oracle.com> (Merged from https://github.com/openssl/openssl/pull/8877)
Diffstat (limited to 'providers/common/provider_err.c')
-rw-r--r--providers/common/provider_err.c6
1 files changed, 3 insertions, 3 deletions
diff --git a/providers/common/provider_err.c b/providers/common/provider_err.c
index f1039cd930..b7f90057d4 100644
--- a/providers/common/provider_err.c
+++ b/providers/common/provider_err.c
@@ -25,12 +25,12 @@ static const ERR_STRING_DATA PROV_str_reasons[] = {
"failed to set parameter"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_AAD), "invalid aad"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CUSTOM_LENGTH),
- {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_IVLEN), "invalid ivlen"},
- {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KEYLEN), "invalid keylen"},
+ "invalid custom length"},
+ {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_IV_LENGTH), "invalid iv length"},
+ {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KEY_LENGTH), "invalid key length"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SALT_LENGTH),
"invalid salt length"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_TAG), "invalid tag"},
- "invalid custom length"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_XOF_OR_INVALID_LENGTH),
"not xof or invalid length"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_KEY_SET), "no key set"},