[gentoo-commits] gentoo-x86 commit in dev-libs/openssl/files: openssl-1.0.1e-s_client-verify.patch

[gentoo-commits] gentoo-x86 commit in dev-libs/openssl/files: openssl-1.0.1e-s_client-verify.patch

[Mike Frysinger (vapier)]

vapier      13/10/23 16:10:35

  Added:                openssl-1.0.1e-s_client-verify.patch
  Log:
  Add fix for s_client verify #472584 by Fabio Coatti.  Disable 128bit math logic for now #469976 by Jim Faulkner.
  
  (Portage version: 2.2.0/cvs/Linux x86_64, signed Manifest commit with key FB7C4156)

Revision  Changes    Path
1.1                  dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch

file : http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch?rev=1.1&view=markup
plain: http://sources.gentoo.org/viewvc.cgi/gentoo-x86/dev-libs/openssl/files/openssl-1.0.1e-s_client-verify.patch?rev=1.1&content-type=text/plain

Index: openssl-1.0.1e-s_client-verify.patch
===================================================================
https://bugs.gentoo.org/472584
http://rt.openssl.org/Ticket/Display.html?id=2387&user=guest&pass=guest

fix verification handling in s_client.  when loading paths, make sure
we properly fallback to setting the default paths.

--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -899,7 +899,7 @@
 	if (!set_cert_key_stuff(ctx,cert,key))
 		goto end;
 
-	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) ||
+	if ((!SSL_CTX_load_verify_locations(ctx,CAfile,CApath)) &&
 		(!SSL_CTX_set_default_verify_paths(ctx)))
 		{
 		/* BIO_printf(bio_err,"error setting default verify locations\n"); */