The branch OpenSSL_1_1_0-stable has been updated
via 1a7d768dc33ad6073f60934fa5b64fa01d9a0a71 (commit)
from 39184b24ebf99e4b237725255e679cd3a3d7a7d3 (commit)
- Log -----------------------------------------------------------------
commit 1a7d768dc33ad6073f60934fa5b64fa01d9a0a71
Author: Bernd Edlinger <[email protected]>
Date: Mon Aug 7 18:02:53 2017 +0200
Avoid surpising password dialog in X509 file lookup.
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4111)
(cherry picked from commit db854bb14a7010712cfc02861731399b1b587474)
-----------------------------------------------------------------------
Summary of changes:
crypto/x509/by_file.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/x509/by_file.c b/crypto/x509/by_file.c
index 8aa2d8e..0bcc6af 100644
--- a/crypto/x509/by_file.c
+++ b/crypto/x509/by_file.c
@@ -90,7 +90,7 @@ int X509_load_cert_file(X509_LOOKUP *ctx, const char *file,
int type)
if (type == X509_FILETYPE_PEM) {
for (;;) {
- x = PEM_read_bio_X509_AUX(in, NULL, NULL, NULL);
+ x = PEM_read_bio_X509_AUX(in, NULL, NULL, "");
if (x == NULL) {
if ((ERR_GET_REASON(ERR_peek_last_error()) ==
PEM_R_NO_START_LINE) && (count > 0)) {
@@ -147,7 +147,7 @@ int X509_load_crl_file(X509_LOOKUP *ctx, const char *file,
int type)
if (type == X509_FILETYPE_PEM) {
for (;;) {
- x = PEM_read_bio_X509_CRL(in, NULL, NULL, NULL);
+ x = PEM_read_bio_X509_CRL(in, NULL, NULL, "");
if (x == NULL) {
if ((ERR_GET_REASON(ERR_peek_last_error()) ==
PEM_R_NO_START_LINE) && (count > 0)) {
@@ -199,7 +199,7 @@ int X509_load_cert_crl_file(X509_LOOKUP *ctx, const char
*file, int type)
X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_SYS_LIB);
return 0;
}
- inf = PEM_X509_INFO_read_bio(in, NULL, NULL, NULL);
+ inf = PEM_X509_INFO_read_bio(in, NULL, NULL, "");
BIO_free(in);
if (!inf) {
X509err(X509_F_X509_LOAD_CERT_CRL_FILE, ERR_R_PEM_LIB);
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
