Commit 2589b74f authored by Richard Levitte's avatar Richard Levitte
Browse files

Make sure using SSL_CERT_FILE actually works, and has priority over system defaults. 

PR: 376
parent d9090acd

crypto/x509/by_file.c

+9 −8
Original line number Diff line number Diff line
@@ -100,18 +100,19 @@ static int by_file_ctrl(X509_LOOKUP *ctx, int cmd, const char *argp, long argl, 
	case X509_L_FILE_LOAD:

		if (argl == X509_FILETYPE_DEFAULT)

			{

			file = (char *)Getenv(X509_get_default_cert_file_env());

			if (file)

				ok = (X509_load_cert_crl_file(ctx,file,

					      X509_FILETYPE_PEM) != 0);



			if (!ok)

				ok = (X509_load_cert_crl_file(ctx,X509_get_default_cert_file(),

					      X509_FILETYPE_PEM) != 0);



			if (!ok)

				{

				X509err(X509_F_BY_FILE_CTRL,X509_R_LOADING_DEFAULTS);

				}

			else

				{

				file=(char *)Getenv(X509_get_default_cert_file_env());

				ok = (X509_load_cert_crl_file(ctx,file,

					X509_FILETYPE_PEM) != 0);

				}

			}

		else

			{