/[pkgs]/devel/openssl/openssl-1.0.0-beta3-default-paths.patch
ViewVC logotype

Contents of /devel/openssl/openssl-1.0.0-beta3-default-paths.patch

Parent Directory Parent Directory | Revision Log Revision Log

Revision 1.1 - (show annotations) (download) (as text)
Thu Aug 20 14:18:42 2009 UTC (3 months ago) by tmraz
Branch: MAIN
CVS Tags: openssl-1_0_0-0_7_beta3_fc12, openssl-1_0_0-0_4_beta3_fc12, F-12-split, openssl-1_0_0-0_8_beta3_fc13, openssl-1_0_0-0_9_beta3_fc13, openssl-1_0_0-0_10_beta3_fc13, openssl-1_0_0-0_1_beta3_fc12, openssl-1_0_0-0_5_beta3_fc12, openssl-1_0_0-0_2_beta3_fc12, openssl-1_0_0-0_3_beta3_fc12, openssl-1_0_0-0_6_beta3_fc12
File MIME type: text/x-patch 
* Thu Aug 20 2009 Tomas Mraz <tmraz@redhat.com> 1.0.0-0.1.beta3
- update to new major upstream release
1 diff -up openssl-1.0.0-beta3/apps/s_client.c.default-paths openssl-1.0.0-beta3/apps/s_client.c
2 --- openssl-1.0.0-beta3/apps/s_client.c.default-paths 2009-06-30 18:10:24.000000000 +0200
3 +++ openssl-1.0.0-beta3/apps/s_client.c 2009-08-05 18:17:52.000000000 +0200
4 @@ -888,12 +888,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-beta3/apps/s_server.c.default-paths openssl-1.0.0-beta3/apps/s_server.c
23 --- openssl-1.0.0-beta3/apps/s_server.c.default-paths 2009-06-30 18:10:24.000000000 +0200
24 +++ openssl-1.0.0-beta3/apps/s_server.c 2009-08-05 18:18:40.000000000 +0200
25 @@ -1403,12 +1403,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 @@ -1457,8 +1458,11 @@ bad:
44
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-beta3/apps/s_time.c.default-paths openssl-1.0.0-beta3/apps/s_time.c
58 --- openssl-1.0.0-beta3/apps/s_time.c.default-paths 2006-04-17 14:22:13.000000000 +0200
59 +++ openssl-1.0.0-beta3/apps/s_time.c 2009-08-05 18:00:35.000000000 +0200
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)
admin@fedoraproject.org
 ViewVC Help
Powered by ViewVC 1.1.2