*** empty log message ***

diff --git a/src/cli.c b/src/cli.c
index e76f044e306c5b05eb7aefdc5fdd0a5bf5ae4621..0083f527d4ba28b3d8706d66413e5b27a90e01c7 100644 (file)
--- a/src/cli.c
+++ b/src/cli.c
@@ -88,7 +88,7 @@ static int cert_callback( GNUTLS_STATE state, const gnutls_datum *client_certs,
 }
 
 const int protocol_priority[] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 };
-const int kx_priority[] = { GNUTLS_KX_DHE_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_SRP, GNUTLS_KX_ANON_DH, 0 };
+const int kx_priority[] = { GNUTLS_KX_SRP, GNUTLS_KX_DHE_RSA, GNUTLS_KX_DHE_DSS, GNUTLS_KX_RSA, GNUTLS_KX_SRP, GNUTLS_KX_ANON_DH, 0 };
 const int cipher_priority[] = { GNUTLS_CIPHER_RIJNDAEL_128_CBC, GNUTLS_CIPHER_3DES_CBC, GNUTLS_CIPHER_ARCFOUR, 0};
 const int comp_priority[] = { GNUTLS_COMP_ZLIB, GNUTLS_COMP_NULL, 0 };
 const int mac_priority[] = { GNUTLS_MAC_SHA, GNUTLS_MAC_MD5, 0 };

diff --git a/src/serv.c b/src/serv.c
index 07611014011ea91940248fa9234c31d2acf8513a..9c409026c73a6127e2b62cc1ae7d76b741a2e19d 100644 (file)
--- a/src/serv.c
+++ b/src/serv.c
@@ -75,7 +75,7 @@ static char http_buffer[16*1024];
 /* These are global */
 GNUTLS_SRP_SERVER_CREDENTIALS srp_cred;
 GNUTLS_ANON_SERVER_CREDENTIALS dh_cred;
-GNUTLS_CERTIFICATE_SERVER_CREDENTIALS x509_cred;
+GNUTLS_CERTIFICATE_SERVER_CREDENTIALS cert_cred;
 
 
 GNUTLS_STATE initialize_state(void)
@@ -105,7 +105,7 @@ GNUTLS_STATE initialize_state(void)
        
        gnutls_cred_set(state, GNUTLS_CRD_ANON, dh_cred);
        gnutls_cred_set(state, GNUTLS_CRD_SRP, srp_cred);
-       gnutls_cred_set(state, GNUTLS_CRD_CERTIFICATE, x509_cred);
+       gnutls_cred_set(state, GNUTLS_CRD_CERTIFICATE, cert_cred);
 
        gnutls_mac_set_priority(state, mac_priority);
 
@@ -261,27 +261,27 @@ int main(int argc, char **argv)
                exit(1);
        }
 
-       if (gnutls_certificate_allocate_server_sc(&x509_cred) < 0) {
+       if (gnutls_certificate_allocate_server_sc(&cert_cred) < 0) {
                fprintf(stderr, "memory error\n");
                exit(1);
        }
 
-       if (gnutls_certificate_set_x509_trust_file( x509_cred, CAFILE, CRLFILE) < 0) {
+       if (gnutls_certificate_set_x509_trust_file( cert_cred, CAFILE, CRLFILE) < 0) {
                fprintf(stderr, "X509 PARSE ERROR\nDid you have ca.pem?\n");
                exit(1);
        }
 
-       if (gnutls_certificate_set_openpgp_key_file( x509_cred, PGP_CERTFILE, PGP_KEYFILE) < 0) {
+       if (gnutls_certificate_set_openpgp_key_file( cert_cred, PGP_CERTFILE, PGP_KEYFILE) < 0) {
                fprintf(stderr, "PGP PARSE ERROR\nDid you have key.pem and cert.pem?\n");
                exit(1);
        }
 
-       if (gnutls_certificate_set_x509_key_file( x509_cred, CERTFILE1, KEYFILE1) < 0) {
+       if (gnutls_certificate_set_x509_key_file( cert_cred, CERTFILE1, KEYFILE1) < 0) {
                fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n");
                exit(1);
        }
 
-       if (gnutls_certificate_set_x509_key_file( x509_cred, CERTFILE2, KEYFILE2) < 0) {
+       if (gnutls_certificate_set_x509_key_file( cert_cred, CERTFILE2, KEYFILE2) < 0) {
                fprintf(stderr, "X509 PARSE ERROR\nDid you have key.pem and cert.pem?\n");
                exit(1);
        }
@@ -412,10 +412,11 @@ int main(int argc, char **argv)
                close(sd);
                gnutls_deinit(state);
 
+               break;
        }
        close(listen_sd);
 
-       gnutls_certificate_free_server_sc(x509_cred);
+       gnutls_certificate_free_server_sc(cert_cred);
        gnutls_srp_free_server_sc(srp_cred);
        gnutls_anon_free_server_sc(dh_cred);