File openssl-1.0.1h-system-cipherlist.patch of Package mingw64-openssl

Overview Repositories Revisions Requests Users Attributes Meta

File openssl-1.0.1h-system-cipherlist.patch of Package mingw64-openssl (Revision afe2e56e811c6c829e50534b8657599b)

Currently displaying revision afe2e56e811c6c829e50534b8657599b , Show latest

Index: openssl-1.0.1j/Configure
===================================================================
--- openssl-1.0.1j.orig/Configure	2014-12-15 08:35:49.281644681 +0100
+++ openssl-1.0.1j/Configure	2014-12-15 08:35:49.277644726 +0100
@@ -10,7 +10,7 @@
 
 # see INSTALL for instructions.
 
-my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
+my $usage="Usage: Configure [no-<cipher> ...] [enable-<cipher> ...] [experimental-<cipher> ...] [-Dxxx] [-lxxx] [-Lxxx] [-fxxx] [-Kxxx] [no-hw-xxx|no-hw] [[no-]threads] [[no-]shared] [[no-]zlib|zlib-dynamic] [no-asm] [no-dso] [no-krb5] [sctp] [386] [--prefix=DIR] [--openssldir=OPENSSLDIR] [--system-ciphers-file=SYSTEMCIPHERFILE] [--with-xxx[=vvv]] [--test-sanity] os/compiler[:flags]\n";
 
 # Options:
 #
@@ -35,6 +35,9 @@
 # --with-krb5-flavor  Declare what flavor of Kerberos 5 is used.  Currently
 #		supported values are "MIT" and "Heimdal".  A value is required.
 #
+# --system-ciphers-file  A file to read cipher string from when the PROFILE=SYSTEM
+#		cipher is specified (default).
+#
 # --test-sanity Make a number of sanity checks on the data in this file.
 #               This is a debugging tool for OpenSSL developers.
 #
@@ -663,6 +666,7 @@
 my $libdir="";
 my $openssldir="";
 my $enginesdir="";
+my $system_ciphers_file="";
 my $exe_ext="";
 my $install_prefix= "$ENV{'INSTALL_PREFIX'}";
 my $cross_compile_prefix="";
@@ -896,6 +900,10 @@
 				{
 				$enginesdir=$1;
 				}
