Commit 6caf7f3a authored by Matt Caswell's avatar Matt Caswell
Browse files

Create provider errors and use them 



Reviewed-by: default avatarPaul Dale <paul.dale@oracle.com>
(Merged from https://github.com/openssl/openssl/pull/8700)
parent 64adf9aa

crypto/err/err.c

+1 −0
Original line number Diff line number Diff line
@@ -66,6 +66,7 @@ static ERR_STRING_DATA ERR_str_libraries[] = { 
    {ERR_PACK(ERR_LIB_OSSL_STORE, 0, 0), "STORE routines"},

    {ERR_PACK(ERR_LIB_SM2, 0, 0), "SM2 routines"},

    {ERR_PACK(ERR_LIB_ESS, 0, 0), "ESS routines"},

    {ERR_PACK(ERR_LIB_PROV, 0, 0), "Provider routines"},

    {0, NULL},

};

crypto/err/err_all.c

+3 −1
Original line number Diff line number Diff line
@@ -41,6 +41,7 @@ 
#include <openssl/storeerr.h>

#include <openssl/esserr.h>

#include "internal/propertyerr.h"

#include "internal/providercommonerr.h"



int err_load_crypto_strings_int(void)

{
@@ -102,7 +103,8 @@ int err_load_crypto_strings_int(void) 
#endif

        ERR_load_KDF_strings() == 0 ||

        ERR_load_OSSL_STORE_strings() == 0 ||

        ERR_load_PROP_strings() == 0)

        ERR_load_PROP_strings() == 0 ||

        ERR_load_PROV_strings() == 0)

        return 0;



    return 1;

crypto/err/openssl.ec

+1 −0
Original line number Diff line number Diff line
@@ -37,6 +37,7 @@ L SM2 crypto/include/internal/sm2.h crypto/sm2/sm2_err.c 
L OSSL_STORE    include/openssl/store.h         crypto/store/store_err.c

L ESS           include/openssl/ess.h           crypto/ess/ess_err.c

L PROP          include/internal/property.h     crypto/property/property_err.c

L PROV          providers/common/include/internal/providercommon.h providers/common/provider_err.c



# additional header files to be scanned for function names

L NONE          include/openssl/x509_vfy.h      NONE

crypto/err/openssl.txt

+23 −0
Original line number Diff line number Diff line
@@ -1105,6 +1105,21 @@ PROP_F_PARSE_NUMBER:104:parse_number 
PROP_F_PARSE_OCT:105:parse_oct

PROP_F_PARSE_STRING:106:parse_string

PROP_F_PARSE_UNQUOTED:107:parse_unquoted

PROV_F_AESNI_INIT_KEY:101:aesni_init_key

PROV_F_AES_BLOCK_FINAL:102:aes_block_final

PROV_F_AES_BLOCK_UPDATE:103:aes_block_update

PROV_F_AES_CIPHER:104:aes_cipher

PROV_F_AES_CTX_GET_PARAMS:105:aes_ctx_get_params

PROV_F_AES_CTX_SET_PARAMS:106:aes_ctx_set_params

PROV_F_AES_DINIT:107:aes_dinit

PROV_F_AES_DUPCTX:108:aes_dupctx

PROV_F_AES_EINIT:109:aes_einit

PROV_F_AES_INIT_KEY:110:aes_init_key

PROV_F_AES_STREAM_UPDATE:111:aes_stream_update

PROV_F_AES_T4_INIT_KEY:112:aes_t4_init_key

PROV_F_PROV_AES_KEY_GENERIC_INIT:113:PROV_AES_KEY_generic_init

PROV_F_TRAILINGDATA:114:trailingdata

PROV_F_UNPADBLOCK:100:unpadblock

RAND_F_DRBG_BYTES:101:drbg_bytes

RAND_F_DRBG_CTR_INIT:125:drbg_ctr_init

RAND_F_DRBG_GET_ENTROPY:105:drbg_get_entropy
@@ -2608,6 +2623,14 @@ PROP_R_NO_VALUE:107:no value 
PROP_R_PARSE_FAILED:108:parse failed

PROP_R_STRING_TOO_LONG:109:string too long

PROP_R_TRAILING_CHARACTERS:110:trailing characters

PROV_R_AES_KEY_SETUP_FAILED:101:aes key setup failed

PROV_R_BAD_DECRYPT:100:bad decrypt

PROV_R_CIPHER_OPERATION_FAILED:102:cipher operation failed

PROV_R_FAILED_TO_GET_PARAMETER:103:failed to get parameter

PROV_R_FAILED_TO_SET_PARAMETER:104:failed to set parameter

PROV_R_INVALID_KEYLEN:105:invalid keylen

PROV_R_OUTPUT_BUFFER_TOO_SMALL:106:output buffer too small

PROV_R_WRONG_FINAL_BLOCK_LENGTH:107:wrong final block length

RAND_R_ADDITIONAL_INPUT_TOO_LONG:102:additional input too long

RAND_R_ALREADY_INSTANTIATED:103:already instantiated

RAND_R_ARGUMENT_OUT_OF_RANGE:105:argument out of range

include/openssl/err.h

+2 −0
Original line number Diff line number Diff line
@@ -98,6 +98,7 @@ typedef struct err_state_st { 
# define ERR_LIB_ESS             54

# define ERR_LIB_PROP            55

# define ERR_LIB_CRMF            56

# define ERR_LIB_PROV            57



# define ERR_LIB_USER            128
@@ -140,6 +141,7 @@ typedef struct err_state_st { 
# define SM2err(f,r) ERR_PUT_error(ERR_LIB_SM2,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

# define ESSerr(f,r) ERR_PUT_error(ERR_LIB_ESS,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

# define PROPerr(f,r) ERR_PUT_error(ERR_LIB_PROP,(f),(r),OPENSSL_FILE,OPENSSL_LINE)

# define PROVerr(f,r) ERR_PUT_error(ERR_LIB_PROV,(f),(r),OPENSSL_FILE,OPENSSL_LINE)



# define ERR_PACK(l,f,r) ( \

        (((unsigned int)(l) & 0x0FF) << 24L) | \