projects
/
oweals
/
openssl.git
/ blobdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
|
commitdiff
|
tree
raw
|
inline
| side by side
arm_arch.h: allow to specify __ARM_ARCH__ elsewhere.
[oweals/openssl.git]
/
crypto
/
conf
/
conf_lib.c
diff --git
a/crypto/conf/conf_lib.c
b/crypto/conf/conf_lib.c
index 2a3399d269e46d25132349794879967971be6e7d..54046defca8b2db4852cc386cec2686730126582 100644
(file)
--- a/
crypto/conf/conf_lib.c
+++ b/
crypto/conf/conf_lib.c
@@
-69,7
+69,7
@@
static CONF_METHOD *default_CONF_method=NULL;
/* Init a 'CONF' structure from an old LHASH */
/* Init a 'CONF' structure from an old LHASH */
-void CONF_set_nconf(CONF *conf, LHASH *hash)
+void CONF_set_nconf(CONF *conf, LHASH
_OF(CONF_VALUE)
*hash)
{
if (default_CONF_method == NULL)
default_CONF_method = NCONF_default();
{
if (default_CONF_method == NULL)
default_CONF_method = NCONF_default();
@@
-87,9
+87,10
@@
int CONF_set_default_method(CONF_METHOD *meth)
return 1;
}
return 1;
}
-LHASH *CONF_load(LHASH *conf, const char *file, long *eline)
+LHASH_OF(CONF_VALUE) *CONF_load(LHASH_OF(CONF_VALUE) *conf, const char *file,
+ long *eline)
{
{
- LHASH *ltmp;
+ LHASH
_OF(CONF_VALUE)
*ltmp;
BIO *in=NULL;
#ifdef OPENSSL_SYS_VMS
BIO *in=NULL;
#ifdef OPENSSL_SYS_VMS
@@
-110,10
+111,11
@@
LHASH *CONF_load(LHASH *conf, const char *file, long *eline)
}
#ifndef OPENSSL_NO_FP_API
}
#ifndef OPENSSL_NO_FP_API
-LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline)
+LHASH_OF(CONF_VALUE) *CONF_load_fp(LHASH_OF(CONF_VALUE) *conf, FILE *fp,
+ long *eline)
{
BIO *btmp;
{
BIO *btmp;
- LHASH *ltmp;
+ LHASH
_OF(CONF_VALUE)
*ltmp;
if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
CONFerr(CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB);
return NULL;
if(!(btmp = BIO_new_fp(fp, BIO_NOCLOSE))) {
CONFerr(CONF_F_CONF_LOAD_FP,ERR_R_BUF_LIB);
return NULL;
@@
-124,7
+126,8
@@
LHASH *CONF_load_fp(LHASH *conf, FILE *fp,long *eline)
}
#endif
}
#endif
-LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline)
+LHASH_OF(CONF_VALUE) *CONF_load_bio(LHASH_OF(CONF_VALUE) *conf, BIO *bp,
+ long *eline)
{
CONF ctmp;
int ret;
{
CONF ctmp;
int ret;
@@
-137,7
+140,8
@@
LHASH *CONF_load_bio(LHASH *conf, BIO *bp,long *eline)
return NULL;
}
return NULL;
}
-STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,const char *section)
+STACK_OF(CONF_VALUE) *CONF_get_section(LHASH_OF(CONF_VALUE) *conf,
+ const char *section)
{
if (conf == NULL)
{
{
if (conf == NULL)
{
@@
-151,7
+155,8
@@
STACK_OF(CONF_VALUE) *CONF_get_section(LHASH *conf,const char *section)
}
}
}
}
-char *CONF_get_string(LHASH *conf,const char *group,const char *name)
+char *CONF_get_string(LHASH_OF(CONF_VALUE) *conf,const char *group,
+ const char *name)
{
if (conf == NULL)
{
{
if (conf == NULL)
{
@@
-165,7
+170,8
@@
char *CONF_get_string(LHASH *conf,const char *group,const char *name)
}
}
}
}
-long CONF_get_number(LHASH *conf,const char *group,const char *name)
+long CONF_get_number(LHASH_OF(CONF_VALUE) *conf,const char *group,
+ const char *name)
{
int status;
long result = 0;
{
int status;
long result = 0;
@@
-189,7
+195,7
@@
long CONF_get_number(LHASH *conf,const char *group,const char *name)
return result;
}
return result;
}
-void CONF_free(LHASH *conf)
+void CONF_free(LHASH
_OF(CONF_VALUE)
*conf)
{
CONF ctmp;
CONF_set_nconf(&ctmp, conf);
{
CONF ctmp;
CONF_set_nconf(&ctmp, conf);
@@
-197,7
+203,7
@@
void CONF_free(LHASH *conf)
}
#ifndef OPENSSL_NO_FP_API
}
#ifndef OPENSSL_NO_FP_API
-int CONF_dump_fp(LHASH *conf, FILE *out)
+int CONF_dump_fp(LHASH
_OF(CONF_VALUE)
*conf, FILE *out)
{
BIO *btmp;
int ret;
{
BIO *btmp;
int ret;
@@
-212,7
+218,7
@@
int CONF_dump_fp(LHASH *conf, FILE *out)
}
#endif
}
#endif
-int CONF_dump_bio(LHASH *conf, BIO *out)
+int CONF_dump_bio(LHASH
_OF(CONF_VALUE)
*conf, BIO *out)
{
CONF ctmp;
CONF_set_nconf(&ctmp, conf);
{
CONF ctmp;
CONF_set_nconf(&ctmp, conf);