Mostly working, but not complete, port of openssl

[fedora-mingw.git] / openssl / openssl-0.9.8g-default-paths.patch

diff --git a/openssl/openssl-0.9.8g-default-paths.patch b/openssl/openssl-0.9.8g-default-paths.patch
new file mode 100644 (file)
index 0000000..23fa4e1
--- /dev/null
+++ b/openssl/openssl-0.9.8g-default-paths.patch
@@ -0,0 +1,77 @@
+diff -up openssl-0.9.8g/apps/s_server.c.default-paths openssl-0.9.8g/apps/s_server.c
+--- openssl-0.9.8g/apps/s_server.c.default-paths       2007-12-13 17:41:34.000000000 +0100
++++ openssl-0.9.8g/apps/s_server.c     2007-12-13 17:36:58.000000000 +0100
+@@ -1077,12 +1077,13 @@ bad:
+               }
+ #endif
+ 
+-      if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
+-              (!SSL_CTX_set_default_verify_paths(ctx)))
++      if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
++              {
++              ERR_print_errors(bio_err);
++              }
++      if (!SSL_CTX_set_default_verify_paths(ctx))
+               {
+-              /* BIO_printf(bio_err,"X509_load_verify_locations\n"); */
+               ERR_print_errors(bio_err);
+-              /* goto end; */
+               }
+       store = SSL_CTX_get_cert_store(ctx);
+       X509_STORE_set_flags(store, vflags);
+@@ -1132,8 +1133,11 @@ bad:
+ 
+               SSL_CTX_sess_set_cache_size(ctx2,128);
+ 
+-              if ((!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath)) ||
+-                      (!SSL_CTX_set_default_verify_paths(ctx2)))
++              if (!SSL_CTX_load_verify_locations(ctx2,CAfile,CApath))
++                      {
++                      ERR_print_errors(bio_err);
++                      }
++              if (!SSL_CTX_set_default_verify_paths(ctx2))
+                       {
+                       ERR_print_errors(bio_err);
+                       }
+diff -up openssl-0.9.8g/apps/s_client.c.default-paths openssl-0.9.8g/apps/s_client.c
+--- openssl-0.9.8g/apps/s_client.c.default-paths       2007-12-13 17:41:34.000000000 +0100
++++ openssl-0.9.8g/apps/s_client.c     2007-12-13 17:37:34.000000000 +0100
+@@ -673,12 +673,13 @@ bad:
+       if (!set_cert_key_stuff(ctx,cert,key))
+               goto end;
+ 
+-      if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
+-              (!SSL_CTX_set_default_verify_paths(ctx)))
++      if (!SSL_CTX_load_verify_locations(ctx,CAfile,CApath))
++              {
++              ERR_print_errors(bio_err);
++              }
++      if (!SSL_CTX_set_default_verify_paths(ctx))
+               {
+-              /* BIO_printf(bio_err,"error setting default verify locations\n"); */
+               ERR_print_errors(bio_err);
+-              /* goto end; */
+               }
+ 
+       store = SSL_CTX_get_cert_store(ctx);
+diff -up openssl-0.9.8g/apps/s_time.c.default-paths openssl-0.9.8g/apps/s_time.c
+--- openssl-0.9.8g/apps/s_time.c.default-paths 2003-12-27 15:40:17.000000000 +0100
++++ openssl-0.9.8g/apps/s_time.c       2007-12-13 17:35:27.000000000 +0100
+@@ -476,12 +476,13 @@ int MAIN(int argc, char **argv)
+ 
+       SSL_load_error_strings();
+ 
+-      if ((!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath)) ||
+-              (!SSL_CTX_set_default_verify_paths(tm_ctx)))
++      if (!SSL_CTX_load_verify_locations(tm_ctx,CAfile,CApath))
++              {
++              ERR_print_errors(bio_err);
++              }
++      if (!SSL_CTX_set_default_verify_paths(tm_ctx))
+               {
+-              /* BIO_printf(bio_err,"error setting default verify locations\n"); */
+               ERR_print_errors(bio_err);
+-              /* goto end; */
+               }
+ 
+       if (tm_cipher == NULL)