|
 |
578744b |
diff -up openssl-0.9.8m/apps/s_client.c.default-paths openssl-0.9.8m/apps/s_client.c
|
|
|
578744b |
--- openssl-0.9.8m/apps/s_client.c.default-paths 2009-12-16 21:34:19.000000000 +0100
|
|
|
578744b |
+++ openssl-0.9.8m/apps/s_client.c 2010-03-22 17:48:51.000000000 +0100
|
|
|
578744b |
@@ -741,12 +741,13 @@ bad:
|
|
|
578744b |
if (!set_cert_key_stuff(ctx,cert,key))
|
|
|
578744b |
goto end;
|
|
|
578744b |
|
|
|
578744b |
- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
|
|
|
578744b |
- (!SSL_CTX_set_default_verify_paths(ctx)))
|
|
|
578744b |
+ if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
|
|
|
578744b |
+ {
|
|
|
578744b |
+ ERR_print_errors(bio_err);
|
|
|
578744b |
+ }
|
|
|
578744b |
+ if (!SSL_CTX_set_default_verify_paths(ctx))
|
|
|
578744b |
{
|
|
|
578744b |
- /* BIO_printf(bio_err,"error setting default verify locations\n"); */
|
|
|
578744b |
ERR_print_errors(bio_err);
|
|
|
578744b |
- /* goto end; */
|
|
|
578744b |
}
|
|
|
578744b |
|
|
|
578744b |
store = SSL_CTX_get_cert_store(ctx);
|
|
|
578744b |
diff -up openssl-0.9.8m/apps/s_server.c.default-paths openssl-0.9.8m/apps/s_server.c
|
|
|
578744b |
--- openssl-0.9.8m/apps/s_server.c.default-paths 2010-01-24 14:52:38.000000000 +0100
|
|
|
578744b |
+++ openssl-0.9.8m/apps/s_server.c 2010-03-22 17:50:44.000000000 +0100
|
|
|
578744b |
@@ -1275,12 +1275,13 @@ bad:
|
|
|
d8cd5c4 |
}
|
|
|
d8cd5c4 |
#endif
|
|
|
d8cd5c4 |
|
|
|
d8cd5c4 |
- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
|
|
|
d8cd5c4 |
- (!SSL_CTX_set_default_verify_paths(ctx)))
|
|
|
d8cd5c4 |
+ if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
|
|
|
d8cd5c4 |
+ {
|
|
|
d8cd5c4 |
+ ERR_print_errors(bio_err);
|
|
|
d8cd5c4 |
+ }
|
|
|
d8cd5c4 |
+ if (!SSL_CTX_set_default_verify_paths(ctx))
|
|
|
d8cd5c4 |
{
|
|
|
d8cd5c4 |
- /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
|
|
|
d8cd5c4 |
ERR_print_errors(bio_err);
|
|
|
d8cd5c4 |
- /* goto end; */
|
|
|
d8cd5c4 |
}
|
|
|
d8cd5c4 |
store = SSL_CTX_get_cert_store(ctx);
|
|
|
d8cd5c4 |
X509_STORE_set_flags(store, vflags);
|
|
|
578744b |
@@ -1333,8 +1334,11 @@ bad:
|
|
|
578744b |
else
|
|
|
578744b |
SSL_CTX_sess_set_cache_size(ctx2,128);
|
|
|
d8cd5c4 |
|
|
|
d8cd5c4 |
- if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) ||
|
|
|
d8cd5c4 |
- (!SSL_CTX_set_default_verify_paths(ctx2)))
|
|
|
d8cd5c4 |
+ if (!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath))
|
|
|
d8cd5c4 |
+ {
|
|
|
d8cd5c4 |
+ ERR_print_errors(bio_err);
|
|
|
d8cd5c4 |
+ }
|
|
|
d8cd5c4 |
+ if (!SSL_CTX_set_default_verify_paths(ctx2))
|
|
|
d8cd5c4 |
{
|
|
|
d8cd5c4 |
ERR_print_errors(bio_err);
|
|
|
d8cd5c4 |
}
|
|
|
578744b |
diff -up openssl-0.9.8m/apps/s_time.c.default-paths openssl-0.9.8m/apps/s_time.c
|
|
|
578744b |
--- openssl-0.9.8m/apps/s_time.c.default-paths 2003-12-27 15:40:17.000000000 +0100
|
|
|
578744b |
+++ openssl-0.9.8m/apps/s_time.c 2010-03-22 17:48:51.000000000 +0100
|
|
|
d8cd5c4 |
@@ -476,12 +476,13 @@ int MAIN(int argc, char **argv)
|
|
|
d8cd5c4 |
|
|
|
d8cd5c4 |
SSL_load_error_strings();
|
|
|
d8cd5c4 |
|
|
|
d8cd5c4 |
- if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
|
|
|
d8cd5c4 |
- (!SSL_CTX_set_default_verify_paths(tm_ctx)))
|
|
|
d8cd5c4 |
+ if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath))
|
|
|
d8cd5c4 |
+ {
|
|
|
d8cd5c4 |
+ ERR_print_errors(bio_err);
|
|
|
d8cd5c4 |
+ }
|
|
|
d8cd5c4 |
+ if (!SSL_CTX_set_default_verify_paths(tm_ctx))
|
|
|
d8cd5c4 |
{
|
|
|
d8cd5c4 |
- /* BIO_printf(bio_err,"error setting default verify locations\n"); */
|
|
|
d8cd5c4 |
ERR_print_errors(bio_err);
|
|
|
d8cd5c4 |
- /* goto end; */
|
|
|
d8cd5c4 |
}
|
|
|
d8cd5c4 |
|
|
|
d8cd5c4 |
if (tm_cipher == NULL)
|