From: Dr. Stephen Henson Date: Mon, 5 Nov 2012 19:38:32 +0000 (+0000) Subject: contify X-Git-Tag: master-post-reformat~1631 X-Git-Url: https://git.openssl.org/gitweb/?p=openssl.git;a=commitdiff_plain;h=95bba34b839a950722a87911cd4ab347b4ba2dfc contify --- diff --git a/apps/s_client.c b/apps/s_client.c index 5ecc957302..8094533d82 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -609,9 +609,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 @@ -1262,7 +1262,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 93f183b6f8..a7fe9734f6 100644 --- a/apps/s_server.c +++ b/apps/s_server.c @@ -277,9 +277,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