some fixes in the gnutls-cli-debug program

diff --git a/src/tests.c b/src/tests.c
index 7169814b23fa02998593c5eb718af10cefec9784..7d1639312653c5d002fe22fc953924c941594d48 100644 (file)
--- a/src/tests.c
+++ b/src/tests.c
@@ -159,19 +159,20 @@ int test_srp( gnutls_session session) {
                ADD_ALL_MACS(session);
 
                ADD_KX(session, GNUTLS_KX_SRP);
+
                gnutls_credentials_set(session, GNUTLS_CRD_SRP, srp_cred);
 
                return do_handshake( session);
 }
 
 int test_export( gnutls_session session) {
-               ADD_ALL_CIPHERS(session);
                ADD_ALL_COMP(session);
                ADD_ALL_CERTTYPES(session);
                ADD_ALL_PROTOCOLS(session);
                ADD_ALL_MACS(session);
 
                ADD_KX(session, GNUTLS_KX_RSA_EXPORT);
+               ADD_CIPHER(session, GNUTLS_CIPHER_ARCFOUR_40);
                gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, xcred);
 
                return do_handshake( session);

diff --git a/src/tls_test.c b/src/tls_test.c
index 6050e1a8c4da0175e197792fdba16f3055a4650e..9fe38b4399d877d23f23cfb4a76e466b7e352e29 100644 (file)
--- a/src/tls_test.c
+++ b/src/tls_test.c
@@ -139,6 +139,11 @@ int main(int argc, char **argv)
                exit(1);
        }
 
+       if (gnutls_global_init_extra() < 0) {
+               fprintf(stderr, "global state initialization error\n");
+               exit(1);
+       }
+
        printf("Resolving '%s'...\n", hostname);
        /* get server name */
        server_host = gethostbyname(hostname);