X-Git-Url: https://git.exim.org/users/jgh/exim.git/blobdiff_plain/eca4debb8fa74d67fbeb4aefdcc3d67ef51386e0..e5b03e744b99888fe99ded76cc3c73762f62ecdf:/test/src/client.c

diff --git a/test/src/client.c b/test/src/client.c
index 5b52916ee..cd2194af1 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -66,7 +66,8 @@ latter needs a whole pile of tables. */
 # include <openssl/ssl.h>
 # include <openssl/err.h>
 # include <openssl/rand.h>
-# 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
@@ -255,12 +256,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);