1 files changed, 29 insertions, 53 deletions

diff --git a/src/lib/libcrypto/err/err.h b/src/lib/libcrypto/err/err.h
index 75f931be11..9411fb3568 100644
--- a/src/lib/libcrypto/err/err.h
+++ b/src/lib/libcrypto/err/err.h
@@ -63,6 +63,10 @@
 extern "C" {
 #endif
 
+#ifndef NO_FP_API
+#include <stdio.h>
+#endif
+
 /* The following is a bit of a trick to help the object files only contain
  * the 'name of the file' string once.  Since 'err.h' is protected by the
  * HEADER_ERR_H stuff, this should be included only once per file. */
@@ -87,7 +91,7 @@ typedef struct err_state_st
         unsigned long err_buffer[ERR_NUM_ERRORS];
         char *err_data[ERR_NUM_ERRORS];
         int err_data_flags[ERR_NUM_ERRORS];
-        char *err_file[ERR_NUM_ERRORS];
+        const char *err_file[ERR_NUM_ERRORS];
         int err_line[ERR_NUM_ERRORS];
         int top,bottom;
         } ERR_STATE;
@@ -116,6 +120,8 @@ typedef struct err_state_st
 #define ERR_LIB_PROXY           31
 #define ERR_LIB_BIO             32
 #define ERR_LIB_PKCS7           33
+#define ERR_LIB_X509V3          34
+#define ERR_LIB_PKCS12          35
 
 #define ERR_LIB_USER            128
 
@@ -141,6 +147,8 @@ typedef struct err_state_st
 #define RSAREFerr(f,r) ERR_PUT_error(ERR_LIB_RSAREF,(f),(r),ERR_file_name,__LINE__)
 #define PROXYerr(f,r) ERR_PUT_error(ERR_LIB_PROXY,(f),(r),ERR_file_name,__LINE__)
 #define PKCS7err(f,r) ERR_PUT_error(ERR_LIB_PKCS7,(f),(r),ERR_file_name,__LINE__)
+#define X509V3err(f,r) ERR_PUT_error(ERR_LIB_X509V3,(f),(r),ERR_file_name,__LINE__)
+#define PKCS12err(f,r) ERR_PUT_error(ERR_LIB_PKCS12,(f),(r),ERR_file_name,__LINE__)
 
 /* Borland C seems too stupid to be able to shift and do longs in
  * the pre-processor :-( */
@@ -162,6 +170,7 @@ typedef struct err_state_st
 #define SYS_F_LISTEN            7
 #define SYS_F_ACCEPT            8
 #define SYS_F_WSASTARTUP        9 /* Winsock stuff */
+#define SYS_F_OPENDIR           10
 
 #define ERR_R_FATAL             32      
 /* reasons */
@@ -187,41 +196,47 @@ typedef struct err_state_st
 #define ERR_R_PROXY_LIB ERR_LIB_PROXY
 #define ERR_R_BIO_LIB   ERR_LIB_BIO
 #define ERR_R_PKCS7_LIB ERR_LIB_PKCS7
+#define ERR_R_PKCS12_LIB ERR_LIB_PKCS12
 
 /* fatal error */
 #define ERR_R_MALLOC_FAILURE                    (1|ERR_R_FATAL)
 #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_NESTED_ASN1_ERROR                 (4)
+#define ERR_R_BAD_ASN1_OBJECT_HEADER            (5)
+#define ERR_R_BAD_GET_ASN1_OBJECT_CALL          (6)
+#define ERR_R_EXPECTING_AN_ASN1_SEQUENCE        (7)
+#define ERR_R_ASN1_LENGTH_MISMATCH              (8)
+#define ERR_R_MISSING_ASN1_EOS                  (9)
 
 typedef struct ERR_string_data_st
         {
         unsigned long error;
-        char *string;
+        const char *string;
         } ERR_STRING_DATA;
 
-#ifndef NOPROTO
-void ERR_put_error(int lib, int func,int reason,char *file,int line);
+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_line(char **file,int *line);
-unsigned long ERR_get_error_line_data(char **file,int *line,
-                char **data, int *flags);
+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_line(char **file,int *line);
-unsigned long ERR_peek_error_line_data(char **file,int *line,
-                char **data,int *flags);
+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);
 void ERR_clear_error(void );
 char *ERR_error_string(unsigned long e,char *buf);
-char *ERR_lib_error_string(unsigned long e);
-char *ERR_func_error_string(unsigned long e);
-char *ERR_reason_error_string(unsigned long e);
+const char *ERR_lib_error_string(unsigned long e);
+const char *ERR_func_error_string(unsigned long e);
+const char *ERR_reason_error_string(unsigned long e);
 #ifndef NO_FP_API
 void ERR_print_errors_fp(FILE *fp);
 #endif
 #ifdef HEADER_BIO_H
 void ERR_print_errors(BIO *bp);
-void ERR_add_error_data( VAR_PLIST( int, num ) );
+void ERR_add_error_data(int num, ...);
 #endif
 void ERR_load_strings(int lib,ERR_STRING_DATA str[]);
 void ERR_load_ERR_strings(void );
@@ -241,45 +256,6 @@ char *ERR_get_err_state_table(void );
 
 int ERR_get_next_error_library(void );
 
-#else
-
-void ERR_put_error();
-void ERR_set_error_data();
-
-unsigned long ERR_get_error();
-unsigned long ERR_get_error_line();
-unsigned long ERR_peek_error();
-unsigned long ERR_peek_error_line();
-void ERR_clear_error();
-char *ERR_error_string();
-char *ERR_lib_error_string();
-char *ERR_func_error_string();
-char *ERR_reason_error_string();
-#ifndef NO_FP_API
-void ERR_print_errors_fp();
-#endif
-void ERR_print_errors();
-void ERR_add_error_data();
-void ERR_load_strings();
-void ERR_load_ERR_strings();
-void ERR_load_crypto_strings();
-void ERR_free_strings();
-
-void ERR_remove_state();
-ERR_STATE *ERR_get_state();
-
-#ifdef HEADER_LHASH_H
-LHASH *ERR_get_string_table();
-LHASH *ERR_get_err_state_table();
-#else
-char *ERR_get_string_table();
-char *ERR_get_err_state_table();
-#endif
-
-int ERR_get_next_error_library();
-
-#endif
-
 #ifdef  __cplusplus
 }
 #endif