]> granicus.if.org Git - openssl/commitdiff
contify
authorDr. Stephen Henson <steve@openssl.org>
Mon, 5 Nov 2012 19:38:32 +0000 (19:38 +0000)
committerDr. Stephen Henson <steve@openssl.org>
Mon, 5 Nov 2012 19:38:32 +0000 (19:38 +0000)
apps/s_client.c
apps/s_server.c

index 5ecc957302376120f2e0fe16a91dcad649748f39..8094533d82f8d312a1fc59030e69490c04804ed2 100644 (file)
@@ -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;
index 93f183b6f84161f7c2aaf8835fd5d7c369c13c21..a7fe9734f64afd18d2e4eefb28a431a1651a47c0 100644 (file)
@@ -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