some minor updates

14 files changed, 58 insertions, 50 deletions

diff --git a/configure.in b/configure.in
index 8cad54485e..2d85e28a84 100644
--- a/configure.in
+++ b/configure.in
@@ -57,7 +57,7 @@ AC_MSG_RESULT($opt_maintainer_mode)
 opt_profiler_mode=no
 AC_MSG_CHECKING([whether in profile mode])
 AC_ARG_ENABLE(profile-mode,
-[  --enable-profile-mode enable profiler (gcov)],
+[  --enable-profile-mode enable profiler (gcov/gprof)],
 opt_profiler_mode=$enableval)
 AC_MSG_RESULT($opt_profiler_mode)
 
@@ -99,7 +99,7 @@ LIBS="${LIBS} -lmhash")])
 if test $ac_cv_prog_gcc != no; then
 
 	if test $opt_profiler_mode = yes; then
-	  CFLAGS="${CFLAGS} -O0 -fprofile-arcs -ftest-coverage"
+	  CFLAGS="${CFLAGS} -O0 -fprofile-arcs -ftest-coverage -pg"
 	else
 	  CFLAGS="${CFLAGS} -O2 -ffast-math"
 	fi
diff --git a/doc/API b/doc/API
index 49e50b419d..02f5b08bc8 100644
--- a/doc/API
+++ b/doc/API
@@ -77,6 +77,9 @@ void gnutls_set_cipher_priority( GNUTLS_STATE state, int num, ...);
 	Sets the priority on the ciphers supported by gnutls. The num
 	is the number of the ciphers specified. After num you should
 	specify the ciphers you want.
+	Note that the priority is set on the client. The server does
+	not use that except for disabling algorithms that were not
+	specified.
 
 void gnutls_set_kx_priority( GNUTLS_STATE state, int num, ...);
 	like gnutls_set_cipher_priority, but for key exchange methods.
diff --git a/doc/TODO b/doc/TODO
index b6af153a06..e8b395c355 100644
--- a/doc/TODO
+++ b/doc/TODO
@@ -3,4 +3,4 @@
 * Make server work (we need certificate API for that!)
 * Add support for v2.0 init packet (why do that anyway ???)
 * Resume old sessions (server side)
-
+* Non-blocking IO support (send mail to gnutls-dev@gnupg.org if you are interested/want to help)
diff --git a/lib/gnutls.c b/lib/gnutls.c
index 1a1d590365..01a5e7948c 100644
--- a/lib/gnutls.c
+++ b/lib/gnutls.c
@@ -61,9 +61,9 @@ int gnutls_init(GNUTLS_STATE * state, ConnectionEnd con_end)
 	(*state)->security_parameters.entity = con_end;
 
 /* Set the defaults (only to remind me that they should be allocated ) */
-	(*state)->security_parameters.bulk_cipher_algorithm = GNUTLS_NULL;
-	(*state)->security_parameters.mac_algorithm = GNUTLS_MAC_NULL;
-	(*state)->security_parameters.compression_algorithm = GNUTLS_COMPRESSION_NULL;
+	(*state)->security_parameters.bulk_cipher_algorithm = GNUTLS_NULL_CIPHER;
+	(*state)->security_parameters.mac_algorithm = GNUTLS_NULL_MAC;
+	(*state)->security_parameters.compression_algorithm = GNUTLS_NULL_COMPRESSION;
 
 	(*state)->connection_state.read_compression_state = NULL;
 	(*state)->connection_state.read_mac_secret = NULL;
@@ -109,7 +109,7 @@ int gnutls_init(GNUTLS_STATE * state, ConnectionEnd con_end)
 
 	/* Set default priorities */
 	gnutls_set_cipher_priority( (*state), 2, GNUTLS_RIJNDAEL, GNUTLS_3DES);
