contify

(backport from HEAD)

diff --git a/apps/s_client.c b/apps/s_client.c
index 8cc57743e068db6ff5b74926c3a69ea0a1c8129b..6ff11eac94c01ef4dea627f499a0ae3d02ed5535 100644 (file)
--- 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 2b8ff64fedff7164313bac577b8cdabcbbe09997..0ffd11ba43c56777dee32c63311b5596a2e01147 100644 (file)
--- 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