openssl1.1/openssl-1.0.1m-x509.patch
2015-04-05 23:12:44 +10:00

28 lines
953 B
Diff

diff -urN openssl-1.0.1m/crypto/x509/by_file.c openssl-1.0.1m-patched/crypto/x509/by_file.c
--- openssl-1.0.1m/crypto/x509/by_file.c 2015-03-19 23:19:00.000000000 +1000
+++ openssl-1.0.1m-patched/crypto/x509/by_file.c 2015-04-05 22:34:38.821116342 +1000
@@ -152,9 +152,12 @@
}
}
i = X509_STORE_add_cert(ctx->store_ctx, x);
- if (!i)
- goto err;
- count++;
+ /* ignore any problems with current certificate and
+ * continue with the next one */
+ if(i)
+ count++;
+ else
+ ERR_clear_error();
X509_free(x);
x = NULL;
}
@@ -167,7 +170,7 @@
}
i = X509_STORE_add_cert(ctx->store_ctx, x);
if (!i)
- goto err;
+ ERR_clear_error();
ret = i;
} else {
X509err(X509_F_X509_LOAD_CERT_FILE, X509_R_BAD_X509_FILETYPE);