Constification.
authorDr. Stephen Henson <steve@openssl.org>
Mon, 21 Oct 2013 06:19:01 +0000 (07:19 +0100)
committerDr. Stephen Henson <steve@openssl.org>
Sat, 2 Nov 2013 13:41:38 +0000 (13:41 +0000)
(cherry picked from commit 27f3b65f49ea91fcf4b46ec0298be51b4207214a)

ssl/ssl_conf.c

index b5a3cccefdf82e7cfcd24973932528b240c857a7..c1e18c2e8aafc0e4041a16d0331e0c78b36c354c 100644 (file)
@@ -406,7 +406,7 @@ typedef struct
 #define SSL_CONF_CMD_STRING(name, cmdopt) \
        SSL_CONF_CMD(name, cmdopt, SSL_CONF_TYPE_STRING)
 
-static ssl_conf_cmd_tbl ssl_conf_cmds[] = {
+static const ssl_conf_cmd_tbl ssl_conf_cmds[] = {
        SSL_CONF_CMD_STRING(SignatureAlgorithms, "sigalgs"),
        SSL_CONF_CMD_STRING(ClientSignatureAlgorithms, "client_sigalgs"),
        SSL_CONF_CMD_STRING(Curves, "curves"),
@@ -446,9 +446,9 @@ static int ssl_conf_cmd_skip_prefix(SSL_CONF_CTX *cctx, const char **pcmd)
        return 1;
        }
 
-static ssl_conf_cmd_tbl *ssl_conf_cmd_lookup(SSL_CONF_CTX *cctx, const char *cmd)
+static const ssl_conf_cmd_tbl *ssl_conf_cmd_lookup(SSL_CONF_CTX *cctx, const char *cmd)
        {
-       ssl_conf_cmd_tbl *t;
+       const ssl_conf_cmd_tbl *t;
        size_t i;
        if (cmd == NULL)
                return NULL;
@@ -473,7 +473,7 @@ static ssl_conf_cmd_tbl *ssl_conf_cmd_lookup(SSL_CONF_CTX *cctx, const char *cmd
 
 int SSL_CONF_cmd(SSL_CONF_CTX *cctx, const char *cmd, const char *value)
        {
-       ssl_conf_cmd_tbl *runcmd;
+       const ssl_conf_cmd_tbl *runcmd;
        if (cmd == NULL)
                {
                SSLerr(SSL_F_SSL_CONF_CMD, SSL_R_INVALID_NULL_CMD_NAME);
@@ -556,7 +556,7 @@ int SSL_CONF_cmd_value_type(SSL_CONF_CTX *cctx, const char *cmd)
        {
        if (ssl_conf_cmd_skip_prefix(cctx, &cmd))
                {
-               ssl_conf_cmd_tbl *runcmd;
+               const ssl_conf_cmd_tbl *runcmd;
                runcmd = ssl_conf_cmd_lookup(cctx, cmd);
                if (runcmd)
                        return runcmd->value_type;