summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorx2018 <xkernel.wang@foxmail.com>2021-10-26 15:16:18 +0800
committerPauli <pauli@openssl.org>2021-10-28 13:10:46 +1000
commit1287dabd0b23326be491125698dd982e4ae28887 (patch)
tree3d6a62803bdd3d8ca9378eda3e7316a9c995c001
parent01451721afebabd0b7bdcd4cb3a183c9b590d266 (diff)
fix some code with obvious wrong coding style
Reviewed-by: Tomas Mraz <tomas@openssl.org> Reviewed-by: Richard Levitte <levitte@openssl.org> Reviewed-by: Paul Dale <pauli@openssl.org> (Merged from https://github.com/openssl/openssl/pull/16918)
-rw-r--r--apps/dgst.c2
-rw-r--r--apps/lib/app_libctx.c2
-rw-r--r--apps/lib/app_rand.c2
-rw-r--r--apps/lib/apps.c8
-rw-r--r--apps/lib/cmp_mock_srv.c2
-rw-r--r--apps/lib/s_cb.c2
-rw-r--r--apps/lib/vms_term_sock.c14
-rw-r--r--apps/mac.c2
-rw-r--r--apps/ocsp.c2
-rw-r--r--apps/passwd.c2
-rw-r--r--apps/pkeyutl.c4
-rw-r--r--apps/req.c2
-rw-r--r--apps/s_client.c4
-rw-r--r--crypto/LPdir_unix.c2
-rw-r--r--crypto/aes/aes_x86core.c5
-rw-r--r--crypto/aria/aria.c2
-rw-r--r--crypto/bio/bio_addr.c12
-rw-r--r--crypto/bn/asm/sparcv8.S8
-rw-r--r--crypto/bn/asm/sparcv8plus.S6
-rw-r--r--crypto/bn/bn_rsa_fips186_4.c2
-rw-r--r--crypto/cmp/cmp_msg.c2
-rw-r--r--crypto/cms/cms_env.c2
-rw-r--r--crypto/cpuid.c4
-rw-r--r--crypto/ec/ec2_smpl.c2
-rw-r--r--crypto/ec/ec_ameth.c2
-rw-r--r--crypto/ec/ec_backend.c2
-rw-r--r--crypto/ec/ecp_nistz256.c2
-rw-r--r--crypto/ec/ecp_smpl.c4
-rw-r--r--crypto/ec/ecx_meth.c2
-rw-r--r--crypto/evp/asymcipher.c2
-rw-r--r--crypto/evp/e_aes.c2
-rw-r--r--crypto/evp/e_aria.c26
-rw-r--r--crypto/evp/e_camellia.c16
-rw-r--r--crypto/evp/e_chacha20_poly1305.c2
-rw-r--r--crypto/evp/e_idea.c6
-rw-r--r--crypto/evp/e_seed.c2
-rw-r--r--crypto/evp/pmeth_lib.c8
-rw-r--r--crypto/ffc/ffc_params_generate.c8
-rw-r--r--crypto/lhash/lhash.c2
-rw-r--r--crypto/pkcs12/p12_sbag.c4
-rw-r--r--crypto/ppccap.c2
-rw-r--r--crypto/property/property_parse.c8
-rw-r--r--crypto/rand/rand_egd.c6
-rw-r--r--crypto/rand/randfile.c4
-rw-r--r--crypto/rsa/rsa_ameth.c2
-rw-r--r--crypto/rsa/rsa_backend.c2
-rw-r--r--crypto/rsa/rsa_pmeth.c2
-rw-r--r--crypto/rsa/rsa_sp800_56b_gen.c2
-rw-r--r--crypto/sha/keccak1600.c6
-rw-r--r--crypto/sm2/sm2_key.c2
-rw-r--r--crypto/srp/srp_vfy.c2
-rw-r--r--crypto/store/store_lib.c4
-rw-r--r--crypto/x509/pcy_cache.c2
-rw-r--r--crypto/x509/pcy_node.c2
-rw-r--r--crypto/x509/v3_admis.c2
-rw-r--r--crypto/x509/v3_pcia.c14
-rw-r--r--crypto/x509/x509_vfy.c2
-rw-r--r--crypto/x509/x_crl.c6
-rw-r--r--demos/digest/BIO_f_md.c16
-rw-r--r--demos/digest/EVP_MD_stdin.c2
-rw-r--r--demos/kdf/pbkdf2.c2
-rw-r--r--engines/e_afalg.c4
-rw-r--r--engines/e_capi.c4
-rw-r--r--engines/e_devcrypto.c2
-rw-r--r--engines/e_ossltest.c2
-rw-r--r--include/openssl/ct.h.in2
-rw-r--r--providers/common/provider_seeding.c2
-rw-r--r--providers/implementations/ciphers/cipher_chacha20.c2
-rw-r--r--providers/implementations/ciphers/ciphercommon_block.c2
-rw-r--r--providers/implementations/encode_decode/encode_key2any.c2
-rw-r--r--providers/implementations/exchange/dh_exch.c2
-rw-r--r--providers/implementations/exchange/ecdh_exch.c4
-rw-r--r--providers/implementations/kdfs/pbkdf1.c2
-rw-r--r--providers/implementations/kdfs/pbkdf2.c2
-rw-r--r--providers/implementations/kdfs/pkcs12kdf.c2
-rw-r--r--providers/implementations/kdfs/pvkkdf.c2
-rw-r--r--providers/implementations/keymgmt/ec_kmgmt.c2
-rw-r--r--providers/implementations/rands/drbg_hash.c4
-rw-r--r--providers/implementations/rands/seeding/rand_unix.c2
-rw-r--r--providers/implementations/rands/seeding/rand_vms.c2
-rw-r--r--providers/implementations/rands/seeding/rand_vxworks.c2
-rw-r--r--providers/implementations/signature/rsa_sig.c6
-rw-r--r--ssl/d1_msg.c2
-rw-r--r--ssl/ssl_ciph.c4
-rw-r--r--ssl/ssl_init.c2
-rw-r--r--ssl/ssl_lib.c2
-rw-r--r--ssl/statem/extensions_srvr.c2
-rw-r--r--ssl/statem/statem_clnt.c2
-rw-r--r--ssl/statem/statem_srvr.c2
-rw-r--r--ssl/tls13_enc.c2
-rw-r--r--test/bftest.c2
-rw-r--r--test/bio_enc_test.c2
-rw-r--r--test/bntest.c16
-rw-r--r--test/clienthellotest.c2
-rw-r--r--test/constant_time_test.c4
-rw-r--r--test/defltfips_test.c2
-rw-r--r--test/dhtest.c2
-rw-r--r--test/ectest.c4
-rw-r--r--test/evp_extra_test.c10
-rw-r--r--test/evp_kdf_test.c2
-rw-r--r--test/evp_test.c12
-rw-r--r--test/helpers/handshake.c2
-rw-r--r--test/helpers/pkcs12.c2
-rw-r--r--test/helpers/ssltestlib.c8
-rw-r--r--test/modes_internal_test.c2
-rw-r--r--test/ossl_store_test.c2
-rw-r--r--test/param_build_test.c6
-rw-r--r--test/params_api_test.c4
-rw-r--r--test/pkcs12_format_test.c10
-rw-r--r--test/provfetchtest.c2
-rw-r--r--test/ssl_old_test.c2
-rw-r--r--test/sslapitest.c4
-rw-r--r--test/sslcorrupttest.c2
-rw-r--r--test/stack_test.c2
-rw-r--r--test/tls13ccstest.c4
-rw-r--r--test/uitest.c2
116 files changed, 229 insertions, 230 deletions
diff --git a/apps/dgst.c b/apps/dgst.c
index bd23b76996..e75dd72521 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -503,7 +503,7 @@ static const char *newline_escape_filename(const char *file, int * backslash)
file_cpy = app_malloc(mem_len, file);
i = 0;
- while(e < length) {
+ while (e < length) {
const char c = file[e];
if (c == '\n') {
file_cpy[i++] = '\\';
diff --git a/apps/lib/app_libctx.c b/apps/lib/app_libctx.c
index 4b9ec40e85..2f68cb0a75 100644
--- a/apps/lib/app_libctx.c
+++ b/apps/lib/app_libctx.c
@@ -36,7 +36,7 @@ OSSL_LIB_CTX *app_create_libctx(void)
*/
if (app_libctx == NULL) {
if (!app_provider_load(NULL, "null")) {
- opt_printf_stderr( "Failed to create null provider\n");
+ opt_printf_stderr("Failed to create null provider\n");
return NULL;
}
app_libctx = OSSL_LIB_CTX_new();
diff --git a/apps/lib/app_rand.c b/apps/lib/app_rand.c
index e38d3a72fc..d3181e56fa 100644
--- a/apps/lib/app_rand.c
+++ b/apps/lib/app_rand.c
@@ -37,7 +37,7 @@ static int loadfiles(char *name)
char *p;
int last, ret = 1;
- for ( ; ; ) {
+ for (;;) {
last = 0;
for (p = name; *p != '\0' && *p != LIST_SEPARATOR_CHAR; p++)
continue;
diff --git a/apps/lib/apps.c b/apps/lib/apps.c
index 6fe99422b9..b15abac857 100644
--- a/apps/lib/apps.c
+++ b/apps/lib/apps.c
@@ -823,7 +823,7 @@ int load_crls(const char *uri, STACK_OF(X509_CRL) **crls,
static const char *format2string(int format)
{
- switch(format) {
+ switch (format) {
case FORMAT_PEM:
return "PEM";
case FORMAT_ASN1:
@@ -1942,7 +1942,7 @@ X509_NAME *parse_name(const char *cp, int chtype, int canmulti,
ERR_print_errors(bio_err);
BIO_printf(bio_err,
"%s: Error adding %s name attribute \"/%s=%s\"\n",
- opt_getprog(), desc, typestr ,valstr);
+ opt_getprog(), desc, typestr, valstr);
goto err;
}
}
@@ -2845,9 +2845,9 @@ int raw_write_stdout(const void *buf, int siz)
# include <floss.h(floss_write)>
# endif
# endif
-int raw_write_stdout(const void *buf,int siz)
+int raw_write_stdout(const void *buf, int siz)
{
- return write(fileno(stdout),(void*)buf,siz);
+ return write(fileno(stdout), (void*)buf, siz);
}
#else
# if defined(__TANDEM)
diff --git a/apps/lib/cmp_mock_srv.c b/apps/lib/cmp_mock_srv.c
index 1fb5adca1a..419b74ce6a 100644
--- a/apps/lib/cmp_mock_srv.c
+++ b/apps/lib/cmp_mock_srv.c
@@ -14,7 +14,7 @@
#include <openssl/cmp.h>
#include <openssl/err.h>
#include <openssl/cmperr.h>
-
+
/* the context for the CMP mock server */
typedef struct
{
diff --git a/apps/lib/s_cb.c b/apps/lib/s_cb.c
index c9a611aa3a..1d318027d2 100644
--- a/apps/lib/s_cb.c
+++ b/apps/lib/s_cb.c
@@ -1537,7 +1537,7 @@ void print_ca_names(BIO *bio, SSL *s)
return;
}
- BIO_printf(bio, "---\nAcceptable %s certificate CA names\n",cs);
+ BIO_printf(bio, "---\nAcceptable %s certificate CA names\n", cs);
for (i = 0; i < sk_X509_NAME_num(sk); i++) {
X509_NAME_print_ex(bio, sk_X509_NAME_value(sk, i), 0, get_nameopt());
BIO_write(bio, "\n", 1);
diff --git a/apps/lib/vms_term_sock.c b/apps/lib/vms_term_sock.c
index 1b27699b9d..a1aeb6df06 100644
--- a/apps/lib/vms_term_sock.c
+++ b/apps/lib/vms_term_sock.c
@@ -120,7 +120,7 @@ typedef struct _SocketPairTimeoutBlock {
} SPTB;
# ifdef TERM_SOCK_TEST
-
+
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
@@ -160,7 +160,7 @@ int main (int argc, char *argv[], char *envp[])
}
# endif
-
+
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
@@ -275,7 +275,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
return TERM_SOCK_SUCCESS;
}
-
+
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
@@ -441,7 +441,7 @@ static int CreateSocketPair (int SocketFamily,
sin.sin_port = LocalHostPort ;
status = connect (SockDesc2, (struct sockaddr *) &sin, sizeof(sin));
- if (status < 0 ) {
+ if (status < 0) {
LogMessage ("CreateSocketPair: connect () - %d", errno);
sys$cantim (&sptb, 0);
sys$cancel (TcpAcceptChan);
@@ -485,7 +485,7 @@ static int CreateSocketPair (int SocketFamily,
return (0) ;
}
-
+
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
@@ -499,7 +499,7 @@ static void SocketPairTimeoutAst (int astparm)
return;
}
-
+
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
@@ -538,7 +538,7 @@ static int TerminalDeviceAst (int astparm)
return status;
}
-
+
/*----------------------------------------------------------------------------*/
/* */
/*----------------------------------------------------------------------------*/
diff --git a/apps/mac.c b/apps/mac.c
index 5f80ca22c7..08f06be867 100644
--- a/apps/mac.c
+++ b/apps/mac.c
@@ -221,7 +221,7 @@ opthelp:
for (i = 0; i < (int)len; ++i)
BIO_printf(out, "%02X", buf[i]);
if (outfile == NULL)
- BIO_printf(out,"\n");
+ BIO_printf(out, "\n");