Fix a couple of outstanding issues: update STATUS file, fix NO_FP_API problems.

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

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 58fa191f9a7ffc5e2304f07bb408cfce50207a2d..21831a92a35d1009f6880f7ef194d982f41917ba 100644 (file)
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -63,8 +63,10 @@
 extern "C" {
 #endif
 
-#include <openssl/stack.h>
+#include <openssl/bio.h>
 #include <openssl/lhash.h>
+#include <openssl/stack.h>
+#include <openssl/safestack.h>
 
 typedef struct
        {
@@ -73,25 +75,19 @@ typedef struct
        char *value;
        } CONF_VALUE;
 
-#ifndef NOPROTO
+DECLARE_STACK_OF(CONF_VALUE)
 
-LHASH *CONF_load(LHASH *conf,char *file,long *eline);
-STACK *CONF_get_section(LHASH *conf,char *section);
+LHASH *CONF_load(LHASH *conf,const char *file,long *eline);
+#ifndef NO_FP_API
+LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline);
+#endif
+LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline);
+STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,char *section);
 char *CONF_get_string(LHASH *conf,char *group,char *name);
 long CONF_get_number(LHASH *conf,char *group,char *name);
 void CONF_free(LHASH *conf);
 void ERR_load_CONF_strings(void );
 
-#else
-
-LHASH *CONF_load();
-STACK *CONF_get_section();
-char *CONF_get_string();
-long CONF_get_number();
-void CONF_free();
-void ERR_load_CONF_strings();
-
-#endif
 
 /* BEGIN ERROR CODES */
 /* The following lines are auto generated by the script mkerr.pl. Any changes
@@ -102,6 +98,8 @@ void ERR_load_CONF_strings();
 
 /* Function codes. */
 #define CONF_F_CONF_LOAD                                100
+#define CONF_F_CONF_LOAD_BIO                            102
+#define CONF_F_CONF_LOAD_FP                             103
 #define CONF_F_STR_COPY                                         101
 
 /* Reason codes. */