PR: 2253

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

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index f4671442ab10df9e7f155b08667c3d08f1ef7911..8aa06bc5ecbdfcc635ccde118422297f52468847 100644 (file)
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -65,6 +65,8 @@
 #include <openssl/safestack.h>
 #include <openssl/e_os2.h>
 
+#include <openssl/ossl_typ.h>
+
 #ifdef  __cplusplus
 extern "C" {
 #endif
@@ -81,7 +83,6 @@ DECLARE_STACK_OF(CONF_MODULE)
 DECLARE_STACK_OF(CONF_IMODULE)
 
 struct conf_st;
-typedef struct conf_st CONF;
 struct conf_method_st;
 typedef struct conf_method_st CONF_METHOD;
 
@@ -113,6 +114,7 @@ typedef void conf_finish_func(CONF_IMODULE *md);
 #define CONF_MFLAGS_SILENT             0x4
 #define CONF_MFLAGS_NO_DSO             0x8
 #define CONF_MFLAGS_IGNORE_MISSING_FILE        0x10
+#define CONF_MFLAGS_DEFAULT_SECTION    0x20
 
 int CONF_set_default_method(CONF_METHOD *meth);
 void CONF_set_nconf(CONF *conf,LHASH *hash);
@@ -212,6 +214,8 @@ void ERR_load_CONF_strings(void);
 #define CONF_F_CONF_LOAD_BIO                            102
 #define CONF_F_CONF_LOAD_FP                             103
 #define CONF_F_CONF_MODULES_LOAD                        116
+#define CONF_F_DEF_LOAD                                         120
+#define CONF_F_DEF_LOAD_BIO                             121
 #define CONF_F_MODULE_INIT                              115
 #define CONF_F_MODULE_LOAD_DSO                          117
 #define CONF_F_MODULE_RUN                               118