|
 |
c4366c |
diff -up openssl-fips-0.9.8e/apps/s_client.c.default-paths openssl-fips-0.9.8e/apps/s_client.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/apps/s_client.c.default-paths 2008-09-06 12:17:46.000000000 +0200
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/apps/s_client.c 2008-09-06 12:17:46.000000000 +0200
|
|
|
c4366c |
@@ -610,12 +610,13 @@ bad:
|
|
|
c4366c |
if (!set_cert_key_stuff(ctx,cert,key))
|
|
|
c4366c |
goto end;
|
|
|
c4366c |
|
|
|
c4366c |
- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
|
|
|
c4366c |
- (!SSL_CTX_set_default_verify_paths(ctx)))
|
|
|
c4366c |
+ if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
|
|
|
c4366c |
+ {
|
|
|
c4366c |
+ ERR_print_errors(bio_err);
|
|
|
c4366c |
+ }
|
|
|
c4366c |
+ if (!SSL_CTX_set_default_verify_paths(ctx))
|
|
|
c4366c |
{
|
|
|
c4366c |
- /* BIO_printf(bio_err,"error setting default verify locations\n"); */
|
|
|
c4366c |
ERR_print_errors(bio_err);
|
|
|
c4366c |
- /* goto end; */
|
|
|
c4366c |
}
|
|
|
c4366c |
|
|
|
c4366c |
store = SSL_CTX_get_cert_store(ctx);
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/apps/s_server.c.default-paths openssl-fips-0.9.8e/apps/s_server.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/apps/s_server.c.default-paths 2008-09-06 12:17:46.000000000 +0200
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/apps/s_server.c 2008-09-06 12:17:46.000000000 +0200
|
|
|
c4366c |
@@ -956,12 +956,13 @@ bad:
|
|
|
c4366c |
}
|
|
|
c4366c |
#endif
|
|
|
c4366c |
|
|
|
c4366c |
- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
|
|
|
c4366c |
- (!SSL_CTX_set_default_verify_paths(ctx)))
|
|
|
c4366c |
+ if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
|
|
|
c4366c |
+ {
|
|
|
c4366c |
+ ERR_print_errors(bio_err);
|
|
|
c4366c |
+ }
|
|
|
c4366c |
+ if (!SSL_CTX_set_default_verify_paths(ctx))
|
|
|
c4366c |
{
|
|
|
c4366c |
- /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
|
|
|
c4366c |
ERR_print_errors(bio_err);
|
|
|
c4366c |
- /* goto end; */
|
|
|
c4366c |
}
|
|
|
c4366c |
store = SSL_CTX_get_cert_store(ctx);
|
|
|
c4366c |
X509_STORE_set_flags(store, vflags);
|
|
|
c4366c |
diff -up openssl-fips-0.9.8e/apps/s_time.c.default-paths openssl-fips-0.9.8e/apps/s_time.c
|
|
|
c4366c |
--- openssl-fips-0.9.8e/apps/s_time.c.default-paths 2003-12-27 15:40:17.000000000 +0100
|
|
|
c4366c |
+++ openssl-fips-0.9.8e/apps/s_time.c 2008-09-06 12:17:46.000000000 +0200
|
|
|
c4366c |
@@ -476,12 +476,13 @@ int MAIN(int argc, char **argv)
|
|
|
c4366c |
|
|
|
c4366c |
SSL_load_error_strings();
|
|
|
c4366c |
|
|
|
c4366c |
- if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
|
|
|
c4366c |
- (!SSL_CTX_set_default_verify_paths(tm_ctx)))
|
|
|
c4366c |
+ if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath))
|
|
|
c4366c |
+ {
|
|
|
c4366c |
+ ERR_print_errors(bio_err);
|
|
|
c4366c |
+ }
|
|
|
c4366c |
+ if (!SSL_CTX_set_default_verify_paths(tm_ctx))
|
|
|
c4366c |
{
|
|
|
c4366c |
- /* BIO_printf(bio_err,"error setting default verify locations\n"); */
|
|
|
c4366c |
ERR_print_errors(bio_err);
|
|
|
c4366c |
- /* goto end; */
|
|
|
c4366c |
}
|
|
|
c4366c |
|
|
|
c4366c |
if (tm_cipher == NULL)
|