File openssl-1.0.1e-secure-getenv.patch of Package mingw64-openssl

Overview Repositories Revisions Requests Users Attributes Meta

File openssl-1.0.1e-secure-getenv.patch of Package mingw64-openssl (Revision 7941b4080758e6519cc8732b0dd2298d)

Currently displaying revision 7941b4080758e6519cc8732b0dd2298d , Show latest

Index: openssl-1.0.1j/crypto/conf/conf_api.c
===================================================================
--- openssl-1.0.1j.orig/crypto/conf/conf_api.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/conf/conf_api.c	2014-12-15 08:35:41.705727639 +0100
@@ -63,6 +63,8 @@
 # define NDEBUG
 #endif
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <assert.h>
 #include <stdlib.h>
 #include <string.h>
@@ -142,7 +144,7 @@
 			if (v != NULL) return(v->value);
 			if (strcmp(section,"ENV") == 0)
 				{
-				p=getenv(name);
+				p=secure_getenv(name);
 				if (p != NULL) return(p);
 				}
 			}
@@ -155,7 +157,7 @@
 			return(NULL);
 		}
 	else
-		return(getenv(name));
+		return (secure_getenv(name));
 	}
 
 #if 0 /* There's no way to provide error checking with this function, so
Index: openssl-1.0.1j/crypto/conf/conf_mod.c
===================================================================
--- openssl-1.0.1j.orig/crypto/conf/conf_mod.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/conf/conf_mod.c	2014-12-15 08:35:41.705727639 +0100
@@ -56,6 +56,8 @@
  *
  */
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <ctype.h>
 #include <openssl/crypto.h>
@@ -548,8 +550,8 @@
 	char *file;
 	int len;
 
-	file = getenv("OPENSSL_CONF");
-	if (file) 
+	file = secure_getenv("OPENSSL_CONF");
+	if (file)
 		return BUF_strdup(file);
 
 	len = strlen(X509_get_default_cert_area());
Index: openssl-1.0.1j/crypto/engine/eng_list.c
===================================================================
--- openssl-1.0.1j.orig/crypto/engine/eng_list.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/engine/eng_list.c	2014-12-15 08:35:41.705727639 +0100
@@ -61,6 +61,8 @@
  * SUN MICROSYSTEMS, INC., and contributed to the OpenSSL project.
  */
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include "eng_int.h"
 
 /* The linked-list of pointers to engine types. engine_list_head
@@ -399,9 +401,9 @@
 	if (strcmp(id, "dynamic"))
 		{
 #ifdef OPENSSL_SYS_VMS
-		if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
+		if(OPENSSL_issetugid() || (load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = "SSLROOT:[ENGINES]";
 #else
-		if((load_dir = getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
+		if((load_dir = secure_getenv("OPENSSL_ENGINES")) == 0) load_dir = ENGINESDIR;
 #endif
 		iterator = ENGINE_by_id("dynamic");
 		if(!iterator || !ENGINE_ctrl_cmd_string(iterator, "ID", id, 0) ||
Index: openssl-1.0.1j/crypto/md5/md5_dgst.c
===================================================================
--- openssl-1.0.1j.orig/crypto/md5/md5_dgst.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/md5/md5_dgst.c	2014-12-15 08:35:41.705727639 +0100
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <stdio.h>
 #include "md5_locl.h"
 #include <openssl/opensslv.h>
@@ -74,7 +76,7 @@
 int MD5_Init(MD5_CTX *c)
 #ifdef OPENSSL_FIPS
 	{
-	if (FIPS_mode() && getenv("OPENSSL_FIPS_NON_APPROVED_MD5_ALLOW") == NULL)
+	if (FIPS_mode() && secure_getenv("OPENSSL_FIPS_NON_APPROVED_MD5_ALLOW") == NULL)
 		OpenSSLDie(__FILE__, __LINE__, \
                 "Digest MD5 forbidden in FIPS mode!");
 	return private_MD5_Init(c);
Index: openssl-1.0.1j/crypto/o_init.c
===================================================================
--- openssl-1.0.1j.orig/crypto/o_init.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/o_init.c	2014-12-15 08:35:41.705727639 +0100
@@ -52,6 +52,8 @@
  *
  */
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <e_os.h>
 #include <openssl/err.h>
 #ifdef OPENSSL_FIPS
@@ -71,7 +73,7 @@
 	char buf[2] = "0";
 	int fd;
 	
-	if (getenv("OPENSSL_FORCE_FIPS_MODE") != NULL)
+	if (secure_getenv("OPENSSL_FORCE_FIPS_MODE") != NULL)
 		{
 		buf[0] = '1';
 		}
