diff options
| author |   djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
|---|---|---|
| committer | djm <djm@openbsd.org> | 2005-04-29 05:39:09 +0000 |
| commit | 40d8aef356a70d0b13395f0805e3044b85d91347 (patch) | |
| tree | 22edbfd34c49ce1b7988794a7a74d65829c13819 /lib/libcrypto/err/err.h | |
| parent | import of openssl-0.9.7g; tested on platforms from alpha to zaurus, ok deraadt@ (diff) | |
| download | wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.tar.xz wireguard-openbsd-40d8aef356a70d0b13395f0805e3044b85d91347.zip | |
resolve conflicts
Diffstat (limited to 'lib/libcrypto/err/err.h')
| -rw-r--r-- | lib/libcrypto/err/err.h | 3 |
1 files changed, 3 insertions, 0 deletions
diff --git a/lib/libcrypto/err/err.h b/lib/libcrypto/err/err.h index 8faa3a7b4f5..2efa18866ad 100644 --- a/lib/libcrypto/err/err.h +++ b/lib/libcrypto/err/err.h @@ -131,6 +131,7 @@ typedef struct err_state_st #define ERR_LIB_OCSP 39 #define ERR_LIB_UI 40 #define ERR_LIB_COMP 41 +#define ERR_LIB_FIPS 42 #define ERR_LIB_USER 128 @@ -159,6 +160,7 @@ typedef struct err_state_st #define OCSPerr(f,r) ERR_PUT_error(ERR_LIB_OCSP,(f),(r),__FILE__,__LINE__) #define UIerr(f,r) ERR_PUT_error(ERR_LIB_UI,(f),(r),__FILE__,__LINE__) #define COMPerr(f,r) ERR_PUT_error(ERR_LIB_COMP,(f),(r),__FILE__,__LINE__) +#define FIPSerr(f,r) ERR_PUT_error(ERR_LIB_FIPS,(f),(r),__FILE__,__LINE__) /* Borland C seems too stupid to be able to shift and do longs in * the pre-processor :-( */ @@ -183,6 +185,7 @@ typedef struct err_state_st #define SYS_F_WSASTARTUP 9 /* Winsock stuff */ #define SYS_F_OPENDIR 10 #define SYS_F_FREAD 11 +#define SYS_F_GETADDRINFO 12 /* reasons */ |