From 57cde6e41d1aba216301f33b33f22390fb34967b Mon Sep 17 00:00:00 2001
From: Jeremy Harris <jgh146exb@wizmail.org>
Date: Mon, 3 Nov 2014 15:48:15 +0000
Subject: [PATCH] Testsuite: tidying

---
 test/aux-fixed/showenv | 4 +++-
 test/src/client.c      | 4 ++--
 2 files changed, 5 insertions(+), 3 deletions(-)

diff --git a/test/aux-fixed/showenv b/test/aux-fixed/showenv
index fc377cc8b..2d46eefb7 100755
--- a/test/aux-fixed/showenv
+++ b/test/aux-fixed/showenv
@@ -3,7 +3,9 @@
 # This script outputs certain information about the environment, for use when
 # testing pipe transports.
 
-name=`id -un`
+cmd=/usr/xpg4/bin/id
+[ -x $cmd ] || cmd=id
+name=`$cmd -un`
 
 echo Test pipe script
 echo Running as: $name
diff --git a/test/src/client.c b/test/src/client.c
index 3f3bbe97e..cd2194af1 100644
--- a/test/src/client.c
+++ b/test/src/client.c
@@ -256,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);
 
-- 
2.30.2