PRDR: Introduce $prdr_requested flag variable. Bug 1712

[users/jgh/exim.git] / test / src / client.c

diff --git a/test/src/client.c b/test/src/client.c
index 72cebbeb47832cfe5f2c1734eb0f3abd817f9e7b..ee00912bc9e2e6ce5d09c044335fbb0da78d4ac0 100644 (file)
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -58,11 +58,6 @@ static int sigalrm_seen = 0;
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */
 
 /* TLS support can be optionally included, either for OpenSSL or GnuTLS. The
 latter needs a whole pile of tables. */

-#if !defined(EXIM_HAVE_OPENSSL_TLSEXT) && !defined(DISABLE_OCSP)
-# warning "OpenSSL library version too old; define DISABLE_OCSP in Makefile"
-# define DISABLE_OCSP
-#endif
-

 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>
 #ifdef HAVE_OPENSSL
 # define HAVE_TLS
 # include <openssl/crypto.h>


@@ -71,6 +66,11 @@ latter needs a whole pile of tables. */
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>

+
+# 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

 # ifndef DISABLE_OCSP
 #  include <openssl/ocsp.h>
 # endif
 # ifndef DISABLE_OCSP
 #  include <openssl/ocsp.h>
 # endif


@@ -85,6 +85,9 @@ latter needs a whole pile of tables. */
 #  define HAVE_OCSP
 #  include <gnutls/ocsp.h>
 # endif
 #  define HAVE_OCSP
 #  include <gnutls/ocsp.h>
 # endif

+# ifndef GNUTLS_NO_EXTENSIONS
+#  define GNUTLS_NO_EXTENSIONS 0
+# endif

 
 # define DH_BITS      768
 
 
 # define DH_BITS      768
 


@@ -256,12 +259,12 @@ int
 tls_start(int sock, SSL **ssl, SSL_CTX *ctx)
 {
 int rc;
 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);
 
 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);
 
 SSL_set_fd (*ssl, sock);
 SSL_set_connect_state(*ssl);
 


@@ -451,7 +454,7 @@ tls_session_init(void)
 {
 gnutls_session session;
 
 {
 gnutls_session session;
 

-gnutls_init(&session, GNUTLS_CLIENT);
+gnutls_init(&session, GNUTLS_CLIENT | GNUTLS_NO_EXTENSIONS);

 
 gnutls_cipher_set_priority(session, default_cipher_priority);
 gnutls_compression_set_priority(session, comp_priority);
 
 gnutls_cipher_set_priority(session, default_cipher_priority);
 gnutls_compression_set_priority(session, comp_priority);


@@ -480,7 +483,14 @@ return session;
 *************************************************/
 
 const char * const HELP_MESSAGE = "\n\
 *************************************************/
 
 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\

           <IP address>\n\
           <port>\n\
           [<outgoing interface>]\n\
           <IP address>\n\
           <port>\n\
           [<outgoing interface>]\n\