Add support for passing the libctx to the config loader

[openssl.git] / crypto / conf / conf_lib.c

diff --git a/crypto/conf/conf_lib.c b/crypto/conf/conf_lib.c
index 833b7a6551ad7ceedc785e876629703591c7ea38..c06718d249cdc5452000f4064e2568f3dc67cd64 100644 (file)
--- a/crypto/conf/conf_lib.c
+++ b/crypto/conf/conf_lib.c
@@ -174,7 +174,7 @@ int CONF_dump_bio(LHASH_OF(CONF_VALUE) *conf, BIO *out)
  * the "CONF classic" functions, for consistency.
  */
 
  * the "CONF classic" functions, for consistency.
  */
 

-CONF *NCONF_new(CONF_METHOD *meth)
+CONF *NCONF_new_with_libctx(OPENSSL_CTX *libctx, CONF_METHOD *meth)

 {
     CONF *ret;
 
 {
     CONF *ret;
 


@@ -183,13 +183,19 @@ CONF *NCONF_new(CONF_METHOD *meth)
 
     ret = meth->create(meth);
     if (ret == NULL) {
 
     ret = meth->create(meth);
     if (ret == NULL) {

-        CONFerr(CONF_F_NCONF_NEW, ERR_R_MALLOC_FAILURE);
+        CONFerr(0, ERR_R_MALLOC_FAILURE);

         return NULL;
     }
         return NULL;
     }

+    ret->libctx = libctx;

 
     return ret;
 }
 
 
     return ret;
 }
 

+CONF *NCONF_new(CONF_METHOD *meth)
+{
+    return NCONF_new_with_libctx(NULL, meth);
+}
+

 void NCONF_free(CONF *conf)
 {
     if (conf == NULL)
 void NCONF_free(CONF *conf)
 {
     if (conf == NULL)