diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2008-06-16 15:51:48 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2008-06-16 15:51:48 +0000 |
| commit | a01a351cc2b901335e5a940acf71fe6581253cbc (patch) | |
| tree | f30d18932cf83fe3cb598094043de628de7d32b6 | |
| parent | adb92d56eb94e47069a94936fb9e2e2a18535985 (diff) | |
| download | openssl-a01a351cc2b901335e5a940acf71fe6581253cbc.zip openssl-a01a351cc2b901335e5a940acf71fe6581253cbc.tar.gz openssl-a01a351cc2b901335e5a940acf71fe6581253cbc.tar.bz2 | |
Update from stable branch.
| -rw-r--r-- | crypto/err/err.c | 3 | ||||
| -rw-r--r-- | crypto/err/err.h | 10 |
2 files changed, 8 insertions, 5 deletions
diff --git a/crypto/err/err.c b/crypto/err/err.c index 94784e9..b96e675 100644 --- a/crypto/err/err.c +++ b/crypto/err/err.c @@ -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_ENGINE,0,0) ,"engine 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_HMAC,0,0) ,"HMAC routines"}, {0,NULL}, }; diff --git a/crypto/err/err.h b/crypto/err/err.h index c34ce72..99340c8 100644 --- a/crypto/err/err.h +++ b/crypto/err/err.h @@ -196,9 +196,10 @@ typedef struct err_state_st #define ERR_LIB_ECDSA 42 #define ERR_LIB_ECDH 43 #define ERR_LIB_STORE 44 -#define ERR_LIB_TS 45 -#define ERR_LIB_HMAC 46 -#define ERR_LIB_CMS 47 +#define ERR_LIB_FIPS 45 +#define ERR_LIB_CMS 46 +#define ERR_LIB_TS 47 +#define ERR_LIB_HMAC 48 #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 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 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 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 * the pre-processor :-( */ |