X-Git-Url: https://git.openssl.org/?p=openssl.git;a=blobdiff_plain;f=include%2Fopenssl%2Ferr.h;h=370763c35ff0e2105574083c6f785abd3d34c9f6;hp=e17706c253cd037ee915f54150ada9be720ba739;hb=d33b215b331116e50947ca7e75d210e1db39b78d;hpb=3e47caff4830d2a117eda15b57a5feab89b846ae diff --git a/include/openssl/err.h b/include/openssl/err.h index e17706c253..370763c35f 100644 --- a/include/openssl/err.h +++ b/include/openssl/err.h @@ -1,4 +1,3 @@ -/* crypto/err/err.h */ /* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * @@ -193,6 +192,8 @@ typedef struct err_state_st { # define ERR_LIB_TS 47 # define ERR_LIB_HMAC 48 # define ERR_LIB_JPAKE 49 +# define ERR_LIB_CT 50 +# define ERR_LIB_ASYNC 51 # define ERR_LIB_USER 128 @@ -229,6 +230,8 @@ typedef struct err_state_st { # 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 JPAKEerr(f,r) ERR_PUT_error(ERR_LIB_JPAKE,(f),(r),__FILE__,__LINE__) +# define CTerr(f,r) ERR_PUT_error(ERR_LIB_CT,(f),(r),__FILE__,__LINE__) +# define ASYNCerr(f,r) ERR_PUT_error(ERR_LIB_ASYNC,(f),(r),__FILE__,__LINE__) /* * Borland C seems too stupid to be able to shift and do longs in the @@ -254,6 +257,11 @@ 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 +# define SYS_F_GETNAMEINFO 13 +# define SYS_F_SETSOCKOPT 14 +# define SYS_F_GETSOCKOPT 15 +# define SYS_F_GETSOCKNAME 16 /* reasons */ # define ERR_R_SYS_LIB ERR_LIB_SYS/* 2 */ @@ -311,6 +319,8 @@ typedef struct ERR_string_data_st { const char *string; } ERR_STRING_DATA; +DEFINE_LHASH_OF(ERR_STRING_DATA); + void ERR_put_error(int lib, int func, int reason, const char *file, int line); void ERR_set_error_data(char *data, int flags); @@ -347,10 +357,8 @@ void ERR_load_crypto_strings(void); void ERR_free_strings(void); void ERR_remove_thread_state(const CRYPTO_THREADID *tid); -# ifdef OPENSSL_USE_DEPRECATED -DECLARE_DEPRECATED(void ERR_remove_state(unsigned long pid)); /* if zero we - * look it up */ -# endif +DEPRECATEDIN_1_0_0(void ERR_remove_state(unsigned long pid)) /* if zero we + * look it up */ ERR_STATE *ERR_get_state(void); LHASH_OF(ERR_STRING_DATA) *ERR_get_string_table(void);