diff options
Diffstat (limited to 'crypto/conf')
-rw-r--r-- | crypto/conf/Makefile.ssl | 2 | ||||
-rw-r--r-- | crypto/conf/cnf_save.c | 2 | ||||
-rw-r--r-- | crypto/conf/conf.c | 12 | ||||
-rw-r--r-- | crypto/conf/conf.h | 2 | ||||
-rw-r--r-- | crypto/conf/conf_err.c | 10 | ||||
-rw-r--r-- | crypto/conf/conf_lcl.h | 2 | ||||
-rw-r--r-- | crypto/conf/test.c | 2 |
7 files changed, 20 insertions, 12 deletions
diff --git a/crypto/conf/Makefile.ssl b/crypto/conf/Makefile.ssl index 878ac70b14..00e917aa44 100644 --- a/crypto/conf/Makefile.ssl +++ b/crypto/conf/Makefile.ssl @@ -80,6 +80,6 @@ clean: errors: perl $(TOP)/util/err-ins.pl $(ERR).err $(ERR).h - perl ../err/err_genc.pl $(ERR).h $(ERRC).c + perl ../err/err_genc.pl -s $(ERR).h $(ERRC).c # DO NOT DELETE THIS LINE -- make depend depends on it. diff --git a/crypto/conf/cnf_save.c b/crypto/conf/cnf_save.c index 8524802e18..c9018de10e 100644 --- a/crypto/conf/cnf_save.c +++ b/crypto/conf/cnf_save.c @@ -1,5 +1,5 @@ /* crypto/conf/cnf_save.c */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written diff --git a/crypto/conf/conf.c b/crypto/conf/conf.c index 68243e9f01..9e84300c5e 100644 --- a/crypto/conf/conf.c +++ b/crypto/conf/conf.c @@ -1,5 +1,5 @@ /* crypto/conf/conf.c */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written @@ -95,7 +95,7 @@ static CONF_VALUE *get_section(); #define scan_esc(p) ((*(++p) == '\0')?(p):(++p)) -char *CONF_version="CONF part of SSLeay 0.8.1b 29-Jun-1998"; +char *CONF_version="CONF part of SSLeay 0.9.0b 29-Jun-1998"; LHASH *CONF_load(h,file,line) LHASH *h; @@ -124,7 +124,9 @@ long *line; in=fopen(file,"rb"); if (in == NULL) { - SYSerr(SYS_F_FOPEN,errno); + SYSerr(SYS_F_FOPEN,get_last_sys_error()); + ERR_set_error_data(BUF_strdup(file), + ERR_TXT_MALLOCED|ERR_TXT_STRING); CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB); goto err; } @@ -706,13 +708,13 @@ char *section; v->value=(char *)sk; vv=(CONF_VALUE *)lh_insert(conf,(char *)v); -#ifndef WIN16 if (vv != NULL) { +#if !defined(NO_STDIO) && !defined(WIN16) fprintf(stderr,"internal fault\n"); +#endif abort(); } -#endif ok=1; err: if (!ok) diff --git a/crypto/conf/conf.h b/crypto/conf/conf.h index a23ec95427..1446226a16 100644 --- a/crypto/conf/conf.h +++ b/crypto/conf/conf.h @@ -1,5 +1,5 @@ /* crypto/conf/conf.h */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written diff --git a/crypto/conf/conf_err.c b/crypto/conf/conf_err.c index b88c5b760b..a8db8f266f 100644 --- a/crypto/conf/conf_err.c +++ b/crypto/conf/conf_err.c @@ -60,6 +60,7 @@ #include "conf.h" /* BEGIN ERROR CODES */ +#ifndef NO_ERR static ERR_STRING_DATA CONF_str_functs[]= { {ERR_PACK(0,CONF_F_CONF_LOAD,0), "CONF_load"}, @@ -77,14 +78,19 @@ static ERR_STRING_DATA CONF_str_reasons[]= {0,NULL}, }; +#endif + void ERR_load_CONF_strings() { static int init=1; - if (init) - { + if (init); + {; init=0; +#ifndef NO_ERR ERR_load_strings(ERR_LIB_CONF,CONF_str_functs); ERR_load_strings(ERR_LIB_CONF,CONF_str_reasons); +#endif + } } diff --git a/crypto/conf/conf_lcl.h b/crypto/conf/conf_lcl.h index 8ae7ce0735..4e5644ed79 100644 --- a/crypto/conf/conf_lcl.h +++ b/crypto/conf/conf_lcl.h @@ -1,5 +1,5 @@ /* crypto/conf/conf_lcl.h */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written diff --git a/crypto/conf/test.c b/crypto/conf/test.c index 17185926ac..899ee2a067 100644 --- a/crypto/conf/test.c +++ b/crypto/conf/test.c @@ -1,5 +1,5 @@ /* crypto/conf/test.c */ -/* Copyright (C) 1995-1997 Eric Young (eay@cryptsoft.com) +/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com) * All rights reserved. * * This package is an SSL implementation written |