projects / people / arne_f / ipfire-3.x.git / blame
| Commit | Line | Data |
|---|---|---|
| 0595faf5 MT |
1 | diff -up openssl-1.0.0-beta4/apps/s_client.c.default-paths openssl-1.0.0-beta4/apps/s_client.c |
| 2 | --- openssl-1.0.0-beta4/apps/s_client.c.default-paths 2009-08-12 15:21:26.000000000 +0200 | |
| 3 | +++ openssl-1.0.0-beta4/apps/s_client.c 2009-11-12 12:26:32.000000000 +0100 | |
| 4 | @@ -889,12 +889,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 | #ifndef OPENSSL_NO_TLSEXT | |
| 22 | diff -up openssl-1.0.0-beta4/apps/s_server.c.default-paths openssl-1.0.0-beta4/apps/s_server.c | |
| 23 | --- openssl-1.0.0-beta4/apps/s_server.c.default-paths 2009-10-28 18:49:37.000000000 +0100 | |
| 24 | +++ openssl-1.0.0-beta4/apps/s_server.c 2009-11-12 12:31:23.000000000 +0100 | |
| 25 | @@ -1408,12 +1408,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 | if (vpm) | |
| 42 | SSL_CTX_set1_param(ctx, vpm); | |
| 43 | @@ -1465,8 +1466,11 @@ bad: | |
| 44 | else | |
| 45 | SSL_CTX_sess_set_cache_size(ctx2,128); | |
| 46 | ||
| 47 | - if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) || | |
| 48 | - (!SSL_CTX_set_default_verify_paths(ctx2))) | |
| 49 | + if (!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) | |
| 50 | + { | |
| 51 | + ERR_print_errors(bio_err); | |
| 52 | + } | |
| 53 | + if (!SSL_CTX_set_default_verify_paths(ctx2)) | |
| 54 | { | |
| 55 | ERR_print_errors(bio_err); | |
| 56 | } | |
| 57 | diff -up openssl-1.0.0-beta4/apps/s_time.c.default-paths openssl-1.0.0-beta4/apps/s_time.c | |
| 58 | --- openssl-1.0.0-beta4/apps/s_time.c.default-paths 2006-04-17 14:22:13.000000000 +0200 | |
| 59 | +++ openssl-1.0.0-beta4/apps/s_time.c 2009-11-12 12:26:32.000000000 +0100 | |
| 60 | @@ -373,12 +373,13 @@ int MAIN(int argc, char **argv) | |
| 61 | ||
| 62 | SSL_load_error_strings(); | |
| 63 | ||
| 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)) | |
| 67 | + { | |
| 68 | + ERR_print_errors(bio_err); | |
| 69 | + } | |
| 70 | + if (!SSL_CTX_set_default_verify_paths(tm_ctx)) | |
| 71 | { | |
| 72 | - /* BIO_printf(bio_err,"error setting default verify locations\n"); */ | |
| 73 | ERR_print_errors(bio_err); | |
| 74 | - /* goto end; */ | |
| 75 | } | |
| 76 | ||
| 77 | if (tm_cipher == NULL) |