svn commit: r494029 - branches/2019Q1/www/elinks/files

[Kurt Jaeger]

Author: pi
Date: Wed Feb 27 07:23:49 2019
New Revision: 494029
URL: https://svnweb.freebsd.org/changeset/ports/494029

Log:
  MFH: r494026
  
  www/elinks: Fix ssl initialization on newer openssl/libressl without EGD
  
  PR:		234808
  Submitted by:	Derek Schrock <dereks at lifeofadishwasher.com>
  Approved by:	beat (maintainer timeout)
  Obtained from:	https://repo.or.cz/elinks.git/blobdiff/6eba447e8ae12cacac3b479c7148d189bea3e8ea..f4a58ba3b574a478fd5954ba2c5b29e8b809ff9b:/src/network/ssl/ssl.c
  Approved by:	ports-secteam (joneum)

Modified:
  branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c
Directory Properties:
  branches/2019Q1/   (props changed)

Modified: branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c
==============================================================================
--- branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c	Wed Feb 27 07:14:35 2019	(r494028)
+++ branches/2019Q1/www/elinks/files/patch-src_network_ssl_ssl.c	Wed Feb 27 07:23:49 2019	(r494029)
@@ -1,14 +1,21 @@
---- src/network/ssl/ssl.c.orig	2009-08-22 13:15:08.000000000 +0200
-+++ src/network/ssl/ssl.c	2015-03-21 12:41:15.886709287 +0100
-@@ -49,7 +49,10 @@ init_openssl(struct module *module)
+--- src/network/ssl/ssl.c.orig	2019-01-09 23:04:06 UTC
++++ src/network/ssl/ssl.c
+@@ -49,11 +49,17 @@ init_openssl(struct module *module)
  	 * cannot initialize the PRNG and so every attempt to use SSL fails.
  	 * It's actually an OpenSSL FAQ, and according to them, it's up to the
  	 * application coders to seed the RNG. -- William Yodlowsky */
 -	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) {
++	RAND_file_name(f_randfile, sizeof(f_randfile));
 +#ifndef OPENSSL_NO_EGD
-+	if (RAND_egd(RAND_file_name(f_randfile, sizeof(f_randfile))) < 0) 
-+#endif
++	if (RAND_egd(f_randfile) < 0)
 +	{
  		/* Not an EGD, so read and write to it */
++#endif
  		if (RAND_load_file(f_randfile, -1))
  			RAND_write_file(f_randfile);
++#ifndef OPENSSL_NO_EGD
+ 	}
++#endif
+ 
+ 	SSLeay_add_ssl_algorithms();
+ 	context = SSL_CTX_new(SSLv23_client_method());