summaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2012-12-26 16:49:59 +0000
committerDr. Stephen Henson <steve@openssl.org>2012-12-26 16:49:59 +0000
commit3c87a2bdfac854389b019cf52129a7d64360f432 (patch)
tree79be6898356bcd404d9833c42bbf2cec12bd0c42 /apps
parent1520e6c084ccc06a6325381bf9fc618ab5cfb230 (diff)
contify
(backport from HEAD)
Diffstat (limited to 'apps')
-rw-r--r--apps/s_client.c8
-rw-r--r--apps/s_server.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/s_client.c b/apps/s_client.c
index 8cc57743e0..6ff11eac94 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -606,9 +606,9 @@ int MAIN(int argc, char **argv)
#endif
#ifndef OPENSSL_NO_TLSEXT
char *servername = NULL;
- char *curves=NULL;
- char *sigalgs=NULL;
- char *client_sigalgs=NULL;
+ const char *curves=NULL;
+ const char *sigalgs=NULL;
+ const char *client_sigalgs=NULL;
tlsextctx tlsextcbp =
{NULL,0};
# ifndef OPENSSL_NO_NEXTPROTONEG
@@ -1218,7 +1218,7 @@ bad:
#ifndef OPENSSL_NO_TLSEXT
if (curves != NULL)
- if(!SSL_CTX_set1_curves_list(ctx,curves)) {
+ if(!SSL_CTX_set1_curves_list(ctx, curves)) {
BIO_printf(bio_err,"error setting curve list\n");
ERR_print_errors(bio_err);
goto end;
diff --git a/apps/s_server.c b/apps/s_server.c
index 2b8ff64fed..0ffd11ba43 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -273,9 +273,9 @@ static int s_server_session_id_context = 1; /* anything will do */
static const char *s_cert_file=TEST_CERT,*s_key_file=NULL, *s_chain_file=NULL;
#ifndef OPENSSL_NO_TLSEXT
static const char *s_cert_file2=TEST_CERT2,*s_key_file2=NULL;
-static char *curves=NULL;
-static char *sigalgs=NULL;
-static char *client_sigalgs=NULL;
+static const char *curves=NULL;
+static const char *sigalgs=NULL;
+static const char *client_sigalgs=NULL;
#endif
static char *s_dcert_file=NULL,*s_dkey_file=NULL, *s_dchain_file=NULL;
#ifdef FIONBIO