diff options
| author | Richard Levitte <levitte@openssl.org> | 2020-11-04 12:23:19 +0100 |
|---|---|---|
| committer | Richard Levitte <levitte@openssl.org> | 2020-11-13 09:35:02 +0100 |
| commit | 9311d0c471ca2eaa259e8c1bbbeb7c46394c7ba2 (patch) | |
| tree | e82c26569e5a952980e65a746af920beed602aab /crypto/store | |
| parent | 31a6b52f6db009c639c67387a707dd235f29a430 (diff) | |
Convert all {NAME}err() in crypto/ to their corresponding ERR_raise() call
This includes error reporting for libcrypto sub-libraries in surprising
places.
This was done using util/err-to-raise
Reviewed-by: Paul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/13318)
Diffstat (limited to 'crypto/store')
| -rw-r--r-- | crypto/store/store_lib.c | 2 | ||||
| -rw-r--r-- | crypto/store/store_result.c | 3 |
2 files changed, 2 insertions, 3 deletions
diff --git a/crypto/store/store_lib.c b/crypto/store/store_lib.c index 1ce61ea9da..671852cea2 100644 --- a/crypto/store/store_lib.c +++ b/crypto/store/store_lib.c @@ -663,7 +663,7 @@ EVP_PKEY *OSSL_STORE_INFO_get1_PUBKEY(const OSSL_STORE_INFO *info) EVP_PKEY_up_ref(info->_.pubkey); return info->_.pubkey; } - OSSL_STOREerr(0, OSSL_STORE_R_NOT_A_PUBLIC_KEY); + ERR_raise(ERR_LIB_OSSL_STORE, OSSL_STORE_R_NOT_A_PUBLIC_KEY); return NULL; } diff --git a/crypto/store/store_result.c b/crypto/store/store_result.c index 872efd56bb..175891d29f 100644 --- a/crypto/store/store_result.c +++ b/crypto/store/store_result.c @@ -325,8 +325,7 @@ static EVP_PKEY *try_key_value_legacy(struct extracted_param_data_st *data, size_t plen = 0; if (!cb(pbuf, sizeof(pbuf), &plen, NULL, cbarg)) { - ERR_raise(ERR_LIB_OSSL_STORE, - OSSL_STORE_R_BAD_PASSWORD_READ); + ERR_raise(ERR_LIB_OSSL_STORE, OSSL_STORE_R_BAD_PASSWORD_READ); } else { const X509_ALGOR *alg = NULL; const ASN1_OCTET_STRING *oct = NULL; |