-	gnutls_set_compression_priority( (*state), 1, GNUTLS_COMPRESSION_NULL);
+	gnutls_set_compression_priority( (*state), 1, GNUTLS_NULL_COMPRESSION);
 	gnutls_set_kx_priority( (*state), 2, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA);
 	gnutls_set_mac_priority( (*state), 2, GNUTLS_MAC_SHA, GNUTLS_MAC_MD5);
 
diff --git a/lib/gnutls.h b/lib/gnutls.h
index 227778a24a..8e7fa20294 100644
--- a/lib/gnutls.h
+++ b/lib/gnutls.h
@@ -22,13 +22,13 @@ enum ContentType { GNUTLS_APPLICATION_DATA=23 };
 typedef enum ContentType ContentType;
 #define GNUTLS_AES GNUTLS_RIJNDAEL
 
-enum BulkCipherAlgorithm { GNUTLS_NULL, GNUTLS_ARCFOUR=1, GNUTLS_3DES = 4, GNUTLS_RIJNDAEL };
+enum BulkCipherAlgorithm { GNUTLS_NULL_CIPHER, GNUTLS_ARCFOUR=1, GNUTLS_3DES = 4, GNUTLS_RIJNDAEL };
 typedef enum BulkCipherAlgorithm BulkCipherAlgorithm;
 enum KXAlgorithm { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_DH_DSS, GNUTLS_KX_DH_RSA, GNUTLS_KX_ANON_DH };
 typedef enum KXAlgorithm KXAlgorithm;
-enum MACAlgorithm { GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA };
+enum MACAlgorithm { GNUTLS_NULL_MAC, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA };
 typedef enum MACAlgorithm MACAlgorithm;
-enum CompressionMethod { GNUTLS_COMPRESSION_NULL, GNUTLS_ZLIB=224 };
+enum CompressionMethod { GNUTLS_NULL_COMPRESSION, GNUTLS_ZLIB=224 };
 typedef enum CompressionMethod CompressionMethod;
 enum ConnectionEnd { GNUTLS_SERVER, GNUTLS_CLIENT };
 typedef enum ConnectionEnd ConnectionEnd;
diff --git a/lib/gnutls_algorithms.c b/lib/gnutls_algorithms.c
index cb62a8fd44..33b71eb077 100644
--- a/lib/gnutls_algorithms.c
+++ b/lib/gnutls_algorithms.c
@@ -69,7 +69,7 @@ static gnutls_cipher_entry algorithms[] = {
 #else
 	GNUTLS_CIPHER_ENTRY(GNUTLS_ARCFOUR, 1, 16, 0, 0),
 #endif
-	GNUTLS_CIPHER_ENTRY(GNUTLS_NULL, 1, 0, 0, 0),
+	GNUTLS_CIPHER_ENTRY(GNUTLS_NULL_CIPHER, 1, 0, 0, 0),
 	{0}
 };
 
@@ -94,7 +94,7 @@ typedef struct gnutls_hash_entry gnutls_hash_entry;
 static gnutls_hash_entry hash_algorithms[] = {
 	GNUTLS_HASH_ENTRY(GNUTLS_MAC_SHA, 20),
 	GNUTLS_HASH_ENTRY(GNUTLS_MAC_MD5, 16),
-	GNUTLS_HASH_ENTRY(GNUTLS_MAC_NULL, 0),
+	GNUTLS_HASH_ENTRY(GNUTLS_NULL_MAC, 0),
 	{0}
 };
 
