| 1 |
wellsi |
1.1 |
diff -up openssl-fips-0.9.8e/apps/s_client.c.default-paths openssl-fips-0.9.8e/apps/s_client.c |
| 2 |
|
|
--- openssl-fips-0.9.8e/apps/s_client.c.default-paths 2008-09-06 12:17:46.000000000 +0200 |
| 3 |
|
|
+++ openssl-fips-0.9.8e/apps/s_client.c 2008-09-06 12:17:46.000000000 +0200 |
| 4 |
|
|
@@ -610,12 +610,13 @@ bad: |
| 5 |
|
|
if (!set_cert_key_stuff(ctx,cert,key)) |
| 6 |
|
|
goto end; |
| 7 |
|
|
|
| 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)) |
| 11 |
|
|
+ { |
| 12 |
|
|
+ ERR_print_errors(bio_err); |
| 13 |
|
|
+ } |
| 14 |
|
|
+ if (!SSL_CTX_set_default_verify_paths(ctx)) |
| 15 |
|
|
{ |
| 16 |
|
|
- /* BIO_printf(bio_err,"error setting default verify locations\n"); */ |
| 17 |
|
|
ERR_print_errors(bio_err); |
| 18 |
|
|
- /* goto end; */ |
| 19 |
|
|
} |
| 20 |
|
|
|
| 21 |
|
|
store = SSL_CTX_get_cert_store(ctx); |
| 22 |
|
|
diff -up openssl-fips-0.9.8e/apps/s_server.c.default-paths openssl-fips-0.9.8e/apps/s_server.c |
| 23 |
|
|
--- openssl-fips-0.9.8e/apps/s_server.c.default-paths 2008-09-06 12:17:46.000000000 +0200 |
| 24 |
|
|
+++ openssl-fips-0.9.8e/apps/s_server.c 2008-09-06 12:17:46.000000000 +0200 |
| 25 |
|
|
@@ -956,12 +956,13 @@ bad: |
| 26 |
|
|
} |
| 27 |
|
|
#endif |
| 28 |
|
|
|
| 29 |
|
|
- if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) || |
| 30 |
|
|
- (!SSL_CTX_set_default_verify_paths(ctx))) |
| 31 |
|
|
+ if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) |
| 32 |
|
|
+ { |
| 33 |
|
|
+ ERR_print_errors(bio_err); |
| 34 |
|
|
+ } |
| 35 |
|
|
+ if (!SSL_CTX_set_default_verify_paths(ctx)) |
| 36 |
|
|
{ |
| 37 |
|
|
- /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */ |
| 38 |
|
|
ERR_print_errors(bio_err); |
| 39 |
|
|
- /* goto end; */ |
| 40 |
|
|
} |
| 41 |
|
|
store = SSL_CTX_get_cert_store(ctx); |
| 42 |
|
|
X509_STORE_set_flags(store, vflags); |
| 43 |
|
|
diff -up openssl-fips-0.9.8e/apps/s_time.c.default-paths openssl-fips-0.9.8e/apps/s_time.c |
| 44 |
|
|
--- openssl-fips-0.9.8e/apps/s_time.c.default-paths 2003-12-27 15:40:17.000000000 +0100 |
| 45 |
|
|
+++ openssl-fips-0.9.8e/apps/s_time.c 2008-09-06 12:17:46.000000000 +0200 |
| 46 |
|
|
@@ -476,12 +476,13 @@ int MAIN(int argc, char **argv) |
| 47 |
|
|
|
| 48 |
|
|
SSL_load_error_strings(); |
| 49 |
|
|
|
| 50 |
|
|
- if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) || |
| 51 |
|
|
- (!SSL_CTX_set_default_verify_paths(tm_ctx))) |
| 52 |
|
|
+ if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) |
| 53 |
|
|
+ { |
| 54 |
|
|
+ ERR_print_errors(bio_err); |
| 55 |
|
|
+ } |
| 56 |
|
|
+ if (!SSL_CTX_set_default_verify_paths(tm_ctx)) |
| 57 |
|
|
{ |
| 58 |
|
|
- /* BIO_printf(bio_err,"error setting default verify locations\n"); */ |
| 59 |
|
|
ERR_print_errors(bio_err); |
| 60 |
|
|
- /* goto end; */ |
| 61 |
|
|
} |
| 62 |
|
|
|
| 63 |
|
|
if (tm_cipher == NULL) |
Parent Directory
| 
Revision Log
| 
Revision Graph