+			elsif (/^--system-ciphers-file=(.*)$/)
+				{
+				$system_ciphers_file=$1;
+				}
 			elsif (/^--install.prefix=(.*)$/)
 				{
 				$install_prefix=$1;
@@ -1054,6 +1062,7 @@
 
 &usage if (!defined($table{$target}));
 
+chop $system_ciphers_file if $system_ciphers_file =~ /\/$/;
 
 foreach (sort (keys %disabled))
 	{
@@ -1608,6 +1617,7 @@
 	s/^INSTALLTOP=.*$/INSTALLTOP=$prefix/;
 	s/^MULTILIB=.*$/MULTILIB=$multilib/;
 	s/^OPENSSLDIR=.*$/OPENSSLDIR=$openssldir/;
+	s/^SYSTEM_CIPHERS_FILE=.*$/SYSTEM_CIPHERS_FILE=$system_ciphers_file/;
 	s/^LIBDIR=.*$/LIBDIR=$libdir/;
 	s/^INSTALL_PREFIX=.*$/INSTALL_PREFIX=$install_prefix/;
 	s/^PLATFORM=.*$/PLATFORM=$target/;
@@ -1816,6 +1826,14 @@
 		$foo =~ s/\\/\\\\/g;
 		print OUT "#define ENGINESDIR \"$foo\"\n";
 		}
+	elsif	(/^#((define)|(undef))\s+SYSTEM_CIPHERS_FILE/)
+		{
+		my $foo = "$system_ciphers_file";
+		if ($foo ne '') {
+			$foo =~ s/\\/\\\\/g;
+			print OUT "#define SYSTEM_CIPHERS_FILE \"$foo\"\n";
+		}
+		}
 	elsif	(/^#((define)|(undef))\s+OPENSSL_EXPORT_VAR_AS_FUNCTION/)
 		{ printf OUT "#undef OPENSSL_EXPORT_VAR_AS_FUNCTION\n"
 			if $export_var_as_fn;
Index: openssl-1.0.1j/crypto/opensslconf.h.in
===================================================================
--- openssl-1.0.1j.orig/crypto/opensslconf.h.in	2014-12-15 08:35:49.281644681 +0100
+++ openssl-1.0.1j/crypto/opensslconf.h.in	2014-12-15 08:35:49.277644726 +0100
@@ -25,6 +25,8 @@
 #endif
 #endif
 
+#undef SYSTEM_CIPHERS_FILE
+
 #undef OPENSSL_UNISTD
 #define OPENSSL_UNISTD <unistd.h>
 
Index: openssl-1.0.1j/ssl/ssl_ciph.c
===================================================================
--- openssl-1.0.1j.orig/ssl/ssl_ciph.c	2014-12-15 08:35:49.281644681 +0100
+++ openssl-1.0.1j/ssl/ssl_ciph.c	2014-12-15 08:35:49.277644726 +0100
@@ -1357,6 +1357,54 @@
 	return(retval);
 	}
 
+#ifdef SYSTEM_CIPHERS_FILE
+static char* load_system_str(const char* suffix)
+	{
+	FILE* fp;
+	char buf[1024];
+	char *new_rules;
+	unsigned len, slen;
+
+	fp = fopen(SYSTEM_CIPHERS_FILE, "r");
+	if (fp == NULL || fgets(buf, sizeof(buf), fp) == NULL)
+		{
+		/* cannot open or file is empty */
+		snprintf(buf, sizeof(buf), "%s", SSL_DEFAULT_CIPHER_LIST);
+		}
+
+	if (fp)
+		fclose(fp);
+
+	slen = strlen(suffix);
+	len = strlen(buf);
+
+	if (buf[len-1] == '\n')
+		{
+		len--;
+		buf[len] = 0;
+		}
+	if (buf[len-1] == '\r')
+		{
+		len--;
+		buf[len] = 0;
+		}
+
+	new_rules = OPENSSL_malloc(len + slen + 1);
+	if (new_rules == 0)
+		return NULL;
+
+	memcpy(new_rules, buf, len);
+	if (slen > 0)
+		{
+		memcpy(&new_rules[len], suffix, slen);
+		len += slen;
+		}
+	new_rules[len] = 0;
+
+	return new_rules;
+	}
+#endif
+
 STACK_OF(SSL_CIPHER) *ssl_create_cipher_list(const SSL_METHOD *ssl_method,
 		STACK_OF(SSL_CIPHER) **cipher_list,
 		STACK_OF(SSL_CIPHER) **cipher_list_by_id,
@@ -1364,16 +1412,29 @@
 	{
 	int ok, num_of_ciphers, num_of_alias_max, num_of_group_aliases;
 	unsigned long disabled_mkey, disabled_auth, disabled_enc, disabled_mac, disabled_ssl;
-	STACK_OF(SSL_CIPHER) *cipherstack, *tmp_cipher_list;
+	STACK_OF(SSL_CIPHER) *cipherstack = NULL, *tmp_cipher_list;
 	const char *rule_p;
 	CIPHER_ORDER *co_list = NULL, *head = NULL, *tail = NULL, *curr;
 	const SSL_CIPHER **ca_list = NULL;
+#ifdef SYSTEM_CIPHERS_FILE
+	char *new_rules = NULL;
+
+	if (rule_str != NULL && strncmp(rule_str, "PROFILE=SYSTEM", 14) == 0)
+		{
+		char *p = rule_str + 14;
+
+		new_rules = load_system_str(p);
+		rule_str = new_rules;
+		}
+#endif
 
 	/*
 	 * Return with error if nothing to do.
 	 */
 	if (rule_str == NULL || cipher_list == NULL || cipher_list_by_id == NULL)
-		return NULL;
+		{
+		goto end;
+		}
 
 	/*
 	 * To reduce the work to do we only want to process the compiled
@@ -1394,7 +1455,7 @@
 	if (co_list == NULL)
 		{
 		SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST,ERR_R_MALLOC_FAILURE);
-		return(NULL);	/* Failure */
+		goto end;
 		}
 
 	ssl_cipher_collect_ciphers(ssl_method, num_of_ciphers,
@@ -1436,8 +1497,7 @@
 	 * in force within each class */
 	if (!ssl_cipher_strength_sort(&head, &tail))
 		{
-		OPENSSL_free(co_list);
-		return NULL;
+		goto end;
 		}
 
 	/* Now disable everything (maintaining the ordering!) */
@@ -1457,9 +1517,8 @@
 	ca_list = OPENSSL_malloc(sizeof(SSL_CIPHER *) * num_of_alias_max);
 	if (ca_list == NULL)
 		{
-		OPENSSL_free(co_list);
 		SSLerr(SSL_F_SSL_CREATE_CIPHER_LIST,ERR_R_MALLOC_FAILURE);
-		return(NULL);	/* Failure */
+		goto end;
 		}
 	ssl_cipher_collect_aliases(ca_list, num_of_group_aliases,
 	                           disabled_mkey, disabled_auth, disabled_enc,
@@ -1487,8 +1546,7 @@
 
 	if (!ok)
 		{	/* Rule processing failure */
-		OPENSSL_free(co_list);
-		return(NULL);
+		goto end;
 		}
 	
 	/*
@@ -1497,8 +1555,7 @@
 	 */
 	if ((cipherstack = sk_SSL_CIPHER_new_null()) == NULL)
 		{
-		OPENSSL_free(co_list);
-		return(NULL);
+		goto end;
 		}
 
 	/*
@@ -1519,13 +1576,13 @@
 #endif
 			}
 		}
-	OPENSSL_free(co_list);	/* Not needed any longer */
 
 	tmp_cipher_list = sk_SSL_CIPHER_dup(cipherstack);
 	if (tmp_cipher_list == NULL)
 		{
 		sk_SSL_CIPHER_free(cipherstack);
-		return NULL;
+		cipherstack = NULL;
+		goto end;
 		}
 	if (*cipher_list != NULL)
 		sk_SSL_CIPHER_free(*cipher_list);
@@ -1536,6 +1593,12 @@
 	(void)sk_SSL_CIPHER_set_cmp_func(*cipher_list_by_id,ssl_cipher_ptr_id_cmp);
 
 	sk_SSL_CIPHER_sort(*cipher_list_by_id);
+
+end:
+	OPENSSL_free(co_list);
+#ifdef SYSTEM_CIPHERS_FILE
+	OPENSSL_free(new_rules);
+#endif
 	return(cipherstack);
 	}
 
Index: openssl-1.0.1j/ssl/ssl.h
===================================================================
--- openssl-1.0.1j.orig/ssl/ssl.h	2014-12-15 08:35:49.281644681 +0100
+++ openssl-1.0.1j/ssl/ssl.h	2014-12-15 08:35:49.277644726 +0100
@@ -339,6 +339,11 @@
  * (The latter are not actually enabled by ALL, but "ALL:RSA" would enable
  * some of them.)
  */
+#ifdef SYSTEM_CIPHERS_FILE
+#define SSL_SYSTEM_DEFAULT_CIPHER_LIST "PROFILE=SYSTEM"
+#else
+#define SSL_SYSTEM_DEFAULT_CIPHER_LIST SSL_DEFAULT_CIPHER_LIST
+#endif
 
 /* Used in SSL_set_shutdown()/SSL_get_shutdown(); */
 #define SSL_SENT_SHUTDOWN	1
Index: openssl-1.0.1j/ssl/ssl_lib.c
===================================================================
--- openssl-1.0.1j.orig/ssl/ssl_lib.c	2014-12-15 08:35:49.281644681 +0100
+++ openssl-1.0.1j/ssl/ssl_lib.c	2014-12-15 08:35:49.277644726 +0100
@@ -263,7 +263,7 @@
 
 	sk=ssl_create_cipher_list(ctx->method,&(ctx->cipher_list),
 		&(ctx->cipher_list_by_id),
-		meth->version == SSL2_VERSION ? "SSLv2" : SSL_DEFAULT_CIPHER_LIST);
+		meth->version == SSL2_VERSION ? "SSLv2" : SSL_SYSTEM_DEFAULT_CIPHER_LIST);
 	if ((sk == NULL) || (sk_SSL_CIPHER_num(sk) <= 0))
 		{
 		SSLerr(SSL_F_SSL_CTX_SET_SSL_VERSION,SSL_R_SSL_LIBRARY_HAS_NO_CIPHERS);
@@ -1804,7 +1804,7 @@
 
 	ssl_create_cipher_list(ret->method,
 		&ret->cipher_list,&ret->cipher_list_by_id,
-		meth->version == SSL2_VERSION ? "SSLv2" : SSL_DEFAULT_CIPHER_LIST);
+		meth->version == SSL2_VERSION ? "SSLv2" : SSL_SYSTEM_DEFAULT_CIPHER_LIST);
 	if (ret->cipher_list == NULL
 	    || sk_SSL_CIPHER_num(ret->cipher_list) <= 0)
 		{

Places

File openssl-1.0.1h-system-cipherlist.patch of Package mingw64-openssl (Revision afe2e56e811c6c829e50534b8657599b)

Places