1 diff -up openssl-0.9.8g/apps/s_server.c.default-paths openssl-0.9.8g/apps/s_server.c
2 --- openssl-0.9.8g/apps/s_server.c.default-paths 2007-12-13 17:41:34.000000000 +0100
3 +++ openssl-0.9.8g/apps/s_server.c 2007-12-13 17:36:58.000000000 +0100
4 @@ -1077,12 +1077,13 @@ bad:
8 - if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
9 - (!SSL_CTX_set_default_verify_paths(ctx)))
10 + if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
12 + ERR_print_errors(bio_err);
14 + if (!SSL_CTX_set_default_verify_paths(ctx))
16 - /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
17 ERR_print_errors(bio_err);
20 store = SSL_CTX_get_cert_store(ctx);
21 X509_STORE_set_flags(store, vflags);
22 @@ -1132,8 +1133,11 @@ bad:
24 SSL_CTX_sess_set_cache_size(ctx2,128);
26 - if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) ||
27 - (!SSL_CTX_set_default_verify_paths(ctx2)))
28 + if (!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath))
30 + ERR_print_errors(bio_err);
32 + if (!SSL_CTX_set_default_verify_paths(ctx2))
34 ERR_print_errors(bio_err);
36 diff -up openssl-0.9.8g/apps/s_client.c.default-paths openssl-0.9.8g/apps/s_client.c
37 --- openssl-0.9.8g/apps/s_client.c.default-paths 2007-12-13 17:41:34.000000000 +0100
38 +++ openssl-0.9.8g/apps/s_client.c 2007-12-13 17:37:34.000000000 +0100
39 @@ -673,12 +673,13 @@ bad:
40 if (!set_cert_key_stuff(ctx,cert,key))
43 - if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
44 - (!SSL_CTX_set_default_verify_paths(ctx)))
45 + if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
47 + ERR_print_errors(bio_err);
49 + if (!SSL_CTX_set_default_verify_paths(ctx))
51 - /* BIO_printf(bio_err,"error setting default verify locations\n"); */
52 ERR_print_errors(bio_err);
56 store = SSL_CTX_get_cert_store(ctx);
57 diff -up openssl-0.9.8g/apps/s_time.c.default-paths openssl-0.9.8g/apps/s_time.c
58 --- openssl-0.9.8g/apps/s_time.c.default-paths 2003-12-27 15:40:17.000000000 +0100
59 +++ openssl-0.9.8g/apps/s_time.c 2007-12-13 17:35:27.000000000 +0100
60 @@ -476,12 +476,13 @@ int MAIN(int argc, char **argv)
62 SSL_load_error_strings();
64 - if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
65 - (!SSL_CTX_set_default_verify_paths(tm_ctx)))
66 + if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath))
68 + ERR_print_errors(bio_err);
70 + if (!SSL_CTX_set_default_verify_paths(tm_ctx))
72 - /* BIO_printf(bio_err,"error setting default verify locations\n"); */
73 ERR_print_errors(bio_err);
77 if (tm_cipher == NULL)