X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/eca4debb8fa74d67fbeb4aefdcc3d67ef51386e0..8ef02a06b1fccc921e34c48633a1d4659326dacc:/test/src/client.c?ds=sidebyside diff --git a/test/src/client.c b/test/src/client.c index 5b52916ee..2bd640205 100644 --- a/test/src/client.c +++ b/test/src/client.c @@ -66,7 +66,8 @@ latter needs a whole pile of tables. */ # include # include # include -# if !defined(EXIM_HAVE_OPENSSL_TLSEXT) && !defined(DISABLE_OCSP) + +# if OPENSSL_VERSION_NUMBER < 0x0090806fL && !defined(DISABLE_OCSP) && !defined(OPENSSL_NO_TLSEXT) # warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile" # define DISABLE_OCSP # endif @@ -84,20 +85,24 @@ latter needs a whole pile of tables. */ # define HAVE_OCSP # include # endif +# ifndef GNUTLS_NO_EXTENSIONS +# define GNUTLS_NO_EXTENSIONS 0 +# endif # define DH_BITS 768 /* Local static variables for GNUTLS */ -static gnutls_dh_params dh_params = NULL; +static gnutls_dh_params_t dh_params = NULL; static gnutls_certificate_credentials_t x509_cred = NULL; -static gnutls_session tls_session = NULL; +static gnutls_session_t tls_session = NULL; static int ssl_session_timeout = 200; /* Priorities for TLS algorithms to use. */ +#if GNUTLS_VERSION_NUMBER < 0x030400 static const int protocol_priority[16] = { GNUTLS_TLS1, GNUTLS_SSL3, 0 }; static const int kx_priority[16] = { @@ -119,7 +124,7 @@ static const int mac_priority[16] = { 0 }; static const int comp_priority[16] = { GNUTLS_COMP_NULL, 0 }; -static const int cert_type_priority[16] = { GNUTLS_CRT_X509, 0 }; +#endif #endif /*HAVE_GNUTLS*/ @@ -255,12 +260,12 @@ int tls_start(int sock, SSL **ssl, SSL_CTX *ctx) { int rc; -static const unsigned char *sid_ctx = "exim"; +static const unsigned char *sid_ctx = US"exim"; RAND_load_file("client.c", -1); /* Not *very* random! */ *ssl = SSL_new (ctx); -SSL_set_session_id_context(*ssl, sid_ctx, strlen(sid_ctx)); +SSL_set_session_id_context(*ssl, sid_ctx, strlen(CS sid_ctx)); SSL_set_fd (*ssl, sock); SSL_set_connect_state(*ssl); @@ -352,7 +357,7 @@ init_dh(void) { int fd; int ret; -gnutls_datum m; +gnutls_datum_t m; uschar filename[200]; struct stat statbuf; @@ -445,13 +450,14 @@ if (ocsp_stapling) * Initialize a single GNUTLS session * *************************************************/ -static gnutls_session +static gnutls_session_t tls_session_init(void) { -gnutls_session session; +gnutls_session_t session; -gnutls_init(&session, GNUTLS_CLIENT); +gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_NO_EXTENSIONS); +#if GNUTLS_VERSION_NUMBER < 0x030400 gnutls_cipher_set_priority(session, default_cipher_priority); gnutls_compression_set_priority(session, comp_priority); gnutls_kx_set_priority(session, kx_priority); @@ -459,6 +465,10 @@ gnutls_protocol_set_priority(session, protocol_priority); gnutls_mac_set_priority(session, mac_priority); gnutls_cred_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); +#else +gnutls_set_default_priority(session); +gnutls_credentials_set(session, GNUTLS_CRD_CERTIFICATE, x509_cred); +#endif gnutls_dh_set_prime_bits(session, DH_BITS); gnutls_db_set_cache_expiration(session, ssl_session_timeout); @@ -479,7 +489,14 @@ return session; *************************************************/ const char * const HELP_MESSAGE = "\n\ -Usage: client\n\ +Usage: client\n" +#ifdef HAVE_TLS +"\ + [-tls-on-connect]\n\ + [-ocsp]\n" +#endif +"\ + [-tn] n seconds timeout\n\ \n\ \n\ []\n\ @@ -783,7 +800,7 @@ tls_session = tls_session_init(); if (ocsp_stapling) gnutls_ocsp_status_request_enable_client(tls_session, NULL, 0, NULL); #endif -gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr)sock); +gnutls_transport_set_ptr(tls_session, (gnutls_transport_ptr_t)(intptr_t)sock); /* When the server asks for a certificate and the client does not have one, there is a SIGPIPE error in the gnutls_handshake() function for some reason @@ -804,24 +821,32 @@ if (tls_on_connect) { printf("Attempting to start TLS\n"); - #ifdef HAVE_OPENSSL +#ifdef HAVE_OPENSSL tls_active = tls_start(sock, &ssl, ctx); - #endif +#endif - #ifdef HAVE_GNUTLS +#ifdef HAVE_GNUTLS + { + int rc; sigalrm_seen = FALSE; alarm(timeout); - tls_active = gnutls_handshake(tls_session) >= 0; + do { + rc = gnutls_handshake(tls_session); + } while (rc < 0 && gnutls_error_is_fatal(rc) == 0); + tls_active = rc >= 0; alarm(0); - #endif + + if (!tls_active) printf("%s\n", gnutls_strerror(rc)); + } +#endif if (!tls_active) printf("Failed to start TLS\n"); - #if defined(HAVE_GNUTLS) && defined(HAVE_OCSP) +#if defined(HAVE_GNUTLS) && defined(HAVE_OCSP) else if ( ocsp_stapling && gnutls_ocsp_status_request_is_checked(tls_session, 0) == 0) printf("Failed to verify certificate status\n"); - #endif +#endif else printf("Succeeded in starting TLS\n"); } @@ -830,8 +855,9 @@ if (tls_on_connect) while (fgets(CS outbuffer, sizeof(outbuffer), stdin) != NULL) { int n = (int)strlen(CS outbuffer); - while (n > 0 && isspace(outbuffer[n-1])) n--; - outbuffer[n] = 0; + + /* Strip trailing newline */ + if (outbuffer[n-1] == '\n') outbuffer[--n] = 0; /* Expect incoming */ @@ -907,10 +933,18 @@ int rc; #endif #ifdef HAVE_GNUTLS - sigalrm_seen = FALSE; - alarm(timeout); - tls_active = gnutls_handshake(tls_session) >= 0; - alarm(0); + { + int rc; + sigalrm_seen = FALSE; + alarm(timeout); + do { + rc = gnutls_handshake(tls_session); + } while (rc < 0 && gnutls_error_is_fatal(rc) == 0); + tls_active = rc >= 0; + alarm(0); + + if (!tls_active) printf("%s\n", gnutls_strerror(rc)); + } #endif if (!tls_active)