|
 |
450916 |
diff -up openssl-1.0.2c/apps/s_server.c.default-paths openssl-1.0.2c/apps/s_server.c
|
|
|
450916 |
--- openssl-1.0.2c/apps/s_server.c.default-paths 2015-06-12 16:51:21.000000000 +0200
|
|
|
450916 |
+++ openssl-1.0.2c/apps/s_server.c 2015-06-15 17:24:17.747446515 +0200
|
|
|
450916 |
@@ -1788,12 +1788,16 @@ int MAIN(int argc, char *argv[])
|
|
|
450916 |
}
|
|
|
450916 |
#endif
|
|
|
450916 |
|
|
|
450916 |
- if ((!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) ||
|
|
|
450916 |
- (!SSL_CTX_set_default_verify_paths(ctx))) {
|
|
|
450916 |
- /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
|
|
|
450916 |
- ERR_print_errors(bio_err);
|
|
|
450916 |
- /* goto end; */
|
|
|
450916 |
+ if (CAfile == NULL && CApath == NULL) {
|
|
|
450916 |
+ if (!SSL_CTX_set_default_verify_paths(ctx)) {
|
|
|
450916 |
+ ERR_print_errors(bio_err);
|
|
|
450916 |
+ }
|
|
|
450916 |
+ } else {
|
|
|
450916 |
+ if (!SSL_CTX_load_verify_locations(ctx, CAfile, CApath)) {
|
|
|
450916 |
+ ERR_print_errors(bio_err);
|
|
|
450916 |
+ }
|
|
|
450916 |
}
|
|
|
450916 |
+
|
|
|
450916 |
if (vpm)
|
|
|
450916 |
SSL_CTX_set1_param(ctx, vpm);
|
|
|
450916 |
|
|
|
450916 |
@@ -1850,8 +1854,10 @@ int MAIN(int argc, char *argv[])
|
|
|
450916 |
else
|
|
|
450916 |
SSL_CTX_sess_set_cache_size(ctx2, 128);
|
|
|
450916 |
|
|
|
450916 |
- if ((!SSL_CTX_load_verify_locations(ctx2, CAfile, CApath)) ||
|
|
|
450916 |
- (!SSL_CTX_set_default_verify_paths(ctx2))) {
|
|
|
450916 |
+ if (!SSL_CTX_load_verify_locations(ctx2, CAfile, CApath)) {
|
|
|
450916 |
+ ERR_print_errors(bio_err);
|
|
|
450916 |
+ }
|
|
|
450916 |
+ if (!SSL_CTX_set_default_verify_paths(ctx2)) {
|
|
|
450916 |
ERR_print_errors(bio_err);
|
|
|
450916 |
}
|
|
|
450916 |
if (vpm)
|
|
|
450916 |
diff -up openssl-1.0.2c/apps/s_time.c.default-paths openssl-1.0.2c/apps/s_time.c
|
|
|
450916 |
--- openssl-1.0.2c/apps/s_time.c.default-paths 2015-06-12 16:51:21.000000000 +0200
|
|
|
450916 |
+++ openssl-1.0.2c/apps/s_time.c 2015-06-15 17:24:17.747446515 +0200
|
|
|
450916 |
@@ -381,13 +381,14 @@ int MAIN(int argc, char **argv)
|
|
|
450916 |
|
|
|
450916 |
SSL_load_error_strings();
|
|
|
450916 |
|
|
|
450916 |
- if ((!SSL_CTX_load_verify_locations(tm_ctx, CAfile, CApath)) ||
|
|
|
450916 |
- (!SSL_CTX_set_default_verify_paths(tm_ctx))) {
|
|
|
450916 |
- /*
|
|
|
450916 |
- * BIO_printf(bio_err,"error setting default verify locations\n");
|
|
|
450916 |
- */
|
|
|
450916 |
- ERR_print_errors(bio_err);
|
|
|
450916 |
- /* goto end; */
|
|
|
450916 |
+ if (CAfile == NULL && CApath == NULL) {
|
|
|
450916 |
+ if (!SSL_CTX_set_default_verify_paths(tm_ctx)) {
|
|
|
450916 |
+ ERR_print_errors(bio_err);
|
|
|
450916 |
+ }
|
|
|
450916 |
+ } else {
|
|
|
450916 |
+ if (!SSL_CTX_load_verify_locations(tm_ctx, CAfile, CApath)) {
|
|
|
450916 |
+ ERR_print_errors(bio_err);
|
|
|
450916 |
+ }
|
|
|
450916 |
}
|
|
|
450916 |
|
|
|
450916 |
if (tm_cipher == NULL)
|