Add functionality to set marks on the error stack and to pop all errors to the next...

[openssl.git] / crypto / err / err.h

diff --git a/crypto/err/err.h b/crypto/err/err.h
index c3b54983ba2d69394e30e096adaa083f2f9ea8a9..1228acfe5ce080a7b2b971d27a333017570fea9c 100644 (file)
--- a/crypto/err/err.h
+++ b/crypto/err/err.h
@@ -59,6 +59,8 @@
 #ifndef HEADER_ERR_H
 #define HEADER_ERR_H
 
+#include <openssl/e_os2.h>
+
 #ifndef OPENSSL_NO_FP_API
 #include <stdio.h>
 #include <stdlib.h>
@@ -86,10 +88,13 @@ extern "C" {
 #define ERR_TXT_MALLOCED       0x01
 #define ERR_TXT_STRING         0x02
 
+#define ERR_FLAG_MARK          0x01
+
 #define ERR_NUM_ERRORS 16
 typedef struct err_state_st
        {
        unsigned long pid;
+       int err_flags[ERR_NUM_ERRORS];
        unsigned long err_buffer[ERR_NUM_ERRORS];
        char *err_data[ERR_NUM_ERRORS];
        int err_data_flags[ERR_NUM_ERRORS];
@@ -130,6 +135,10 @@ typedef struct err_state_st
 #define ERR_LIB_ENGINE         38
 #define ERR_LIB_OCSP            39
 #define ERR_LIB_UI              40
+#define ERR_LIB_COMP            41
+#define ERR_LIB_ECDSA          42
+#define ERR_LIB_ECDH           43
+#define ERR_LIB_STORE           44
 
 #define ERR_LIB_USER           128
 
@@ -157,6 +166,10 @@ typedef struct err_state_st
 #define ENGINEerr(f,r) ERR_PUT_error(ERR_LIB_ENGINE,(f),(r),__FILE__,__LINE__)
 #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 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__)
 
 /* Borland C seems too stupid to be able to shift and do longs in
  * the pre-processor :-( */
@@ -180,6 +193,7 @@ typedef struct err_state_st
 #define SYS_F_ACCEPT           8
 #define SYS_F_WSASTARTUP       9 /* Winsock stuff */
 #define SYS_F_OPENDIR          10
+#define SYS_F_FREAD            11
 
 
 /* reasons */
@@ -207,6 +221,10 @@ typedef struct err_state_st
 #define ERR_R_ENGINE_LIB ERR_LIB_ENGINE  /* 38 */
 #define ERR_R_OCSP_LIB  ERR_LIB_OCSP     /* 39 */
 #define ERR_R_UI_LIB    ERR_LIB_UI       /* 40 */
+#define ERR_R_COMP_LIB ERR_LIB_COMP     /* 41 */
+#define ERR_R_ECDSA_LIB ERR_LIB_ECDSA   /* 42 */
+#define ERR_R_ECDH_LIB  ERR_LIB_ECDH    /* 43 */
+#define ERR_R_STORE_LIB ERR_LIB_STORE    /* 44 */
 
 #define ERR_R_NESTED_ASN1_ERROR                        58
 #define ERR_R_BAD_ASN1_OBJECT_HEADER           59
@@ -221,6 +239,7 @@ typedef struct err_state_st
 #define        ERR_R_SHOULD_NOT_HAVE_BEEN_CALLED       (2|ERR_R_FATAL)
 #define        ERR_R_PASSED_NULL_PARAMETER             (3|ERR_R_FATAL)
 #define        ERR_R_INTERNAL_ERROR                    (4|ERR_R_FATAL)
+#define        ERR_R_DISABLED                          (5|ERR_R_FATAL)
 
 /* 99 is the maximum possible ERR_R_... code, higher values
  * are reserved for the individual libraries */
@@ -235,14 +254,18 @@ typedef struct ERR_string_data_st
 void ERR_put_error(int lib, int func,int reason,const char *file,int line);
 void ERR_set_error_data(char *data,int flags);
 
-unsigned long ERR_get_error(void );
+unsigned long ERR_get_error(void);
 unsigned long ERR_get_error_line(const char **file,int *line);
 unsigned long ERR_get_error_line_data(const char **file,int *line,
                                      const char **data, int *flags);
-unsigned long ERR_peek_error(void );
+unsigned long ERR_peek_error(void);
 unsigned long ERR_peek_error_line(const char **file,int *line);
 unsigned long ERR_peek_error_line_data(const char **file,int *line,
                                       const char **data,int *flags);
+unsigned long ERR_peek_last_error(void);
+unsigned long ERR_peek_last_error_line(const char **file,int *line);
+unsigned long ERR_peek_last_error_line_data(const char **file,int *line,
+                                      const char **data,int *flags);
 void ERR_clear_error(void );
 char *ERR_error_string(unsigned long e,char *buf);
 void ERR_error_string_n(unsigned long e, char *buf, size_t len);
@@ -269,12 +292,14 @@ ERR_STATE *ERR_get_state(void);
 
 #ifndef OPENSSL_NO_LHASH
 LHASH *ERR_get_string_table(void);
-LHASH *ERR_get_err_state_table(void); /* even less thread-safe than
-                                      * ERR_get_string_table :-) */
+LHASH *ERR_get_err_state_table(void);
 #endif
 
 int ERR_get_next_error_library(void);
 
+int ERR_set_mark(void);
+int ERR_pop_to_mark(void);
+
 /* This opaque type encapsulates the low-level error-state functions */
 typedef struct st_ERR_FNS ERR_FNS;
 /* An application can use this function and provide the return value to loaded