@@ -117,7 +117,7 @@ struct gnutls_compression_entry {
 
 typedef struct gnutls_compression_entry gnutls_compression_entry;
 static gnutls_compression_entry compression_algorithms[] = {
-	GNUTLS_COMPRESSION_ENTRY(GNUTLS_COMPRESSION_NULL),
+	GNUTLS_COMPRESSION_ENTRY(GNUTLS_NULL_COMPRESSION),
 #ifdef HAVE_LIBZ
 	GNUTLS_COMPRESSION_ENTRY(GNUTLS_ZLIB),
 #endif
@@ -206,58 +206,58 @@ static gnutls_cipher_suite_entry cs_algorithms[] = {
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DH_anon_WITH_ARCFOUR_MD5,
 				  GNUTLS_ARCFOUR,
 				  GNUTLS_KX_ANON_DH, GNUTLS_MAC_MD5,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DH_anon_WITH_3DES_EDE_CBC_SHA,
 				  GNUTLS_3DES, GNUTLS_KX_ANON_DH,
 				  GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DH_DSS_WITH_3DES_EDE_CBC_SHA,
 				  GNUTLS_3DES,
 				  GNUTLS_KX_DH_DSS, GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DH_RSA_WITH_3DES_EDE_CBC_SHA,
 				  GNUTLS_3DES,
 				  GNUTLS_KX_DH_RSA, GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_DSS_WITH_3DES_EDE_CBC_SHA,
 				  GNUTLS_3DES, GNUTLS_KX_DHE_DSS,
 				  GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_RSA_WITH_3DES_EDE_CBC_SHA,
 				  GNUTLS_3DES, GNUTLS_KX_DHE_RSA,
 				  GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_WITH_ARCFOUR_SHA,
 				  GNUTLS_ARCFOUR,
 				  GNUTLS_KX_RSA, GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_WITH_ARCFOUR_MD5,
 				  GNUTLS_ARCFOUR,
 				  GNUTLS_KX_RSA, GNUTLS_MAC_MD5,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_WITH_3DES_EDE_CBC_SHA,
 				  GNUTLS_3DES,
 				  GNUTLS_KX_RSA, GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_RSA_WITH_RIJNDAEL_128_CBC_SHA,
 				  GNUTLS_RIJNDAEL, GNUTLS_KX_RSA,
 				  GNUTLS_MAC_SHA,
-				  GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DH_DSS_WITH_RIJNDAEL_128_CBC_SHA,
 				  GNUTLS_RIJNDAEL, GNUTLS_KX_DH_DSS,
-				  GNUTLS_MAC_SHA, GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_MAC_SHA, GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DH_RSA_WITH_RIJNDAEL_128_CBC_SHA,
 				  GNUTLS_RIJNDAEL, GNUTLS_KX_DH_RSA,
-				  GNUTLS_MAC_SHA, GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_MAC_SHA, GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_DSS_WITH_RIJNDAEL_128_CBC_SHA,
 				  GNUTLS_RIJNDAEL, GNUTLS_KX_DHE_DSS,
-				  GNUTLS_MAC_SHA, GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_MAC_SHA, GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DHE_RSA_WITH_RIJNDAEL_128_CBC_SHA,
 				  GNUTLS_RIJNDAEL, GNUTLS_KX_DHE_RSA,
-				  GNUTLS_MAC_SHA, GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_MAC_SHA, GNUTLS_NULL_COMPRESSION),
 	GNUTLS_CIPHER_SUITE_ENTRY(GNUTLS_DH_anon_WITH_RIJNDAEL_SHA,
 				  GNUTLS_RIJNDAEL, GNUTLS_KX_ANON_DH,
-				  GNUTLS_MAC_SHA, GNUTLS_COMPRESSION_NULL),
+				  GNUTLS_MAC_SHA, GNUTLS_NULL_COMPRESSION),
 	{0}
 };
 
diff --git a/lib/gnutls_cipher.c b/lib/gnutls_cipher.c
index 561aa38d88..0a3dd88da8 100644
--- a/lib/gnutls_cipher.c
+++ b/lib/gnutls_cipher.c
@@ -309,7 +309,7 @@ int _gnutls_connection_state_init(GNUTLS_STATE state)
 		if (state->connection_state.write_cipher_state ==
 		    GNUTLS_CIPHER_FAILED
 		    && state->security_parameters.bulk_cipher_algorithm !=
-		    GNUTLS_NULL) {
+		    GNUTLS_NULL_CIPHER) {
 			gnutls_assert();
 			return GNUTLS_E_UNKNOWN_CIPHER;
 		}