Index: openssl-1.0.1j/crypto/rand/randfile.c
===================================================================
--- openssl-1.0.1j.orig/crypto/rand/randfile.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/rand/randfile.c	2014-12-15 08:35:41.705727639 +0100
@@ -60,6 +60,8 @@
 #if !defined(OPENSSL_SYS_VXWORKS)
 #define _XOPEN_SOURCE 500
 #endif
+/* for secure_getenv */
+#define _GNU_SOURCE
 
 #include <errno.h>
 #include <stdio.h>
@@ -278,8 +280,7 @@
 	struct stat sb;
 #endif
 
-	if (OPENSSL_issetugid() == 0)
-		s=getenv("RANDFILE");
+	s=secure_getenv("RANDFILE");
 	if (s != NULL && *s && strlen(s) + 1 < size)
 		{
 		if (BUF_strlcpy(buf,s,size) >= size)
@@ -287,8 +288,7 @@
 		}
 	else
 		{
-		if (OPENSSL_issetugid() == 0)
-			s=getenv("HOME");
+		s=secure_getenv("HOME");
 #ifdef DEFAULT_HOME
 		if (s == NULL)
 			{
Index: openssl-1.0.1j/crypto/x509/by_dir.c
===================================================================
--- openssl-1.0.1j.orig/crypto/x509/by_dir.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/x509/by_dir.c	2014-12-15 08:35:41.709727596 +0100
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
@@ -135,7 +137,7 @@
 	case X509_L_ADD_DIR:
 		if (argl == X509_FILETYPE_DEFAULT)
 			{
-			dir=(char *)getenv(X509_get_default_cert_dir_env());
+			dir=(char *)secure_getenv(X509_get_default_cert_dir_env());
 			if (dir)
 				ret=add_cert_dir(ld,dir,X509_FILETYPE_PEM);
 			else
Index: openssl-1.0.1j/crypto/x509/by_file.c
===================================================================
--- openssl-1.0.1j.orig/crypto/x509/by_file.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/x509/by_file.c	2014-12-15 08:35:41.709727596 +0100
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
@@ -100,7 +102,7 @@
 	case X509_L_FILE_LOAD:
 		if (argl == X509_FILETYPE_DEFAULT)
 			{
-			file = (char *)getenv(X509_get_default_cert_file_env());
+			file = (char *)secure_getenv(X509_get_default_cert_file_env());
 			if (file)
 				ok = (X509_load_cert_crl_file(ctx,file,
 					      X509_FILETYPE_PEM) != 0);
Index: openssl-1.0.1j/crypto/x509/x509_vfy.c
===================================================================
--- openssl-1.0.1j.orig/crypto/x509/x509_vfy.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/crypto/x509/x509_vfy.c	2014-12-15 08:35:41.709727596 +0100
@@ -56,6 +56,8 @@
  * [including the GNU Public Licence.]
  */
 
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <stdio.h>
 #include <time.h>
 #include <errno.h>
@@ -481,7 +483,7 @@
 			!!(ctx->param->flags & X509_V_FLAG_ALLOW_PROXY_CERTS);
 		/* A hack to keep people who don't want to modify their
 		   software happy */
-		if (getenv("OPENSSL_ALLOW_PROXY_CERTS"))
+		if (secure_getenv("OPENSSL_ALLOW_PROXY_CERTS"))
 			allow_proxy_certs = 1;
 		purpose = ctx->param->purpose;
 		}
Index: openssl-1.0.1j/engines/ccgost/gost_ctl.c
===================================================================
--- openssl-1.0.1j.orig/engines/ccgost/gost_ctl.c	2014-12-15 08:35:41.713727552 +0100
+++ openssl-1.0.1j/engines/ccgost/gost_ctl.c	2014-12-15 08:35:41.709727596 +0100
@@ -6,6 +6,8 @@
  *        Implementation of control commands for GOST engine          *
  *            OpenSSL 0.9.9 libraries required                        *
  **********************************************************************/            
+/* for secure_getenv */
+#define _GNU_SOURCE
 #include <stdlib.h>
 #include <string.h>
 #include <openssl/crypto.h>
@@ -65,7 +67,7 @@
 		{
 		return gost_params[param];
 		}
-	tmp = getenv(gost_envnames[param]);
+	tmp = secure_getenv(gost_envnames[param]);
 	if (tmp) 
 		{
 		if (gost_params[param]) OPENSSL_free(gost_params[param]);
@@ -79,7 +81,7 @@
 	{
 	const char *tmp;
 	if (param <0 || param >GOST_PARAM_MAX) return 0;
-	tmp = getenv(gost_envnames[param]);
+	tmp = secure_getenv(gost_envnames[param]);
 	/* if there is value in the environment, use it, else -passed string * */
 	if (!tmp) tmp=value;
 	if (gost_params[param]) OPENSSL_free(gost_params[param]);

Places

File openssl-1.0.1e-secure-getenv.patch of Package mingw64-openssl (Revision 7941b4080758e6519cc8732b0dd2298d)

Places