Constification, missing declaration, update dependencies.

diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl
index 6028106a548cd07c7e6e2226ec8b0b83afe340cc..5d155653f400ab6834189eb58fdfaf408271a650 100644 (file)
--- a/crypto/conf/Makefile.ssl
+++ b/crypto/conf/Makefile.ssl
@@ -109,3 +109,33 @@ conf_lib.o: ../../include/openssl/lhash.h ../../include/openssl/opensslconf.h
 conf_lib.o: ../../include/openssl/opensslv.h ../../include/openssl/safestack.h
 conf_lib.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
 conf_lib.o: conf_lib.c
+conf_mall.o: ../../e_os.h ../../include/openssl/asn1.h
+conf_mall.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+conf_mall.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+conf_mall.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+conf_mall.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
+conf_mall.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+conf_mall.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+conf_mall.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+conf_mall.o: ../../include/openssl/opensslconf.h
+conf_mall.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+conf_mall.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+conf_mall.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+conf_mall.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+conf_mall.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+conf_mall.o: ../cryptlib.h conf_mall.c
+conf_mod.o: ../../e_os.h ../../include/openssl/asn1.h
+conf_mod.o: ../../include/openssl/bio.h ../../include/openssl/bn.h
+conf_mod.o: ../../include/openssl/buffer.h ../../include/openssl/conf.h
+conf_mod.o: ../../include/openssl/crypto.h ../../include/openssl/dh.h
+conf_mod.o: ../../include/openssl/dsa.h ../../include/openssl/dso.h
+conf_mod.o: ../../include/openssl/e_os2.h ../../include/openssl/err.h
+conf_mod.o: ../../include/openssl/evp.h ../../include/openssl/lhash.h
+conf_mod.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h
+conf_mod.o: ../../include/openssl/opensslconf.h
+conf_mod.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h
+conf_mod.o: ../../include/openssl/pkcs7.h ../../include/openssl/rsa.h
+conf_mod.o: ../../include/openssl/safestack.h ../../include/openssl/sha.h
+conf_mod.o: ../../include/openssl/stack.h ../../include/openssl/symhacks.h
+conf_mod.o: ../../include/openssl/x509.h ../../include/openssl/x509_vfy.h
+conf_mod.o: ../cryptlib.h conf_mod.c

diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h
index 02db41823b7e67dcf83c4495be6d53fee858abc3..41816d92f61114f7129b19504368fff4e7948596 100644 (file)
--- a/crypto/conf/conf.h
+++ b/crypto/conf/conf.h
@@ -127,6 +127,8 @@ void CONF_free(LHASH *conf);
 int CONF_dump_fp(LHASH *conf, FILE *out);
 int CONF_dump_bio(LHASH *conf, BIO *out);
 
+void OPENSSL_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 */
 
@@ -170,7 +172,8 @@ int CONF_modules_load(CONF *cnf, char *appname, unsigned long flags);
 int CONF_modules_load_file(char *filename, char *appname, unsigned long flags);
 void CONF_modules_unload(int all);
 void CONF_modules_finish(void);
-int CONF_module_add(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);
 
 char *CONF_imodule_get_name(CONF_IMODULE *md);
 char *CONF_imodule_get_value(CONF_IMODULE *md);

diff --git a/crypto/conf/conf_mod.c b/crypto/conf/conf_mod.c
index 3a1888a0040833644719ddf29bccfe712831f644..27c11c1a764b68cf5b296c37df92e09126700ed7 100644 (file)
--- a/crypto/conf/conf_mod.c
+++ b/crypto/conf/conf_mod.c
@@ -109,7 +109,7 @@ static STACK_OF(CONF_IMODULE) *initialized_modules = NULL;
 static void module_free(CONF_MODULE *md);
 static void module_finish(CONF_IMODULE *imod);
 static int module_run(CONF *cnf, char *name, char *value, unsigned long flags);
-static CONF_MODULE *module_add(DSO *dso, char *name,
+static CONF_MODULE *module_add(DSO *dso, const char *name,
                        conf_init_func *ifunc, conf_finish_func *ffunc);
 static CONF_MODULE *module_find(char *name);
 static int module_init(CONF_MODULE *pmod, char *name, char *value, CONF *cnf);
@@ -262,7 +262,7 @@ static CONF_MODULE *module_load_dso(CONF *cnf, char *name, char *value, unsigned
        }
 
 /* add module to list */
-static CONF_MODULE *module_add(DSO *dso, char *name,
+static CONF_MODULE *module_add(DSO *dso, const char *name,
                        conf_init_func *ifunc, conf_finish_func *ffunc)
        {
        CONF_MODULE *tmod = NULL;
@@ -445,7 +445,8 @@ static void module_finish(CONF_IMODULE *imod)
 
 /* Add a static module to OpenSSL */
 
-int CONF_module_add(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)
        {
        if (module_add(NULL, name, ifunc, ffunc))
                return 1;