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/x509/x509spki.c | |
| parent | 31a6b52f6db009c639c67387a707dd235f29a430 (diff) | |
| download | openssl-9311d0c471ca2eaa259e8c1bbbeb7c46394c7ba2.tar.gz | |
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/x509/x509spki.c')
| -rw-r--r-- | crypto/x509/x509spki.c | 6 |
1 files changed, 3 insertions, 3 deletions
diff --git a/crypto/x509/x509spki.c b/crypto/x509/x509spki.c index ef8fe13c08..73609ec5f7 100644 --- a/crypto/x509/x509spki.c +++ b/crypto/x509/x509spki.c @@ -36,12 +36,12 @@ NETSCAPE_SPKI *NETSCAPE_SPKI_b64_decode(const char *str, int len) if (len <= 0) len = strlen(str); if ((spki_der = OPENSSL_malloc(len + 1)) == NULL) { - X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE); return NULL; } spki_len = EVP_DecodeBlock(spki_der, (const unsigned char *)str, len); if (spki_len < 0) { - X509err(X509_F_NETSCAPE_SPKI_B64_DECODE, X509_R_BASE64_DECODE_ERROR); + ERR_raise(ERR_LIB_X509, X509_R_BASE64_DECODE_ERROR); OPENSSL_free(spki_der); return NULL; } @@ -62,7 +62,7 @@ char *NETSCAPE_SPKI_b64_encode(NETSCAPE_SPKI *spki) der_spki = OPENSSL_malloc(der_len); b64_str = OPENSSL_malloc(der_len * 2); if (der_spki == NULL || b64_str == NULL) { - X509err(X509_F_NETSCAPE_SPKI_B64_ENCODE, ERR_R_MALLOC_FAILURE); + ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE); OPENSSL_free(der_spki); OPENSSL_free(b64_str); return NULL; |