Commit 0fc5cf08 authored by Ben Laurie's avatar Ben Laurie
Browse files

Make no config file not an error. Move /dev/crypto config to ctrl.

parent f78d4a35

crypto/bio/bio.h

+1 −1
Original line number Diff line number Diff line
@@ -618,7 +618,6 @@ int BIO_vsnprintf(char *buf, size_t n, const char *format, va_list args); 
 * made after this point may be overwritten when the script is next run.

 */

void ERR_load_BIO_strings(void);



/* Error codes for the BIO functions. */



/* Function codes. */
@@ -673,6 +672,7 @@ void ERR_load_BIO_strings(void); 
#define BIO_R_NO_HOSTNAME_SPECIFIED			 112

#define BIO_R_NO_PORT_DEFINED				 113

#define BIO_R_NO_PORT_SPECIFIED				 114

#define BIO_R_NO_SUCH_FILE				 128

#define BIO_R_NULL_PARAMETER				 115

#define BIO_R_TAG_MISMATCH				 116

#define BIO_R_UNABLE_TO_BIND_SOCKET			 117

crypto/bio/bio_err.c

+1 −0
Original line number Diff line number Diff line
@@ -120,6 +120,7 @@ static ERR_STRING_DATA BIO_str_reasons[]= 
{BIO_R_NO_HOSTNAME_SPECIFIED             ,"no hostname specified"},

{BIO_R_NO_PORT_DEFINED                   ,"no port defined"},

{BIO_R_NO_PORT_SPECIFIED                 ,"no port specified"},

{BIO_R_NO_SUCH_FILE                      ,"no such file"},

{BIO_R_NULL_PARAMETER                    ,"null parameter"},

{BIO_R_TAG_MISMATCH                      ,"tag mismatch"},

{BIO_R_UNABLE_TO_BIND_SOCKET             ,"unable to bind socket"},

crypto/bio/bss_file.c

+4 −1
Original line number Diff line number Diff line
@@ -103,6 +103,9 @@ BIO *BIO_new_file(const char *filename, const char *mode) 
		{

		SYSerr(SYS_F_FOPEN,get_last_sys_error());

		ERR_add_error_data(5,"fopen('",filename,"','",mode,"')");

		if(errno == ENOENT)

			BIOerr(BIO_F_BIO_NEW_FILE,BIO_R_NO_SUCH_FILE);

		else

			BIOerr(BIO_F_BIO_NEW_FILE,ERR_R_SYS_LIB);

		return(NULL);

		}

crypto/conf/conf.h

+1 −0
Original line number Diff line number Diff line
@@ -232,6 +232,7 @@ void ERR_load_CONF_strings(void); 
#define CONF_R_NO_CONF					 105

#define CONF_R_NO_CONF_OR_ENVIRONMENT_VARIABLE		 106

#define CONF_R_NO_SECTION				 107

#define CONF_R_NO_SUCH_FILE				 114

#define CONF_R_NO_VALUE					 108

#define CONF_R_UNABLE_TO_CREATE_NEW_SECTION		 103

#define CONF_R_UNKNOWN_MODULE_NAME			 113

crypto/conf/conf_def.c

+4 −1
Original line number Diff line number Diff line
@@ -192,6 +192,9 @@ static int def_load(CONF *conf, const char *name, long *line) 
#endif

	if (in == NULL)

		{

		if(ERR_GET_REASON(ERR_peek_top_error()) == BIO_R_NO_SUCH_FILE)

			CONFerr(CONF_F_CONF_LOAD,CONF_R_NO_SUCH_FILE);

		else

			CONFerr(CONF_F_CONF_LOAD,ERR_R_SYS_LIB);

		return 0;

		}