mirror of
https://github.com/openssl/openssl.git
synced 2025-02-17 14:32:04 +08:00
Update from stable branch.
This commit is contained in:
parent
adb92d56eb
commit
a01a351cc2
@ -153,8 +153,9 @@ static ERR_STRING_DATA ERR_str_libraries[]=
|
|||||||
{ERR_PACK(ERR_LIB_TS,0,0) ,"time stamp routines"},
|
{ERR_PACK(ERR_LIB_TS,0,0) ,"time stamp routines"},
|
||||||
{ERR_PACK(ERR_LIB_ENGINE,0,0) ,"engine routines"},
|
{ERR_PACK(ERR_LIB_ENGINE,0,0) ,"engine routines"},
|
||||||
{ERR_PACK(ERR_LIB_OCSP,0,0) ,"OCSP routines"},
|
{ERR_PACK(ERR_LIB_OCSP,0,0) ,"OCSP routines"},
|
||||||
{ERR_PACK(ERR_LIB_HMAC,0,0) ,"HMAC routines"},
|
{ERR_PACK(ERR_LIB_FIPS,0,0) ,"FIPS routines"},
|
||||||
{ERR_PACK(ERR_LIB_CMS,0,0) ,"CMS routines"},
|
{ERR_PACK(ERR_LIB_CMS,0,0) ,"CMS routines"},
|
||||||
|
{ERR_PACK(ERR_LIB_HMAC,0,0) ,"HMAC routines"},
|
||||||
{0,NULL},
|
{0,NULL},
|
||||||
};
|
};
|
||||||
|
|
||||||
|
@ -196,9 +196,10 @@ typedef struct err_state_st
|
|||||||
#define ERR_LIB_ECDSA 42
|
#define ERR_LIB_ECDSA 42
|
||||||
#define ERR_LIB_ECDH 43
|
#define ERR_LIB_ECDH 43
|
||||||
#define ERR_LIB_STORE 44
|
#define ERR_LIB_STORE 44
|
||||||
#define ERR_LIB_TS 45
|
#define ERR_LIB_FIPS 45
|
||||||
#define ERR_LIB_HMAC 46
|
#define ERR_LIB_CMS 46
|
||||||
#define ERR_LIB_CMS 47
|
#define ERR_LIB_TS 47
|
||||||
|
#define ERR_LIB_HMAC 48
|
||||||
|
|
||||||
#define ERR_LIB_USER 128
|
#define ERR_LIB_USER 128
|
||||||
|
|
||||||
@ -230,9 +231,10 @@ typedef struct err_state_st
|
|||||||
#define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
|
#define ECDSAerr(f,r) ERR_PUT_error(ERR_LIB_ECDSA,(f),(r),__FILE__,__LINE__)
|
||||||
#define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
|
#define ECDHerr(f,r) ERR_PUT_error(ERR_LIB_ECDH,(f),(r),__FILE__,__LINE__)
|
||||||
#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
|
#define STOREerr(f,r) ERR_PUT_error(ERR_LIB_STORE,(f),(r),__FILE__,__LINE__)
|
||||||
|
#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__)
|
||||||
|
#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
|
||||||
#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
|
#define TSerr(f,r) ERR_PUT_error(ERR_LIB_TS,(f),(r),__FILE__,__LINE__)
|
||||||
#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
|
#define HMACerr(f,r) ERR_PUT_error(ERR_LIB_HMAC,(f),(r),__FILE__,__LINE__)
|
||||||
#define CMSerr(f,r) ERR_PUT_error(ERR_LIB_CMS,(f),(r),__FILE__,__LINE__)
|
|
||||||
|
|
||||||
/* Borland C seems too stupid to be able to shift and do longs in
|
/* Borland C seems too stupid to be able to shift and do longs in
|
||||||
* the pre-processor :-( */
|
* the pre-processor :-( */
|
||||||
|
Loading…
Reference in New Issue
Block a user