gnutls/gnutls-3.1.10-noecc.patch

diff -up gnutls-3.1.10/lib/algorithms/kx.c.noecc gnutls-3.1.10/lib/algorithms/kx.c
--- gnutls-3.1.10/lib/algorithms/kx.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/algorithms/kx.c	2013-03-25 13:42:15.555309960 +0100
@@ -29,9 +29,11 @@
 extern mod_auth_st rsa_auth_struct;
 extern mod_auth_st rsa_export_auth_struct;
 extern mod_auth_st dhe_rsa_auth_struct;
+#ifdef ENABLE_ECC
 extern mod_auth_st ecdhe_rsa_auth_struct;
 extern mod_auth_st ecdhe_psk_auth_struct;
 extern mod_auth_st ecdhe_ecdsa_auth_struct;
+#endif
 extern mod_auth_st dhe_dss_auth_struct;
 extern mod_auth_st anon_auth_struct;
 extern mod_auth_st anon_ecdh_auth_struct;
diff -up gnutls-3.1.10/lib/algorithms/publickey.c.noecc gnutls-3.1.10/lib/algorithms/publickey.c
--- gnutls-3.1.10/lib/algorithms/publickey.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/algorithms/publickey.c	2013-03-25 13:42:15.555309960 +0100
@@ -50,8 +50,10 @@ static const gnutls_pk_map pk_mappings[]
   {GNUTLS_KX_RSA_EXPORT, GNUTLS_PK_RSA, CIPHER_SIGN},
   {GNUTLS_KX_DHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
   {GNUTLS_KX_SRP_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
+#ifdef ENABLE_ECC
   {GNUTLS_KX_ECDHE_RSA, GNUTLS_PK_RSA, CIPHER_SIGN},
   {GNUTLS_KX_ECDHE_ECDSA, GNUTLS_PK_EC, CIPHER_SIGN},
+#endif
   {GNUTLS_KX_DHE_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
   {GNUTLS_KX_SRP_DSS, GNUTLS_PK_DSA, CIPHER_SIGN},
   {0, 0, 0}
@@ -97,7 +99,9 @@ static const gnutls_pk_entry pk_algorith
   {"DSA", PK_DSA_OID, GNUTLS_PK_DSA},
   {"GOST R 34.10-2001", PK_GOST_R3410_2001_OID, GNUTLS_PK_UNKNOWN},
   {"GOST R 34.10-94", PK_GOST_R3410_94_OID, GNUTLS_PK_UNKNOWN},
+#ifdef ENABLE_ECC
   {"EC", "1.2.840.10045.2.1", GNUTLS_PK_EC},
+#endif
   {0, 0, 0}
 };
 
diff -up gnutls-3.1.10/lib/algorithms/sign.c.noecc gnutls-3.1.10/lib/algorithms/sign.c
--- gnutls-3.1.10/lib/algorithms/sign.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/algorithms/sign.c	2013-03-25 13:42:15.556309982 +0100
@@ -43,6 +43,14 @@ typedef struct gnutls_sign_entry gnutls_
 #define TLS_SIGN_AID_UNKNOWN {255, 255}
 static const sign_algorithm_st unknown_tls_aid = TLS_SIGN_AID_UNKNOWN;
 
+#ifndef ENABLE_ECC
+#define GNUTLS_SIGN_ECDSA_SHA1 0
+#define GNUTLS_SIGN_ECDSA_SHA224 0
+#define GNUTLS_SIGN_ECDSA_SHA256 0
+#define GNUTLS_SIGN_ECDSA_SHA384 0
+#define GNUTLS_SIGN_ECDSA_SHA512 0
+#endif
+
 static const gnutls_sign_entry sign_algorithms[] = {
   {"RSA-SHA1", SIG_RSA_SHA1_OID, GNUTLS_SIGN_RSA_SHA1, GNUTLS_PK_RSA,
    GNUTLS_DIG_SHA1, {2, 1}},
diff -up gnutls-3.1.10/lib/auth/cert.c.noecc gnutls-3.1.10/lib/auth/cert.c
--- gnutls-3.1.10/lib/auth/cert.c.noecc	2013-03-21 21:45:47.000000000 +0100
+++ gnutls-3.1.10/lib/auth/cert.c	2013-03-25 13:42:15.557310003 +0100
@@ -63,7 +63,11 @@ static gnutls_privkey_t alloc_and_load_p
                                                    key, int deinit);
 #endif
 
+#ifdef ENABLE_ECC
 #define MAX_CLIENT_SIGN_ALGOS 3
+#else
+#define MAX_CLIENT_SIGN_ALGOS 2
+#endif
 #define CERTTYPE_SIZE (MAX_CLIENT_SIGN_ALGOS+1)
 typedef enum CertificateSigType
 { RSA_SIGN = 1, DSA_SIGN = 2, ECDSA_SIGN = 64
@@ -1438,8 +1442,10 @@ _gnutls_check_supported_sign_algo (Certi
       return GNUTLS_PK_RSA;
     case DSA_SIGN:
       return GNUTLS_PK_DSA;
+#ifdef ENABLE_ECC
     case ECDSA_SIGN:
       return GNUTLS_PK_EC;
+#endif
     }
 
   return -1;
@@ -1726,7 +1732,9 @@ _gnutls_gen_cert_server_cert_req (gnutls
   tmp_data[0] = CERTTYPE_SIZE - 1;
   tmp_data[1] = RSA_SIGN;
   tmp_data[2] = DSA_SIGN;
+#ifdef ENABLE_ECC
   tmp_data[3] = ECDSA_SIGN;     /* only these for now */
+#endif
 
   ret = _gnutls_buffer_append_data (data, tmp_data, CERTTYPE_SIZE);
   if (ret < 0)
diff -up gnutls-3.1.10/lib/auth/dhe_psk.c.noecc gnutls-3.1.10/lib/auth/dhe_psk.c
--- gnutls-3.1.10/lib/auth/dhe_psk.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/auth/dhe_psk.c	2013-03-25 14:01:30.470454582 +0100
@@ -92,6 +92,7 @@ const mod_auth_st ecdhe_psk_auth_struct
 };
 #endif
 
+#ifdef ENABLE_ECDHE
 static int
 gen_ecdhe_psk_client_kx (gnutls_session_t session, gnutls_buffer_st* data)
 {
@@ -135,6 +136,7 @@ cleanup:
 
   return ret;
 }
+#endif
 
 static int
 gen_dhe_psk_client_kx (gnutls_session_t session, gnutls_buffer_st* data)
@@ -230,6 +232,7 @@ gen_dhe_psk_server_kx (gnutls_session_t
   return ret;
 }
 
+#ifdef ENABLE_ECDHE
 static int
 gen_ecdhe_psk_server_kx (gnutls_session_t session, gnutls_buffer_st* data)
 {
@@ -254,7 +257,7 @@ gen_ecdhe_psk_server_kx (gnutls_session_
 
   return ret;
 }
-
+#endif
 
 static int
 proc_dhe_psk_client_kx (gnutls_session_t session, uint8_t * data,
@@ -335,6 +338,7 @@ proc_dhe_psk_client_kx (gnutls_session_t
 
 }
 
+#ifdef ENABLE_ECDHE
 static int
 proc_ecdhe_psk_client_kx (gnutls_session_t session, uint8_t * data,
                     size_t _data_size)
@@ -399,6 +403,7 @@ proc_ecdhe_psk_client_kx (gnutls_session
   
   return ret;
 }
+#endif
 
 static int
 proc_dhe_psk_server_kx (gnutls_session_t session, uint8_t * data,
@@ -432,6 +437,7 @@ proc_dhe_psk_server_kx (gnutls_session_t
   return 0;
 }
 
+#ifdef ENABLE_ECDHE
 static int
 proc_ecdhe_psk_server_kx (gnutls_session_t session, uint8_t * data,
                     size_t _data_size)
@@ -463,5 +469,6 @@ proc_ecdhe_psk_server_kx (gnutls_session
 
   return 0;
 }
+#endif
 
 #endif /* ENABLE_PSK */
diff -up gnutls-3.1.10/lib/ext/ecc.c.noecc gnutls-3.1.10/lib/ext/ecc.c
--- gnutls-3.1.10/lib/ext/ecc.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/ext/ecc.c	2013-03-25 13:42:20.746422026 +0100
@@ -35,6 +35,7 @@
 /* Maps record size to numbers according to the
  * extensions draft.
  */
+#ifdef ENABLE_ECC
 
 static int _gnutls_supported_ecc_recv_params (gnutls_session_t session,
                                           const uint8_t * data,
@@ -269,3 +270,5 @@ _gnutls_session_supports_ecc_curve (gnut
 
   return GNUTLS_E_ECC_UNSUPPORTED_CURVE;
 }
+
+#endif
diff -up gnutls-3.1.10/lib/gnutls_extensions.c.noecc gnutls-3.1.10/lib/gnutls_extensions.c
--- gnutls-3.1.10/lib/gnutls_extensions.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/gnutls_extensions.c	2013-03-25 13:42:20.747422053 +0100
@@ -350,6 +350,7 @@ _gnutls_ext_init (void)
   if (ret != GNUTLS_E_SUCCESS)
     return ret;
 
+#ifdef ENABLE_ECC
   ret = _gnutls_ext_register (&ext_mod_supported_ecc);
   if (ret != GNUTLS_E_SUCCESS)
     return ret;
@@ -357,6 +358,7 @@ _gnutls_ext_init (void)
   ret = _gnutls_ext_register (&ext_mod_supported_ecc_pf);
   if (ret != GNUTLS_E_SUCCESS)
     return ret;
+#endif
 
   ret = _gnutls_ext_register (&ext_mod_sig);
   if (ret != GNUTLS_E_SUCCESS)
diff -up gnutls-3.1.10/lib/gnutls_priority.c.noecc gnutls-3.1.10/lib/gnutls_priority.c
--- gnutls-3.1.10/lib/gnutls_priority.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/gnutls_priority.c	2013-03-25 13:42:20.747422053 +0100
@@ -245,35 +245,45 @@ gnutls_certificate_type_set_priority (gn
 }
 
 static const int supported_ecc_normal[] = {
+#ifdef ENABLE_ECC
   GNUTLS_ECC_CURVE_SECP192R1,
   GNUTLS_ECC_CURVE_SECP224R1,
   GNUTLS_ECC_CURVE_SECP256R1,
   GNUTLS_ECC_CURVE_SECP384R1,
   GNUTLS_ECC_CURVE_SECP521R1,
+#endif
   0
 };
 
 static const int supported_ecc_secure128[] = {
+#ifdef ENABLE_ECC
   GNUTLS_ECC_CURVE_SECP256R1,
   GNUTLS_ECC_CURVE_SECP384R1,
   GNUTLS_ECC_CURVE_SECP521R1,
+#endif
   0
 };
 
 static const int supported_ecc_suiteb128[] = {
+#ifdef ENABLE_ECC
   GNUTLS_ECC_CURVE_SECP256R1,
   GNUTLS_ECC_CURVE_SECP384R1,
+#endif
   0
 };
 
 static const int supported_ecc_suiteb192[] = {
+#ifdef ENABLE_ECC
   GNUTLS_ECC_CURVE_SECP384R1,
+#endif
   0
 };
 
 static const int supported_ecc_secure192[] = {
+#ifdef ENABLE_ECC
   GNUTLS_ECC_CURVE_SECP384R1,
   GNUTLS_ECC_CURVE_SECP521R1,
+#endif
   0
 };
 
@@ -455,51 +465,75 @@ static const int comp_priority[] = {
 static const int sign_priority_default[] = {
   GNUTLS_SIGN_RSA_SHA256,
   GNUTLS_SIGN_DSA_SHA256,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA256,
+#endif
 
   GNUTLS_SIGN_RSA_SHA384,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA384,
+#endif
 
   GNUTLS_SIGN_RSA_SHA512,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA512,
+#endif
 
   GNUTLS_SIGN_RSA_SHA224,
   GNUTLS_SIGN_DSA_SHA224,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA224,
+#endif
 
   GNUTLS_SIGN_RSA_SHA1,
   GNUTLS_SIGN_DSA_SHA1,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA1,
+#endif
   0
 };
 
 static const int sign_priority_suiteb128[] = {
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA256,
   GNUTLS_SIGN_ECDSA_SHA384,
+#endif
   0
 };
 
 static const int sign_priority_suiteb192[] = {
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA384,
+#endif
   0
 };
 
 static const int sign_priority_secure128[] = {
   GNUTLS_SIGN_RSA_SHA256,
   GNUTLS_SIGN_DSA_SHA256,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA256,
+#endif
   GNUTLS_SIGN_RSA_SHA384,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA384,
+#endif
   GNUTLS_SIGN_RSA_SHA512,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA512,
+#endif
   0
 };
 
 static const int sign_priority_secure192[] = {
   GNUTLS_SIGN_RSA_SHA384,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA384,
+#endif
   GNUTLS_SIGN_RSA_SHA512,
+#ifdef ENABLE_ECC
   GNUTLS_SIGN_ECDSA_SHA512,
+#endif
   0
 };
 
diff -up gnutls-3.1.10/lib/nettle/init.c.noecc gnutls-3.1.10/lib/nettle/init.c
--- gnutls-3.1.10/lib/nettle/init.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/nettle/init.c	2013-03-25 13:42:20.748422080 +0100
@@ -32,7 +32,11 @@
 int
 gnutls_crypto_init (void)
 {
+#ifdef ENABLE_ECC
   return ecc_wmnaf_cache_init();
+#else
+  return 0;
+#endif
 }
 
 /* Functions that refer to the deinitialization of the nettle library.
@@ -41,5 +45,7 @@ gnutls_crypto_init (void)
 void
 gnutls_crypto_deinit (void)
 {
+#ifdef ENABLE_ECC
   ecc_wmnaf_cache_free();
+#endif
 }
diff -up gnutls-3.1.10/lib/nettle/Makefile.am.noecc gnutls-3.1.10/lib/nettle/Makefile.am
--- gnutls-3.1.10/lib/nettle/Makefile.am.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/nettle/Makefile.am	2013-03-25 13:42:20.748422080 +0100
@@ -33,9 +33,13 @@ endif
 
 noinst_LTLIBRARIES = libcrypto.la
 
+#if ENABLE_ECC
+#ECC_SOURCES = ecc_free.c ecc.h ecc_make_key.c ecc_shared_secret.c \
+#	ecc_map.c ecc_mulmod.c ecc_mulmod_cached.c \
+#	ecc_points.c ecc_projective_dbl_point_3.c ecc_projective_isneutral.c \
+#	ecc_projective_check_point.c ecc_projective_negate_point.c \
+#	ecc_projective_add_point_ng.c ecc_sign_hash.c ecc_verify_hash.c
+#endif
+
 libcrypto_la_SOURCES = pk.c mpi.c mac.c cipher.c rnd.c init.c egd.c egd.h \
-	multi.c wmnaf.c ecc_free.c ecc.h ecc_make_key.c ecc_shared_secret.c \
-	ecc_map.c ecc_mulmod.c ecc_mulmod_cached.c \
-	ecc_points.c ecc_projective_dbl_point_3.c ecc_projective_isneutral.c \
-	ecc_projective_check_point.c ecc_projective_negate_point.c \
-	ecc_projective_add_point_ng.c ecc_sign_hash.c ecc_verify_hash.c gnettle.h 
+	multi.c wmnaf.c $(ECC_SOURCES) gnettle.h 
diff -up gnutls-3.1.10/lib/nettle/pk.c.noecc gnutls-3.1.10/lib/nettle/pk.c
--- gnutls-3.1.10/lib/nettle/pk.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/lib/nettle/pk.c	2013-03-25 13:42:20.749422119 +0100
@@ -137,6 +137,7 @@ static int _wrap_nettle_pk_derive(gnutls
 
   switch (algo)
     {
+#ifdef ENABLE_ECC
     case GNUTLS_PK_EC:
       {
         ecc_key ecc_pub, ecc_priv;
@@ -182,6 +183,7 @@ ecc_cleanup:
         out->size = sz;
         break;
       }
+#endif
     default:
       gnutls_assert ();
       ret = GNUTLS_E_INTERNAL_ERROR;
@@ -326,6 +328,7 @@ _wrap_nettle_pk_sign (gnutls_pk_algorith
 
   switch (algo)
     {
+#ifdef ENABLE_ECC
     case GNUTLS_PK_EC: /* we do ECDSA */
       {
         ecc_key priv;
@@ -369,6 +372,7 @@ _wrap_nettle_pk_sign (gnutls_pk_algorith
           }
         break;
       }
+#endif
     case GNUTLS_PK_DSA:
       {
         struct dsa_public_key pub;
@@ -470,6 +474,7 @@ _wrap_nettle_pk_verify (gnutls_pk_algori
 
   switch (algo)
     {
+#ifdef ENABLE_ECC
     case GNUTLS_PK_EC: /* ECDSA */
       {
         ecc_key pub;
@@ -509,6 +514,7 @@ _wrap_nettle_pk_verify (gnutls_pk_algori
         _ecc_params_clear( &pub);
         break;
       }
+#endif
     case GNUTLS_PK_DSA:
       {
         struct dsa_public_key pub;
@@ -705,6 +711,7 @@ rsa_fail:
 
         break;
       }
+#ifdef ENABLE_ECC
     case GNUTLS_PK_EC:
       {
         ecc_key key;
@@ -758,6 +765,7 @@ ecc_fail:
 
         break;
       }
+#endif
     default:
       gnutls_assert ();
       return GNUTLS_E_INVALID_REQUEST;
@@ -874,6 +882,7 @@ dsa_cleanup:
       }
 
       break;
+#ifdef ENABLE_ECC
     case GNUTLS_PK_EC:
       {
         int curve = params->flags;
@@ -923,6 +932,7 @@ ecc_cleanup:
         ecc_del_point(R);
       }  
       break;
+#endif
     default:
       ret = gnutls_assert_val(GNUTLS_E_INVALID_REQUEST);
     }
diff -up gnutls-3.1.10/tests/cert-tests/dane.noecc gnutls-3.1.10/tests/cert-tests/dane
--- gnutls-3.1.10/tests/cert-tests/dane.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/cert-tests/dane	2013-03-25 13:42:20.749422119 +0100
@@ -22,6 +22,8 @@
 
 set -e
 
+exit 77
+
 srcdir=${srcdir:-.}
 DANETOOL=${DANETOOL:-../../src/danetool$EXEEXT}
 
diff -up gnutls-3.1.10/tests/dtls/dtls-nb.noecc gnutls-3.1.10/tests/dtls/dtls-nb
--- gnutls-3.1.10/tests/dtls/dtls-nb.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/dtls/dtls-nb	2013-03-25 13:42:20.749422119 +0100
@@ -22,9 +22,7 @@
 
 set -e
 
-if test "${WINDIR}" != "";then
-  exit 77
-fi
+exit 77
 
 ./dtls-stress -nb -shello 021 -sfinished 01 -cfinished 012 SKeyExchange CKeyExchange CFinished
 ./dtls-stress -nb -shello 012 -sfinished 10 -cfinished 210 SHello SKeyExchange SHelloDone
diff -up gnutls-3.1.10/tests/dtls/dtls.noecc gnutls-3.1.10/tests/dtls/dtls
--- gnutls-3.1.10/tests/dtls/dtls.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/dtls/dtls	2013-03-25 13:42:20.749422119 +0100
@@ -22,9 +22,7 @@
 
 set -e
 
-if test "${WINDIR}" != "";then
-  exit 77
-fi
+exit 77
 
 ./dtls-stress -shello 021 -sfinished 01 -cfinished 012 SKeyExchange CKeyExchange CFinished
 ./dtls-stress -shello 012 -sfinished 10 -cfinished 210 SHello SKeyExchange SHelloDone
diff -up gnutls-3.1.10/tests/ecdsa/ecdsa.noecc gnutls-3.1.10/tests/ecdsa/ecdsa
--- gnutls-3.1.10/tests/ecdsa/ecdsa.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/ecdsa/ecdsa	2013-03-25 13:42:20.750422152 +0100
@@ -22,6 +22,8 @@
 
 #set -e
 
+exit 77
+
 srcdir=${srcdir:-.}
 CERTTOOL=${CERTTOOL:-../../src/certtool$EXEEXT}
 
diff -up gnutls-3.1.10/tests/mini-dtls-record.c.noecc gnutls-3.1.10/tests/mini-dtls-record.c
--- gnutls-3.1.10/tests/mini-dtls-record.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/mini-dtls-record.c	2013-03-25 13:42:20.750422152 +0100
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_ECC)
 
 int
 main ()
diff -up gnutls-3.1.10/tests/mini-dtls-rehandshake.c.noecc gnutls-3.1.10/tests/mini-dtls-rehandshake.c
--- gnutls-3.1.10/tests/mini-dtls-rehandshake.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/mini-dtls-rehandshake.c	2013-03-25 13:42:20.750422152 +0100
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_ECC)
 
 int main()
 {
diff -up gnutls-3.1.10/tests/mini-dtls-srtp.c.noecc gnutls-3.1.10/tests/mini-dtls-srtp.c
--- gnutls-3.1.10/tests/mini-dtls-srtp.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/mini-dtls-srtp.c	2013-03-25 13:42:20.751422175 +0100
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32) || !defined(ENABLE_DTLS_SRTP)
+#if defined(_WIN32) || !defined(ENABLE_DTLS_SRTP) || !defined(ENABLE_ECC)
 
 int
 main (int argc, char** argv)
diff -up gnutls-3.1.10/tests/mini-handshake-timeout.c.noecc gnutls-3.1.10/tests/mini-handshake-timeout.c
--- gnutls-3.1.10/tests/mini-handshake-timeout.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/mini-handshake-timeout.c	2013-03-25 13:42:20.751422175 +0100
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_ECC)
 
 int main()
 {
@@ -142,7 +142,11 @@ initialize_tls_session (gnutls_session_t
   /* avoid calling all the priority functions, since the defaults
    * are adequate.
    */
-  gnutls_priority_set_direct (*session, "NORMAL:+ANON-ECDH", NULL);
+#ifdef ENABLE_ECC
+  gnutls_priority_set_direct (session, "NORMAL:+ANON-ECDH", NULL);
+#else
+  gnutls_priority_set_direct (session, "NORMAL:+ANON-DH", NULL);
+#endif
 }
 
 static void
diff -up gnutls-3.1.10/tests/mini-loss-time.c.noecc gnutls-3.1.10/tests/mini-loss-time.c
--- gnutls-3.1.10/tests/mini-loss-time.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/mini-loss-time.c	2013-03-25 13:42:20.751422175 +0100
@@ -28,7 +28,7 @@
 #include <stdlib.h>
 #include <string.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_ECC)
 
 int main()
 {
diff -up gnutls-3.1.10/tests/mini-record.c.noecc gnutls-3.1.10/tests/mini-record.c
--- gnutls-3.1.10/tests/mini-record.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/mini-record.c	2013-03-25 13:42:20.751422175 +0100
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_ECC)
 
 int main()
 {
diff -up gnutls-3.1.10/tests/mini-xssl.c.noecc gnutls-3.1.10/tests/mini-xssl.c
--- gnutls-3.1.10/tests/mini-xssl.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/mini-xssl.c	2013-03-25 13:42:20.752422192 +0100
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_ECC)
 
 int main()
 {
diff -up gnutls-3.1.10/tests/pkcs12_simple.c.noecc gnutls-3.1.10/tests/pkcs12_simple.c
--- gnutls-3.1.10/tests/pkcs12_simple.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/pkcs12_simple.c	2013-03-25 13:42:20.752422192 +0100
@@ -50,6 +50,10 @@ doit (void)
   gnutls_x509_privkey_t pkey;
   int ret;
 
+#ifndef ENABLE_ECC
+  exit(77);
+#endif
+
   ret = gnutls_global_init ();
   if (ret < 0)
     fail ("gnutls_global_init failed %d\n", ret);
diff -up gnutls-3.1.10/tests/slow/keygen.c.noecc gnutls-3.1.10/tests/slow/keygen.c
--- gnutls-3.1.10/tests/slow/keygen.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/slow/keygen.c	2013-03-25 13:42:20.752422192 +0100
@@ -65,6 +65,11 @@ doit (void)
                 if (algorithm == GNUTLS_PK_DH)
                     continue;
 
+#ifndef ENABLE_ECC
+                if (algorithm == GNUTLS_PK_EC)
+                    continue;
+#endif
+
                 ret = gnutls_x509_privkey_init (&pkey);
                 if (ret < 0)
                   {
diff -up gnutls-3.1.10/tests/srp/mini-srp.c.noecc gnutls-3.1.10/tests/srp/mini-srp.c
--- gnutls-3.1.10/tests/srp/mini-srp.c.noecc	2013-03-21 21:42:28.000000000 +0100
+++ gnutls-3.1.10/tests/srp/mini-srp.c	2013-03-25 13:42:20.753422209 +0100
@@ -27,7 +27,7 @@
 #include <stdio.h>
 #include <stdlib.h>
 
-#if defined(_WIN32)
+#if defined(_WIN32) || !defined(ENABLE_SRP)
 
 int main()
 {