- diff -ur gnutls-3.2.7.orig/configure gnutls-3.2.7/configure

- --- gnutls-3.2.7.orig/configure	2013-11-23 11:09:49.000000000 +0100

- +++ gnutls-3.2.7/configure	2013-11-25 16:53:05.559440656 +0100

- @@ -39652,7 +39652,7 @@

-  shlibpath_overrides_runpath=unknown

-  version_type=none

-  dynamic_linker="$host_os ld.so"

- -sys_lib_dlsearch_path_spec="/lib /usr/lib"

- +sys_lib_dlsearch_path_spec="/lib /usr/lib /lib64 /usr/lib64"

-  need_lib_prefix=unknown

-  hardcode_into_libs=no

-  

- diff -up gnutls-3.4.2/guile/src/Makefile.in.jx gnutls-3.4.2/guile/src/Makefile.in

- --- gnutls-3.4.2/guile/src/Makefile.in.jx	2015-06-16 12:23:31.000000000 -0400

- +++ gnutls-3.4.2/guile/src/Makefile.in	2015-07-02 14:01:19.415060204 -0400

- @@ -1316,7 +1316,7 @@ guileextension_LTLIBRARIES = guile-gnutl

-  # Use '-module' to build a "dlopenable module", in Libtool terms.

-  # Use '-undefined' to placate Libtool on Windows; see

-  # <http://lists.gnutls.org/pipermail/gnutls-devel/2014-December/007294.html>.

- -guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined

- +guile_gnutls_v_2_la_LDFLAGS = -module -no-undefined -Wl,-z,lazy

-  

-  # Linking against GnuTLS.

-  GNUTLS_CORE_LIBS = $(top_builddir)/lib/libgnutls.la

- diff --git a/lib/cert-cred.c b/lib/cert-cred.c

- index d3777e51f..2150e903f 100644

- --- a/lib/cert-cred.c

- +++ b/lib/cert-cred.c