@@ -336,7 +336,7 @@ int _gnutls_connection_state_init(GNUTLS_STATE state)
 		if (state->connection_state.read_cipher_state ==
 		    GNUTLS_CIPHER_FAILED
 		    && state->security_parameters.bulk_cipher_algorithm !=
-		    GNUTLS_NULL) {
+		    GNUTLS_NULL_CIPHER) {
 			gnutls_assert();
 			return GNUTLS_E_UNKNOWN_CIPHER;
 		}
@@ -355,7 +355,7 @@ int _gnutls_connection_state_init(GNUTLS_STATE state)
 		if (state->connection_state.read_cipher_state ==
 		    GNUTLS_CIPHER_FAILED
 		    && state->security_parameters.bulk_cipher_algorithm !=
-		    GNUTLS_NULL) {
+		    GNUTLS_NULL_CIPHER) {
 			gnutls_assert();
 			return GNUTLS_E_UNKNOWN_CIPHER;
 		}
@@ -382,7 +382,7 @@ int _gnutls_connection_state_init(GNUTLS_STATE state)
 		if (state->connection_state.write_cipher_state ==
 		    GNUTLS_CIPHER_FAILED
 		    && state->security_parameters.bulk_cipher_algorithm !=
-		    GNUTLS_NULL) {
+		    GNUTLS_NULL_CIPHER) {
 			gnutls_assert();
 			return GNUTLS_E_UNKNOWN_CIPHER;
 		}
