wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Adjust some provider reason codes

Browse source 
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)
This commit is contained in:
Richard Levitte 2019-08-12 13:14:51 +02:00
parent 25446a66b6
commit f73eb733ee
5 changed files with 13 additions and 13 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
crypto/err/openssl.txt
View file

@ -2712,8 +2712,8 @@ PROV_R_FAILED_TO_GET_PARAMETER:103:failed to get parameter
PROV_R_FAILED_TO_SET_PARAMETER:104:failed to set parameter PROV_R_FAILED_TO_SET_PARAMETER:104:failed to set parameter
PROV_R_INVALID_AAD:108:invalid aad PROV_R_INVALID_AAD:108:invalid aad
PROV_R_INVALID_CUSTOM_LENGTH:111:invalid custom length PROV_R_INVALID_CUSTOM_LENGTH:111:invalid custom length
PROV_R_INVALID_IVLEN:109:invalid ivlen PROV_R_INVALID_IV_LENGTH:109:invalid iv length
PROV_R_INVALID_KEYLEN:105:invalid keylen PROV_R_INVALID_KEY_LENGTH:105:invalid key length
PROV_R_INVALID_SALT_LENGTH:112:invalid salt length PROV_R_INVALID_SALT_LENGTH:112:invalid salt length
PROV_R_INVALID_TAG:110:invalid tag PROV_R_INVALID_TAG:110:invalid tag
PROV_R_NOT_XOF_OR_INVALID_LENGTH:113:not xof or invalid length PROV_R_NOT_XOF_OR_INVALID_LENGTH:113:not xof or invalid length

4
providers/common/ciphers/aes.c
View file

@ -59,7 +59,7 @@ static int aes_einit(void *vctx, const unsigned char *key, size_t keylen,
} }
if (key != NULL) { if (key != NULL) {
if (keylen != ctx->keylen) { if (keylen != ctx->keylen) {
PROVerr(PROV_F_AES_EINIT, PROV_R_INVALID_KEYLEN); PROVerr(PROV_F_AES_EINIT, PROV_R_INVALID_KEY_LENGTH);
return 0; return 0;
} }
return ctx->ciph->init(ctx, key, ctx->keylen); return ctx->ciph->init(ctx, key, ctx->keylen);
@ -79,7 +79,7 @@ static int aes_dinit(void *vctx, const unsigned char *key, size_t keylen,
} }
if (key != NULL) { if (key != NULL) {
if (keylen != ctx->keylen) { if (keylen != ctx->keylen) {
PROVerr(PROV_F_AES_DINIT, PROV_R_INVALID_KEYLEN); PROVerr(PROV_F_AES_DINIT, PROV_R_INVALID_KEY_LENGTH);
return 0; return 0;
} }
return ctx->ciph->init(ctx, key, ctx->keylen); return ctx->ciph->init(ctx, key, ctx->keylen);

8
providers/common/ciphers/gcm.c
View file

@ -68,7 +68,7 @@ static int gcm_init(void *vctx, const unsigned char *key, size_t keylen,
if (iv != NULL) { if (iv != NULL) {
if (ivlen < ctx->ivlen_min || ivlen > sizeof(ctx->iv)) { if (ivlen < ctx->ivlen_min || ivlen > sizeof(ctx->iv)) {
PROVerr(0, PROV_R_INVALID_IVLEN); PROVerr(0, PROV_R_INVALID_IV_LENGTH);
return 0; return 0;
} }
ctx->ivlen = ivlen; ctx->ivlen = ivlen;
@ -78,7 +78,7 @@ static int gcm_init(void *vctx, const unsigned char *key, size_t keylen,
if (key != NULL) { if (key != NULL) {
if (keylen != ctx->keylen) { if (keylen != ctx->keylen) {
PROVerr(0, PROV_R_INVALID_KEYLEN); PROVerr(0, PROV_R_INVALID_KEY_LENGTH);
return 0; return 0;
} }
return ctx->hw->setkey(ctx, key, ctx->keylen); return ctx->hw->setkey(ctx, key, ctx->keylen);
@ -120,7 +120,7 @@ static int gcm_ctx_get_params(void *vctx, OSSL_PARAM params[])
if (ctx->iv_gen != 1 && ctx->iv_gen_rand != 1) if (ctx->iv_gen != 1 && ctx->iv_gen_rand != 1)
return 0; return 0;
if (ctx->ivlen != (int)p->data_size) { if (ctx->ivlen != (int)p->data_size) {
PROVerr(0, PROV_R_INVALID_IVLEN); PROVerr(0, PROV_R_INVALID_IV_LENGTH);
return 0; return 0;
} }
if (!OSSL_PARAM_set_octet_string(p, ctx->iv, ctx->ivlen)) { if (!OSSL_PARAM_set_octet_string(p, ctx->iv, ctx->ivlen)) {
@ -177,7 +177,7 @@ static int gcm_ctx_set_params(void *vctx, const OSSL_PARAM params[])
return 0; return 0;
} }
if (sz == 0 || sz > sizeof(ctx->iv)) { if (sz == 0 || sz > sizeof(ctx->iv)) {
PROVerr(0, PROV_R_INVALID_IVLEN); PROVerr(0, PROV_R_INVALID_IV_LENGTH);
return 0; return 0;
} }
ctx->ivlen = sz; ctx->ivlen = sz;

4
providers/common/include/internal/providercommonerr.h
View file

@ -51,8 +51,8 @@ int ERR_load_PROV_strings(void);
# define PROV_R_FAILED_TO_SET_PARAMETER 104 # define PROV_R_FAILED_TO_SET_PARAMETER 104
# define PROV_R_INVALID_AAD 108 # define PROV_R_INVALID_AAD 108
# define PROV_R_INVALID_CUSTOM_LENGTH 111 # define PROV_R_INVALID_CUSTOM_LENGTH 111
# define PROV_R_INVALID_IVLEN 109 # define PROV_R_INVALID_IV_LENGTH 109
# define PROV_R_INVALID_KEYLEN 105 # define PROV_R_INVALID_KEY_LENGTH 105
# define PROV_R_INVALID_SALT_LENGTH 112 # define PROV_R_INVALID_SALT_LENGTH 112
# define PROV_R_INVALID_TAG 110 # define PROV_R_INVALID_TAG 110
# define PROV_R_NOT_XOF_OR_INVALID_LENGTH 113 # define PROV_R_NOT_XOF_OR_INVALID_LENGTH 113

6
providers/common/provider_err.c
View file

@ -25,12 +25,12 @@ static const ERR_STRING_DATA PROV_str_reasons[] = {
"failed to set parameter"}, "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_AAD), "invalid aad"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CUSTOM_LENGTH), {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_CUSTOM_LENGTH),
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_IVLEN), "invalid ivlen"}, "invalid custom length"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_KEYLEN), "invalid keylen"}, {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), {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_SALT_LENGTH),
"invalid salt length"}, "invalid salt length"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_INVALID_TAG), "invalid tag"}, {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), {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NOT_XOF_OR_INVALID_LENGTH),
"not xof or invalid length"}, "not xof or invalid length"},
{ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_KEY_SET), "no key set"}, {ERR_PACK(ERR_LIB_PROV, 0, PROV_R_NO_KEY_SET), "no key set"},