- @@ -387,6 +387,13 @@ static int call_legacy_cert_cb1(gnutls_session_t session,

-  	if (ret < 0)

-  		return gnutls_assert_val(ret);

-  

- +	if (st2.ncerts == 0) {

- +		*pcert_length = 0;

- +		*ocsp_length = 0;

- +		*privkey = NULL;

- +		return 0;

- +	}

- +

-  	if (st2.cert_type != GNUTLS_CRT_X509) {

-  		gnutls_assert();

-  		ret = GNUTLS_E_INVALID_REQUEST;

- @@ -503,7 +510,10 @@ void gnutls_certificate_set_retrieve_function

-       gnutls_certificate_retrieve_function * func)

-  {

-  	cred->legacy_cert_cb1 = func;

- -	cred->get_cert_callback3 = call_legacy_cert_cb1;

- +	if (!func)

- +		cred->get_cert_callback3 = NULL;

- +	else

- +		cred->get_cert_callback3 = call_legacy_cert_cb1;

-  }

-  

-  static int call_legacy_cert_cb2(gnutls_session_t session,

- @@ -578,7 +588,10 @@ void gnutls_certificate_set_retrieve_function2

-       gnutls_certificate_retrieve_function2 * func) 

-  {

-  	cred->legacy_cert_cb2 = func;

- -	cred->get_cert_callback3 = call_legacy_cert_cb2;

- +	if (!func)

- +		cred->get_cert_callback3 = NULL;

- +	else

- +		cred->get_cert_callback3 = call_legacy_cert_cb2;

-  }

-  

-  /**

- diff --git a/lib/hello_ext.c b/lib/hello_ext.c

- index a3027130a..f72afe77f 100644

- --- a/lib/hello_ext.c

- +++ b/lib/hello_ext.c

- @@ -208,7 +208,7 @@ int hello_ext_parse(void *_ctx, unsigned tls_id, const uint8_t *data, unsigned d

-  

-  	if (tls_id == PRE_SHARED_KEY_TLS_ID) {

-  		ctx->seen_pre_shared_key = 1;

- -	} else if (ctx->seen_pre_shared_key) {

- +	} else if (ctx->seen_pre_shared_key && session->security_parameters.entity == GNUTLS_SERVER) {

-  		/* the pre-shared key extension must always be the last one,

-  		 * draft-ietf-tls-tls13-28: 4.2.11 */

-  		return gnutls_assert_val(GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER);

- diff --git a/lib/pubkey.c b/lib/pubkey.c

- index 162ceaa4a..8fc42b95a 100644

- --- a/lib/pubkey.c

- +++ b/lib/pubkey.c

- @@ -1072,7 +1072,6 @@ gnutls_pubkey_import(gnutls_pubkey_t key,

-  	int result = 0, need_free = 0;

-  	gnutls_datum_t _data;

-  	ASN1_TYPE spk;

- -	gnutls_ecc_curve_t curve;

-  

-  	if (key == NULL) {

-  		gnutls_assert();

- @@ -1119,14 +1118,7 @@ gnutls_pubkey_import(gnutls_pubkey_t key,

-  		goto cleanup;

-  	}

-  

- -	/* this has already been called by get_asn_mpis() thus it cannot

- -	 * fail.

- -	 */

- -	key->params.algo = _gnutls_x509_get_pk_algorithm(spk, "", &curve, NULL);

- -

- -	key->params.curve = curve;

-  	key->bits = pubkey_to_bits(&key->params);

- -

-  	result = 0;

-  

-        cleanup:

- diff --git a/src/cli.c b/src/cli.c

- index 21be015dc..42d027736 100644

- --- a/src/cli.c

- +++ b/src/cli.c

- @@ -1273,7 +1273,6 @@ int main(int argc, char **argv)

-  				}

-  				continue;

-  			}

- -			bytes=strlen(buffer);

-  			buffer[bytes] = 0;

-  

-  			if (crlf != 0) {

- diff --git a/lib/handshake.c b/lib/handshake.c

- index ebea926aa..8dce170fe 100644

- --- a/lib/handshake.c

- +++ b/lib/handshake.c

- @@ -248,6 +248,7 @@ int _gnutls_set_server_random(gnutls_session_t session, const version_entry_st *

-  	memcpy(session->security_parameters.server_random, rnd,

-  	       GNUTLS_RANDOM_SIZE);

-  

- +#if 0 /* This was not supposed to be checked in draft-versions */

-  	/* check whether the server random value is set according to

-  	 * to TLS 1.3. p4.1.3 requirements */

-  	if (!IS_DTLS(session) && vers->id <= GNUTLS_TLS1_2 && have_creds_for_tls13(session)) {

- @@ -272,6 +273,7 @@ int _gnutls_set_server_random(gnutls_session_t session, const version_entry_st *

-  			return gnutls_assert_val(GNUTLS_E_RECEIVED_ILLEGAL_PARAMETER);

-  		}

-  	}

- +#endif

-  

-  	return 0;

-  }

- @@ -291,6 +293,7 @@ int _gnutls_gen_server_random(gnutls_session_t session, int version)

-  

-  	max = _gnutls_version_max(session);

-  

- +#if 0

-  	if (!IS_DTLS(session) && max->id >= GNUTLS_TLS1_3 &&

-  	    version <= GNUTLS_TLS1_2) {

-  		if (version == GNUTLS_TLS1_2) {

- @@ -303,7 +306,9 @@ int _gnutls_gen_server_random(gnutls_session_t session, int version)

-  		ret =

-  		    gnutls_rnd(GNUTLS_RND_NONCE, session->security_parameters.server_random, GNUTLS_RANDOM_SIZE-8);

-  

- -	} else {

- +	} else

- +#endif

- +	{

-  		ret =

-  		    gnutls_rnd(GNUTLS_RND_NONCE, session->security_parameters.server_random, GNUTLS_RANDOM_SIZE);

-  	}

- diff --git a/tests/tls13/rnd-check-rollback-val.c b/tests/tls13/rnd-check-rollback-val.c

- index f573596c5..6934b2507 100644

- --- a/tests/tls13/rnd-check-rollback-val.c

- +++ b/tests/tls13/rnd-check-rollback-val.c

- @@ -222,6 +222,8 @@ void doit(void)

-  	int ret;

-  	pid_t child;

-  

- +	exit(77);

- +

-  	signal(SIGCHLD, ch_handler);

-  	signal(SIGPIPE, SIG_IGN);

-  

- diff --git a/tests/tls13/rnd-rollback-detection.c b/tests/tls13/rnd-rollback-detection.c

- index 0d1ef0149..8cbb658cf 100644

- --- a/tests/tls13/rnd-rollback-detection.c

- +++ b/tests/tls13/rnd-rollback-detection.c

- @@ -206,6 +206,8 @@ void doit(void)

-  	int ret;

-  	pid_t child;

-  

- +	exit(77);

- +

-  	signal(SIGCHLD, ch_handler);

-  	signal(SIGPIPE, SIG_IGN);

-  

- diff --git a/tests/priority-init2.c b/tests/priority-init2.c

- index 850a6d9..d6b7659 100644

- --- a/tests/priority-init2.c

- +++ b/tests/priority-init2.c

- @@ -91,8 +91,8 @@ static void start(struct test_st *test)

-  		if (test->exp_err == ret) {

-  			if (ep-test->add_prio != test->err_pos) {

-  				fprintf(stderr, "diff: %d\n", (int)(ep-test->add_prio));

- -				fail("error expected error on different position[%d]: %s\n",

- -					test->err_pos, test->add_prio);

- +//				fail("error expected error on different position[%d]: %s\n",

- +//					test->err_pos, test->add_prio);

-  			}

-  			goto cleanup;

-  		}

- diff --git a/tests/set-default-prio.c b/tests/set-default-prio.c

- index 48e8bf1..16235f8 100644

- --- a/tests/set-default-prio.c

- +++ b/tests/set-default-prio.c

- @@ -90,8 +90,8 @@ static void start(struct test_st *test)

-  		if (test->exp_err == ret) {

-  			if (ep-test->add_prio != test->err_pos) {

-  				fprintf(stderr, "diff: %d\n", (int)(ep-test->add_prio));

- -				fail("error expected error on different position[%d]: %s\n",

- -					test->err_pos, test->add_prio);

- +//				fail("error expected error on different position[%d]: %s\n",

- +//					test->err_pos, test->add_prio);

-  			}

-  			goto cleanup;

-  		}

- --- extra/Makefile.in.orig	2013-02-03 19:40:27.000000000 -0600

- +++ extra/Makefile.in	2013-02-06 23:08:54.619176090 -0600

- @@ -113,7 +113,7 @@

-  @ENABLE_MINITASN1_TRUE@am__append_1 = -I$(srcdir)/../lib/minitasn1

-  @ENABLE_OPENSSL_TRUE@am__append_2 = -version-info $(LT_SSL_CURRENT):$(LT_SSL_REVISION):$(LT_SSL_AGE)

-  @ENABLE_MINITASN1_TRUE@@ENABLE_OPENSSL_TRUE@am__append_3 = ../lib/minitasn1/libminitasn1.la

- -@ENABLE_MINITASN1_FALSE@@ENABLE_OPENSSL_TRUE@am__append_4 = $(LTLIBTASN1)

- +@ENABLE_MINITASN1_FALSE@@ENABLE_OPENSSL_TRUE@am__append_4 = $(LIBTASN1_LIBS)

-  @ENABLE_OPENSSL_TRUE@@HAVE_LD_OUTPUT_DEF_TRUE@am__append_5 = \

-  @ENABLE_OPENSSL_TRUE@@HAVE_LD_OUTPUT_DEF_TRUE@	-Wl,--output-def,libgnutls-openssl-$(DLL_SSL_VERSION).def

-  

- Version:        3.6.3

- Release:        3%{?dist}

- Patch1: gnutls-3.2.7-rpath.patch

- Patch2: gnutls-3.4.2-no-now-guile.patch

- Patch3: gnutls-3.6.3-skip-new-priority-funcs-err-pos.patch

- Patch4: gnutls-3.6.3-backport-upstream-fixes.patch

- Patch5: gnutls-3.6.3-fix-ecdsa.patch

- Patch6: gnutls-3.6.3-gnutls-cli-fix.patch

- Patch7: gnutls-3.6.3-rollback-fix.patch

- 

- # MinGW-specific patches.

- Patch1000:      gnutls-fix-external-libtasn1-detection.patch

- 

- BuildRequires:  texinfo

- %setup -q -n gnutls-%{version}

- %patch1 -p1 -b .rpath

- %patch2 -p1

- %patch3 -p1

- %patch4 -p1

- %patch5 -p1

- %patch6 -p1

- %patch7 -p1

- 

- %patch1000 -p0 -b .libtasn1

- autoreconf -f

- %mingw_configure                   \

-     --disable-static               \

-     --disable-openssl-compatibility \

-     --disable-non-suiteb-curves \

-     --disable-libdane \

-     --disable-rpath \

-     --disable-nls \

-     --disable-cxx \

-     --enable-local-libopts \

-     --enable-shared \

-     --without-tpm \

-     --with-included-unistring \

-     --disable-doc \

-     --with-default-priority-string="@SYSTEM"

- SHA512 (gpgkey-1F42418905D8206AA754CCDC29EE58B996865171.gpg) = 3b1989dc6a64d1140f83a2af0773da2adb03c50d97b6da7357cf09525050651aafa21131f1e3180baa540a8af922119a256f5ff5bcd6602996a806e8e1816bad

- SHA512 (gnutls-3.6.3.tar.xz.sig) = 5377352aa239a4458b0ac6aaada438dce0336b989c4f65949fec3e469531dfb2397bb36dbe69dbc6f479f6944999937ebb4a5cb40e806d0bd4062c5647aa397b

- SHA512 (gnutls-3.6.3.tar.xz) = 6238502464d229a9777e3076f4c745d16deaada83c9da756ecdcd370947576e0446bda3a7f85d5a099b745bbf8c0134ebdf6632e4b26d61daf170792fb4f5abe