@@ -439,7 +439,7 @@ int _gnutls_TLSCompressed2TLSCiphertext(GNUTLS_STATE state,
 				     mac_secret_size);
 	}
 	if (td == GNUTLS_MAC_FAILED
-	    && state->security_parameters.mac_algorithm != GNUTLS_MAC_NULL) {
+	    && state->security_parameters.mac_algorithm != GNUTLS_NULL_MAC) {
 		gnutls_free(*cipher);
 		gnutls_free(content);
 		gnutls_assert();
@@ -579,7 +579,7 @@ int _gnutls_TLSCiphertext2TLSCompressed(GNUTLS_STATE state,
 				     mac_secret_size);
 	}
 	if (td == GNUTLS_MAC_FAILED
-	    && state->security_parameters.mac_algorithm != GNUTLS_MAC_NULL) {
+	    && state->security_parameters.mac_algorithm != GNUTLS_NULL_MAC) {
 		gnutls_free(*compress);
 		gnutls_free(content);
 		gnutls_assert();
diff --git a/lib/gnutls_cipher_int.c b/lib/gnutls_cipher_int.c
index d5cc0705ca..549db02462 100644
--- a/lib/gnutls_cipher_int.c
+++ b/lib/gnutls_cipher_int.c
@@ -28,7 +28,7 @@ GNUTLS_CIPHER_HANDLE gnutls_cipher_init( BulkCipherAlgorithm cipher, void* key,
 GNUTLS_CIPHER_HANDLE ret;
 
 	switch (cipher) {
-	case GNUTLS_NULL:
+	case GNUTLS_NULL_CIPHER:
 		ret = GNUTLS_CIPHER_FAILED;
 		break;
 	case GNUTLS_RIJNDAEL:
diff --git a/lib/gnutls_compress_int.c b/lib/gnutls_compress_int.c
index 5de2c01509..c175ab2e07 100644
--- a/lib/gnutls_compress_int.c
+++ b/lib/gnutls_compress_int.c
@@ -32,7 +32,7 @@ uLongf size;
 int err;
 
 	switch (algorithm) {
-	case GNUTLS_COMPRESSION_NULL:
+	case GNUTLS_NULL_COMPRESSION:
 		*compressed = gnutls_malloc(plain_size);
 		memmove(*compressed, plain, plain_size);
 		compressed_size = plain_size;
@@ -72,7 +72,7 @@ uLongf size;
 
 	if (compressed_size > MAX_COMP_SIZE) return GNUTLS_E_DECOMPRESSION_FAILED;
 	switch (algorithm) {
-	case GNUTLS_COMPRESSION_NULL:
+	case GNUTLS_NULL_COMPRESSION:
 		*plain = gnutls_malloc(compressed_size);
 		memmove(*plain, compressed, compressed_size);
 		plain_size = compressed_size;
diff --git a/lib/gnutls_hash_int.c b/lib/gnutls_hash_int.c
index 7cd808d4c3..724f0b8859 100644
--- a/lib/gnutls_hash_int.c
+++ b/lib/gnutls_hash_int.c
@@ -35,7 +35,7 @@ GNUTLS_MAC_HANDLE gnutls_hash_init(MACAlgorithm algorithm)
 
 	ret->algorithm = algorithm;
 	switch (algorithm) {
-	case GNUTLS_MAC_NULL:
+	case GNUTLS_NULL_MAC:
 		ret = GNUTLS_HASH_FAILED;
 		break;
 	case GNUTLS_MAC_SHA:
@@ -68,7 +68,7 @@ int gnutls_hash_get_algo_len(MACAlgorithm algorithm)
 	int ret;
 
 	switch (algorithm) {
-	case GNUTLS_MAC_NULL:
+	case GNUTLS_NULL_MAC:
 		ret = 0;
 		break;
 	case GNUTLS_MAC_SHA:
@@ -135,7 +135,7 @@ GNUTLS_MAC_HANDLE gnutls_hmac_init(MACAlgorithm algorithm, void *key,
 	ret->keysize = keylen;
 
 	switch (algorithm) {
-	case GNUTLS_MAC_NULL:
+	case GNUTLS_NULL_MAC:
 		ret = GNUTLS_MAC_FAILED;
 		break;
 	case GNUTLS_MAC_SHA:
@@ -174,7 +174,7 @@ int gnutls_hmac_get_algo_len(MACAlgorithm algorithm)
 	int ret;
 
 	switch (algorithm) {
-	case GNUTLS_MAC_NULL:
+	case GNUTLS_NULL_MAC:
 		ret = 0;
 		break;
 	case GNUTLS_MAC_SHA:
diff --git a/lib/gnutls_int.h b/lib/gnutls_int.h
index 597a10b2b3..ae37fb5c3e 100644
--- a/lib/gnutls_int.h
+++ b/lib/gnutls_int.h
@@ -85,12 +85,12 @@ typedef struct {
 
 /* STATE */
 enum ConnectionEnd { GNUTLS_SERVER, GNUTLS_CLIENT };
-enum BulkCipherAlgorithm { GNUTLS_NULL, GNUTLS_ARCFOUR=1, GNUTLS_3DES = 4, GNUTLS_RIJNDAEL };
+enum BulkCipherAlgorithm { GNUTLS_NULL_CIPHER, GNUTLS_ARCFOUR=1, GNUTLS_3DES = 4, GNUTLS_RIJNDAEL };
 enum KXAlgorithm { GNUTLS_KX_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA, GNUTLS_KX_DH_DSS, GNUTLS_KX_DH_RSA, GNUTLS_KX_ANON_DH };
 enum KeyExchangeAlgorithm { GNUTLS_RSA, GNUTLS_DIFFIE_HELLMAN };
 enum CipherType { CIPHER_STREAM, CIPHER_BLOCK };
-enum MACAlgorithm { GNUTLS_MAC_NULL, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA };
-enum CompressionMethod { GNUTLS_COMPRESSION_NULL, GNUTLS_ZLIB=224 };
+enum MACAlgorithm { GNUTLS_NULL_MAC, GNUTLS_MAC_MD5, GNUTLS_MAC_SHA };
+enum CompressionMethod { GNUTLS_NULL_COMPRESSION, GNUTLS_ZLIB=224 };
 
 enum ValidSession { VALID_TRUE, VALID_FALSE };
 enum ResumableSession { RESUME_TRUE, RESUME_FALSE };
diff --git a/src/cli.c b/src/cli.c
index d2f1636142..b888425841 100644
--- a/src/cli.c
+++ b/src/cli.c
@@ -34,7 +34,9 @@
 
 #define SA struct sockaddr
 #define ERR(err,s) if (err==-1) {perror(s);return(1);}
-#define MAX_BUF 50
+#define MAX_BUF 4096
+
+#define RESUME
 
 #define MAX(X,Y) (X >= Y ? X : Y);
 
@@ -70,11 +72,12 @@ int main()
 	err = connect(sd, (SA *) & sa, sizeof(sa));
 	ERR(err, "connect");
 
+#ifdef RESUME
 	gnutls_init(&state, GNUTLS_CLIENT);
 	gnutls_set_current_version( state, GNUTLS_TLS1);
 
 	gnutls_set_cipher_priority( state, 2, GNUTLS_ARCFOUR, GNUTLS_3DES);
-	gnutls_set_compression_priority( state, 1, GNUTLS_COMPRESSION_NULL);
+	gnutls_set_compression_priority( state, 1, GNUTLS_NULL_COMPRESSION);
 	gnutls_set_kx_priority( state, 3, GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA);
 	gnutls_set_mac_priority( state, 2, GNUTLS_MAC_SHA, GNUTLS_MAC_MD5);
 	ret = gnutls_handshake(sd, state);
@@ -107,14 +110,16 @@ int main()
 
 	err = connect(sd, (SA *) & sa, sizeof(sa));
 	ERR(err, "connect");
-	
+
+#endif
+
 	/* Begin handshake again */
 	gnutls_init(&state, GNUTLS_CLIENT);
 	
 	gnutls_set_current_version( state, GNUTLS_TLS1);
 
 	gnutls_set_cipher_priority( state, 2, GNUTLS_ARCFOUR, GNUTLS_3DES);
-	gnutls_set_compression_priority( state, 2, GNUTLS_ZLIB, GNUTLS_COMPRESSION_NULL);
+	gnutls_set_compression_priority( state, 2, GNUTLS_ZLIB, GNUTLS_NULL_COMPRESSION);
 	gnutls_set_kx_priority( state, 3, GNUTLS_KX_ANON_DH, GNUTLS_KX_DHE_DSS, GNUTLS_KX_DHE_RSA);
 	gnutls_set_mac_priority( state, 2, GNUTLS_MAC_SHA, GNUTLS_MAC_MD5);
 
diff --git a/src/port.h b/src/port.h
index 003fa6f42e..696b48cb7d 100644
--- a/src/port.h
+++ b/src/port.h
@@ -1,2 +1,2 @@
-#define PORT 5555
+#define PORT 5556
 #define SERVER "127.0.0.1"
diff --git a/src/serv.c b/src/serv.c
index 814c87287b..ad6bbd2b3b 100644
--- a/src/serv.c
+++ b/src/serv.c
@@ -62,7 +62,7 @@ int main()
     for (;;) {
 	gnutls_init(&state, GNUTLS_SERVER);
 	gnutls_set_cipher_priority( state, 2, GNUTLS_RIJNDAEL, GNUTLS_3DES);
-	gnutls_set_compression_priority( state, 2, GNUTLS_ZLIB, GNUTLS_COMPRESSION_NULL);
+	gnutls_set_compression_priority( state, 2, GNUTLS_ZLIB, GNUTLS_NULL_COMPRESSION);
 	gnutls_set_kx_priority( state, 1, GNUTLS_KX_ANON_DH);
 	gnutls_set_mac_priority( state, 2, GNUTLS_MAC_SHA, GNUTLS_MAC_MD5);
 	sd = accept(listen_sd, (SA *) & sa_cli, &client_len);