projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
PR: 923
[oweals/openssl.git]
/
crypto
/
conf
/
conf.h
diff --git
a/crypto/conf/conf.h
b/crypto/conf/conf.h
index 176d64b57912d826fc0a33258c56a66b9c9a2cd3..f4671442ab10df9e7f155b08667c3d08f1ef7911 100644
(file)
--- a/
crypto/conf/conf.h
+++ b/
crypto/conf/conf.h
@@
-128,7
+128,8
@@
void CONF_free(LHASH *conf);
int CONF_dump_fp(LHASH *conf, FILE *out);
int CONF_dump_bio(LHASH *conf, BIO *out);
int CONF_dump_fp(LHASH *conf, FILE *out);
int CONF_dump_bio(LHASH *conf, BIO *out);
-void OPENSSL_config(char *config_name);
+void OPENSSL_config(const char *config_name);
+void OPENSSL_no_config(void);
/* New conf code. The semantics are different from the functions above.
If that wasn't the case, the above functions would have been replaced */
/* New conf code. The semantics are different from the functions above.
If that wasn't the case, the above functions would have been replaced */
@@
-141,10
+142,10
@@
struct conf_st
};
CONF *NCONF_new(CONF_METHOD *meth);
};
CONF *NCONF_new(CONF_METHOD *meth);
-CONF_METHOD *NCONF_default();
-CONF_METHOD *NCONF_WIN32();
+CONF_METHOD *NCONF_default(
void
);
+CONF_METHOD *NCONF_WIN32(
void
);
#if 0 /* Just to give you an idea of what I have in mind */
#if 0 /* Just to give you an idea of what I have in mind */
-CONF_METHOD *NCONF_XML();
+CONF_METHOD *NCONF_XML(
void
);
#endif
void NCONF_free(CONF *conf);
void NCONF_free_data(CONF *conf);
#endif
void NCONF_free(CONF *conf);
void NCONF_free_data(CONF *conf);
@@
-176,6
+177,7
@@
int CONF_modules_load_file(const char *filename, const char *appname,
unsigned long flags);
void CONF_modules_unload(int all);
void CONF_modules_finish(void);
unsigned long flags);
void CONF_modules_unload(int all);
void CONF_modules_finish(void);
+void CONF_modules_free(void);
int CONF_module_add(const char *name, conf_init_func *ifunc,
conf_finish_func *ffunc);
int CONF_module_add(const char *name, conf_init_func *ifunc,
conf_finish_func *ffunc);
@@
-194,6
+196,8
@@
char *CONF_get1_default_config_file(void);
int CONF_parse_list(const char *list, int sep, int nospc,
int (*list_cb)(const char *elem, int len, void *usr), void *arg);
int CONF_parse_list(const char *list, int sep, int nospc,
int (*list_cb)(const char *elem, int len, void *usr), void *arg);
+void OPENSSL_load_builtin_modules(void);
+
/* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes
* made after this point may be overwritten when the script is next run.
/* BEGIN ERROR CODES */
/* The following lines are auto generated by the script mkerr.pl. Any changes
* made after this point may be overwritten when the script is next run.