diff options
| author | Tomas Mraz <tomas@openssl.org> | 2022-03-31 11:01:33 +0200 |
|---|---|---|
| committer | Tomas Mraz <tomas@openssl.org> | 2022-04-14 08:51:18 +0200 |
| commit | 53137462f42f8673fbd5b0831f8ea051ddea509f (patch) | |
| tree | 2f333780150ca35f0de587a71be216bed7af79e3 /crypto | |
| parent | e8a4145968eea576788761f39c5e4cb68b7c4a42 (diff) | |
Add error code for unsupported explicit parameters
Reviewed-by: Nicola Tuveri <nic.tuv@gmail.com>
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17998)
Diffstat (limited to 'crypto')
| -rw-r--r-- | crypto/ec/ec_err.c | 4 | ||||
| -rw-r--r-- | crypto/ec/ec_lib.c | 1 | ||||
| -rw-r--r-- | crypto/err/openssl.txt | 1 |
3 files changed, 5 insertions, 1 deletions
diff --git a/crypto/ec/ec_err.c b/crypto/ec/ec_err.c index 9dc143c2ac..4d6f2a76ad 100644 --- a/crypto/ec/ec_err.c +++ b/crypto/ec/ec_err.c @@ -1,6 +1,6 @@ /* * Generated by util/mkerr.pl DO NOT EDIT - * Copyright 1995-2021 The OpenSSL Project Authors. All Rights Reserved. + * Copyright 1995-2022 The OpenSSL Project Authors. All Rights Reserved. * * Licensed under the Apache License 2.0 (the "License"). You may not use * this file except in compliance with the License. You can obtain a copy @@ -35,6 +35,8 @@ static const ERR_STRING_DATA EC_str_reasons[] = { "discriminant is zero"}, {ERR_PACK(ERR_LIB_EC, 0, EC_R_EC_GROUP_NEW_BY_NAME_FAILURE), "ec group new by name failure"}, + {ERR_PACK(ERR_LIB_EC, 0, EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED), + "explicit params not supported"}, {ERR_PACK(ERR_LIB_EC, 0, EC_R_FAILED_MAKING_PUBLIC_KEY), "failed making public key"}, {ERR_PACK(ERR_LIB_EC, 0, EC_R_FIELD_TOO_LARGE), "field too large"}, diff --git a/crypto/ec/ec_lib.c b/crypto/ec/ec_lib.c index f00b222aeb..f686e45f89 100644 --- a/crypto/ec/ec_lib.c +++ b/crypto/ec/ec_lib.c @@ -1567,6 +1567,7 @@ EC_GROUP *EC_GROUP_new_from_params(const OSSL_PARAM params[], return group; } #ifdef FIPS_MODULE + ERR_raise(ERR_LIB_EC, EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED); return NULL; #else /* If it gets here then we are trying explicit parameters */ diff --git a/crypto/err/openssl.txt b/crypto/err/openssl.txt index 27f7247235..a6c8142a3e 100644 --- a/crypto/err/openssl.txt +++ b/crypto/err/openssl.txt @@ -554,6 +554,7 @@ EC_R_CURVE_DOES_NOT_SUPPORT_SIGNING:159:curve does not support signing EC_R_DECODE_ERROR:142:decode error EC_R_DISCRIMINANT_IS_ZERO:118:discriminant is zero EC_R_EC_GROUP_NEW_BY_NAME_FAILURE:119:ec group new by name failure +EC_R_EXPLICIT_PARAMS_NOT_SUPPORTED:127:explicit params not supported EC_R_FAILED_MAKING_PUBLIC_KEY:166:failed making public key EC_R_FIELD_TOO_LARGE:143:field too large EC_R_GF2M_NOT_SUPPORTED:147:gf2m not supported |