Commit f87ab7a4 authored by Richard Levitte's avatar Richard Levitte
Browse files

Recent changes from 0.9.6-stable

parent 696335ab
Loading
Loading
Loading
Loading
+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
			{