Print Ed25519 in s_client/s_server

[openssl.git] / ssl / ssl_mcnf.c

diff --git a/ssl/ssl_mcnf.c b/ssl/ssl_mcnf.c
index b92b21068389634565f9207c4fabdcddb5b28036..59674f3d39c9dd6bd78d87d0e06eb4483c783cc1 100644 (file)
--- a/ssl/ssl_mcnf.c
+++ b/ssl/ssl_mcnf.c
@@ -60,7 +60,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
     STACK_OF(CONF_VALUE) *cmd_lists;
     ssl_conf_section = CONF_imodule_get_value(md);
     cmd_lists = NCONF_get_section(cnf, ssl_conf_section);
-    if (sk_CONF_VALUE_num(cmd_lists) <= 0){
+    if (sk_CONF_VALUE_num(cmd_lists) <= 0) {
         if (cmd_lists == NULL)
             SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_SECTION_NOT_FOUND);
         else
@@ -73,11 +73,12 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
     ssl_names_count = cnt;
     for (i = 0; i < ssl_names_count; i++) {
         struct ssl_conf_name *ssl_name = ssl_names + i;
-        CONF_VALUE *sect = sk_CONF_VALUE_value(cmd_lists, i);
+        CONF_VALUE *sect = sk_CONF_VALUE_value(cmd_lists, (int)i);
         STACK_OF(CONF_VALUE) *cmds = NCONF_get_section(cnf, sect->value);
         if (sk_CONF_VALUE_num(cmds) <= 0) {
             if (cmds == NULL)
-                SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_COMMAND_SECTION_NOT_FOUND);
+                SSLerr(SSL_F_SSL_MODULE_INIT,
+                       SSL_R_SSL_COMMAND_SECTION_NOT_FOUND);
             else
                 SSLerr(SSL_F_SSL_MODULE_INIT, SSL_R_SSL_COMMAND_SECTION_EMPTY);
             ERR_add_error_data(4, "name=", sect->name, ", value=", sect->value);
@@ -93,7 +94,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
         ssl_name->cmd_count = cnt;
         for (j = 0; j < cnt; j++) {
             const char *name;
-            CONF_VALUE *cmd_conf = sk_CONF_VALUE_value(cmds, j);
+            CONF_VALUE *cmd_conf = sk_CONF_VALUE_value(cmds, (int)j);
             struct ssl_conf_cmd *cmd = ssl_name->cmds + j;
             /* Skip any initial dot in name */
             name = strchr(cmd_conf->name, '.');
@@ -109,7 +110,7 @@ static int ssl_module_init(CONF_IMODULE *md, const CONF *cnf)
 
     }
     rv = 1;
-    err:
+ err:
     if (rv == 0)
         ssl_module_free(md);
     return rv;
@@ -165,24 +166,24 @@ static int ssl_do_config(SSL *s, SSL_CTX *ctx, const char *name)
         SSL_CONF_CTX_set_ssl_ctx(cctx, ctx);
     }
     if (meth->ssl_accept != ssl_undefined_function)
-            flags |= SSL_CONF_FLAG_SERVER;
+        flags |= SSL_CONF_FLAG_SERVER;
     if (meth->ssl_connect != ssl_undefined_function)
-            flags |= SSL_CONF_FLAG_CLIENT;
+        flags |= SSL_CONF_FLAG_CLIENT;
     SSL_CONF_CTX_set_flags(cctx, flags);
     for (i = 0, cmd = nm->cmds; i < nm->cmd_count; i++, cmd++) {
         rv = SSL_CONF_cmd(cctx, cmd->cmd, cmd->arg);
         if (rv <= 0) {
             if (rv == -2)
                 SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_UNKNOWN_COMMAND);
-            else 
+            else
                 SSLerr(SSL_F_SSL_DO_CONFIG, SSL_R_BAD_VALUE);
             ERR_add_error_data(6, "section=", name, ", cmd=", cmd->cmd,
-                                    ", arg=", cmd->arg);
+                               ", arg=", cmd->arg);
             goto err;
         }
     }
     rv = SSL_CONF_CTX_finish(cctx);
-    err:
+ err:
     SSL_CONF_CTX_free(cctx);
     return rv <= 0 ? 0 : 1;
 }