aboutsummaryrefslogtreecommitdiffstats
path: root/apps
diff options
context:
space:
mode:
Diffstat (limited to 'apps')
-rw-r--r--apps/apps.c32
-rw-r--r--apps/asn1pars.c2
-rw-r--r--apps/ca.c16
-rw-r--r--apps/cms.c2
-rw-r--r--apps/crl.c2
-rw-r--r--apps/crl2p7.c4
-rw-r--r--apps/dgst.c2
-rw-r--r--apps/dhparam.c2
-rw-r--r--apps/dsa.c2
-rw-r--r--apps/dsaparam.c2
-rw-r--r--apps/ec.c2
-rw-r--r--apps/ecparam.c2
-rw-r--r--apps/engine.c2
-rw-r--r--apps/errstr.c2
-rw-r--r--apps/gendsa.c2
-rw-r--r--apps/genrsa.c2
-rw-r--r--apps/nseq.c2
-rw-r--r--apps/ocsp.c2
-rw-r--r--apps/openssl.c8
-rw-r--r--apps/passwd.c2
-rw-r--r--apps/pkcs7.c2
-rw-r--r--apps/rand.c2
-rw-r--r--apps/rsa.c2
-rw-r--r--apps/s_cb.c14
-rw-r--r--apps/s_client.c2
-rw-r--r--apps/s_server.c26
-rw-r--r--apps/sess_id.c4
-rw-r--r--apps/smime.c2
-rw-r--r--apps/speed.c2
-rw-r--r--apps/spkac.c2
-rw-r--r--apps/srp.c2
-rw-r--r--apps/ts.c2
-rw-r--r--apps/verify.c2
-rw-r--r--apps/version.c2
-rw-r--r--apps/vms_term_sock.c32
35 files changed, 95 insertions, 95 deletions
diff --git a/apps/apps.c b/apps/apps.c
index 16c99aae5b..e25739e43f 100644
--- a/apps/apps.c
+++ b/apps/apps.c
@@ -663,7 +663,7 @@ X509 *load_cert(const char *file, int format, const char *cert_descrip)
ERR_print_errors(bio_err);
}
BIO_free(cert);
- return (x);
+ return x;
}
X509_CRL *load_crl(const char *infile, int format)
@@ -697,7 +697,7 @@ X509_CRL *load_crl(const char *infile, int format)
end:
BIO_free(in);
- return (x);
+ return x;
}
EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
@@ -769,7 +769,7 @@ EVP_PKEY *load_key(const char *file, int format, int maybe_stdin,
BIO_printf(bio_err, "unable to load %s\n", key_descrip);
ERR_print_errors(bio_err);
}
- return (pkey);
+ return pkey;
}
EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
@@ -855,7 +855,7 @@ EVP_PKEY *load_pubkey(const char *file, int format, int maybe_stdin,
BIO_free(key);
if (pkey == NULL)
BIO_printf(bio_err, "unable to load %s\n", key_descrip);
- return (pkey);
+ return pkey;
}
static int load_certs_crls(const char *file, int format,
@@ -1334,7 +1334,7 @@ static int index_serial_cmp(const OPENSSL_CSTRING *a,
for (aa = a[DB_serial]; *aa == '0'; aa++) ;
for (bb = b[DB_serial]; *bb == '0'; bb++) ;
- return (strcmp(aa, bb));
+ return strcmp(aa, bb);
}
static int index_name_qual(char **a)
@@ -1349,7 +1349,7 @@ static unsigned long index_name_hash(const OPENSSL_CSTRING *a)
int index_name_cmp(const OPENSSL_CSTRING *a, const OPENSSL_CSTRING *b)
{
- return (strcmp(a[DB_name], b[DB_name]));
+ return strcmp(a[DB_name], b[DB_name]);
}
static IMPLEMENT_LHASH_HASH_FN(index_serial, OPENSSL_CSTRING)
@@ -1400,7 +1400,7 @@ BIGNUM *load_serial(const char *serialfile, int create, ASN1_INTEGER **retai)
err:
BIO_free(in);
ASN1_INTEGER_free(ai);
- return (ret);
+ return ret;
}
int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial,
@@ -1450,7 +1450,7 @@ int save_serial(const char *serialfile, const char *suffix, const BIGNUM *serial
err:
BIO_free_all(out);
ASN1_INTEGER_free(ai);
- return (ret);
+ return ret;
}
int rotate_serial(const char *serialfile, const char *new_suffix,
@@ -2153,7 +2153,7 @@ double app_tminterval(int stop, int usertime)
ret = (__int64)(tmstop.QuadPart - tmstart.QuadPart) * 1e-7;
}
- return (ret);
+ return ret;
}
#elif defined(OPENSSL_SYSTEM_VXWORKS)
# include <time.h>
@@ -2189,7 +2189,7 @@ double app_tminterval(int stop, int usertime)
else
ret = (now - tmstart) / (double)sysClkRateGet();
# endif
- return (ret);
+ return ret;
}
#elif defined(OPENSSL_SYSTEM_VMS)
@@ -2223,7 +2223,7 @@ double app_tminterval(int stop, int usertime)
else
ret = (now - tmstart) / (double)(CLK_TCK);
- return (ret);
+ return ret;
}
#elif defined(_SC_CLK_TCK) /* by means of unistd.h */
@@ -2246,7 +2246,7 @@ double app_tminterval(int stop, int usertime)
ret = (now - tmstart) / (double)tck;
}
- return (ret);
+ return ret;
}
#else
@@ -2371,9 +2371,9 @@ int raw_read_stdin(void *buf, int siz)
{
DWORD n;
if (ReadFile(GetStdHandle(STD_INPUT_HANDLE), buf, siz, &n, NULL))
- return (n);
+ return n;
else
- return (-1);
+ return -1;
}
#elif defined(__VMS)
# include <sys/socket.h>
@@ -2394,9 +2394,9 @@ int raw_write_stdout(const void *buf, int siz)
{
DWORD n;
if (WriteFile(GetStdHandle(STD_OUTPUT_HANDLE), buf, siz, &n, NULL))
- return (n);
+ return n;
else
- return (-1);
+ return -1;
}
#else
int raw_write_stdout(const void *buf, int siz)
diff --git a/apps/asn1pars.c b/apps/asn1pars.c
index 5ea0e62763..56a9adc2ff 100644
--- a/apps/asn1pars.c
+++ b/apps/asn1pars.c
@@ -306,7 +306,7 @@ int asn1parse_main(int argc, char **argv)
OPENSSL_free(str);
ASN1_TYPE_free(at);
sk_OPENSSL_STRING_free(osk);
- return (ret);
+ return ret;
}
static int do_generate(char *genstr, const char *genconf, BUF_MEM *buf)
diff --git a/apps/ca.c b/apps/ca.c
index 658dc8c818..d08db6b028 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1235,7 +1235,7 @@ end_of_options:
NCONF_free(conf);
NCONF_free(extconf);
release_engine(e);
- return (ret);
+ return ret;
}
static char *lookup_conf(const CONF *conf, const char *section, const char *tag)
@@ -1312,7 +1312,7 @@ static int certify(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
end:
X509_REQ_free(req);
BIO_free(in);
- return (ok);
+ return ok;
}
static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x509,
@@ -1365,7 +1365,7 @@ static int certify_cert(X509 **xret, const char *infile, EVP_PKEY *pkey, X509 *x
end:
X509_REQ_free(rreq);
X509_free(req);
- return (ok);
+ return ok;
}
static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
@@ -1866,7 +1866,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
X509_free(ret);
else
*xret = ret;
- return (ok);
+ return ok;
}
static void write_new_certificate(BIO *bp, X509 *x, int output_der, int notext)
@@ -2013,7 +2013,7 @@ static int certify_spkac(X509 **xret, const char *infile, EVP_PKEY *pkey,
NETSCAPE_SPKI_free(spki);
X509_NAME_ENTRY_free(ne);
- return (ok);
+ return ok;
}
static int check_time_format(const char *str)
@@ -2119,7 +2119,7 @@ static int do_revoke(X509 *x509, CA_DB *db, REVINFO_TYPE rev_type,
end:
for (i = 0; i < DB_NUMBER; i++)
OPENSSL_free(row[i]);
- return (ok);
+ return ok;
}
static int get_certificate_status(const char *serial, CA_DB *db)
@@ -2186,7 +2186,7 @@ static int get_certificate_status(const char *serial, CA_DB *db)
for (i = 0; i < DB_NUMBER; i++) {
OPENSSL_free(row[i]);
}
- return (ok);
+ return ok;
}
static int do_updatedb(CA_DB *db)
@@ -2244,7 +2244,7 @@ static int do_updatedb(CA_DB *db)
ASN1_UTCTIME_free(a_tm);
OPENSSL_free(a_tm_s);
- return (cnt);
+ return cnt;
}
static const char *crl_reasons[] = {
diff --git a/apps/cms.c b/apps/cms.c
index 543d0137c4..1457cabee7 100644
--- a/apps/cms.c
+++ b/apps/cms.c
@@ -1103,7 +1103,7 @@ int cms_main(int argc, char **argv)
BIO_free(indata);
BIO_free_all(out);
OPENSSL_free(passin);
- return (ret);
+ return ret;
}
static int save_certs(char *signerfile, STACK_OF(X509) *signers)
diff --git a/apps/crl.c b/apps/crl.c
index ce589bbc1d..5e1f109a6b 100644
--- a/apps/crl.c
+++ b/apps/crl.c
@@ -337,5 +337,5 @@ int crl_main(int argc, char **argv)
X509_CRL_free(x);
X509_STORE_CTX_free(ctx);
X509_STORE_free(store);
- return (ret);
+ return ret;
}
diff --git a/apps/crl2p7.c b/apps/crl2p7.c
index 95b71e44f1..79217e9efc 100644
--- a/apps/crl2p7.c
+++ b/apps/crl2p7.c
@@ -162,7 +162,7 @@ int crl2pkcs7_main(int argc, char **argv)
PKCS7_free(p7);
X509_CRL_free(crl);
- return (ret);
+ return ret;
}
/*-
@@ -212,5 +212,5 @@ static int add_certs_from_file(STACK_OF(X509) *stack, char *certfile)
/* never need to OPENSSL_free x */
BIO_free(in);
sk_X509_INFO_free(sk);
- return (ret);
+ return ret;
}
diff --git a/apps/dgst.c b/apps/dgst.c
index 46aa59ad24..ba63e123de 100644
--- a/apps/dgst.c
+++ b/apps/dgst.c
@@ -398,7 +398,7 @@ int dgst_main(int argc, char **argv)
OPENSSL_free(sigbuf);
BIO_free(bmd);
release_engine(e);
- return (ret);
+ return ret;
}
int do_fp(BIO *out, unsigned char *buf, BIO *bp, int sep, int binout,
diff --git a/apps/dhparam.c b/apps/dhparam.c
index 28ae6c30f0..7c7d684163 100644
--- a/apps/dhparam.c
+++ b/apps/dhparam.c
@@ -364,7 +364,7 @@ int dhparam_main(int argc, char **argv)
BIO_free_all(out);
DH_free(dh);
release_engine(e);
- return (ret);
+ return ret;
}
static int dh_cb(int p, int n, BN_GENCB *cb)
diff --git a/apps/dsa.c b/apps/dsa.c
index 89599fc5c2..5410f04e37 100644
--- a/apps/dsa.c
+++ b/apps/dsa.c
@@ -256,6 +256,6 @@ int dsa_main(int argc, char **argv)
release_engine(e);
OPENSSL_free(passin);
OPENSSL_free(passout);
- return (ret);
+ return ret;
}
#endif
diff --git a/apps/dsaparam.c b/apps/dsaparam.c
index 39185e3403..2f43b1f096 100644
--- a/apps/dsaparam.c
+++ b/apps/dsaparam.c
@@ -230,7 +230,7 @@ int dsaparam_main(int argc, char **argv)
BIO_free_all(out);
DSA_free(dsa);
release_engine(e);
- return (ret);
+ return ret;
}
static int dsa_cb(int p, int n, BN_GENCB *cb)
diff --git a/apps/ec.c b/apps/ec.c
index 859623e2a3..6fc6a6f625 100644
--- a/apps/ec.c
+++ b/apps/ec.c
@@ -277,6 +277,6 @@ int ec_main(int argc, char **argv)
release_engine(e);
OPENSSL_free(passin);
OPENSSL_free(passout);
- return (ret);
+ return ret;
}
#endif
diff --git a/apps/ecparam.c b/apps/ecparam.c
index 6521ccb52d..7529f241fb 100644
--- a/apps/ecparam.c
+++ b/apps/ecparam.c
@@ -437,7 +437,7 @@ int ecparam_main(int argc, char **argv)
release_engine(e);
BIO_free(in);
BIO_free_all(out);
- return (ret);
+ return ret;
}
#endif
diff --git a/apps/engine.c b/apps/engine.c
index 5d4708207e..8ada13dce5 100644
--- a/apps/engine.c
+++ b/apps/engine.c
@@ -483,6 +483,6 @@ int engine_main(int argc, char **argv)
sk_OPENSSL_STRING_free(pre_cmds);
sk_OPENSSL_STRING_free(post_cmds);
BIO_free_all(out);
- return (ret);
+ return ret;
}
#endif
diff --git a/apps/errstr.c b/apps/errstr.c
index a02fa689dc..324e6e49ae 100644
--- a/apps/errstr.c
+++ b/apps/errstr.c
@@ -62,5 +62,5 @@ int errstr_main(int argc, char **argv)
}
}
end:
- return (ret);
+ return ret;
}
diff --git a/apps/gendsa.c b/apps/gendsa.c
index fa6832375b..c57511cfa1 100644
--- a/apps/gendsa.c
+++ b/apps/gendsa.c
@@ -133,6 +133,6 @@ int gendsa_main(int argc, char **argv)
DSA_free(dsa);
release_engine(e);
OPENSSL_free(passout);
- return (ret);
+ return ret;
}
#endif
diff --git a/apps/genrsa.c b/apps/genrsa.c
index ebd69e15ed..b4a986cb58 100644
--- a/apps/genrsa.c
+++ b/apps/genrsa.c
@@ -166,7 +166,7 @@ opthelp:
OPENSSL_free(passout);
if (ret != 0)
ERR_print_errors(bio_err);
- return (ret);
+ return ret;
}
static int genrsa_cb(int p, int n, BN_GENCB *cb)
diff --git a/apps/nseq.c b/apps/nseq.c
index a97fe1828f..82850b8118 100644
--- a/apps/nseq.c
+++ b/apps/nseq.c
@@ -109,5 +109,5 @@ int nseq_main(int argc, char **argv)
BIO_free_all(out);
NETSCAPE_CERT_SEQUENCE_free(seq);
- return (ret);
+ return ret;
}
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 8f7b1c8b0b..a8378a938a 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -747,7 +747,7 @@ redo_accept:
OPENSSL_free(tport);
OPENSSL_free(tpath);
- return (ret);
+ return ret;
}
static int add_ocsp_cert(OCSP_REQUEST **req, X509 *cert,
diff --git a/apps/openssl.c b/apps/openssl.c
index 402a818a83..2edd70086f 100644
--- a/apps/openssl.c
+++ b/apps/openssl.c
@@ -534,7 +534,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
FUNCTION f, *fp;
if (argc <= 0 || argv[0] == NULL)
- return (0);
+ return 0;
f.name = argv[0];
fp = lh_FUNCTION_retrieve(prog, &f);
if (fp == NULL) {
@@ -549,7 +549,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
}
}
if (fp != NULL) {
- return (fp->func(argc, argv));
+ return fp->func(argc, argv);
}
if ((strncmp(argv[0], "no-", 3)) == 0) {
/*
@@ -559,7 +559,7 @@ static int do_cmd(LHASH_OF(FUNCTION) *prog, int argc, char *argv[])
f.name = argv[0] + 3;
if (lh_FUNCTION_retrieve(prog, &f) == NULL) {
BIO_printf(bio_out, "%s\n", argv[0]);
- return (0);
+ return 0;
}
BIO_printf(bio_out, "%s\n", argv[0] + 3);
return 1;
@@ -790,7 +790,7 @@ static LHASH_OF(FUNCTION) *prog_init(void)
qsort(functions, i, sizeof(*functions), SortFnByName);
if ((ret = lh_FUNCTION_new(function_hash, function_cmp)) == NULL)
- return (NULL);
+ return NULL;
for (f = functions; f->name != NULL; f++)
(void)lh_FUNCTION_insert(ret, f);
diff --git a/apps/passwd.c b/apps/passwd.c
index f4ae58200f..220a1885dc 100644
--- a/apps/passwd.c
+++ b/apps/passwd.c
@@ -295,7 +295,7 @@ int passwd_main(int argc, char **argv)
OPENSSL_free(salt_malloc);
OPENSSL_free(passwd_malloc);
BIO_free(in);
- return (ret);
+ return ret;
}
/*
diff --git a/apps/pkcs7.c b/apps/pkcs7.c
index 45e9c7df89..8dc77927f1 100644
--- a/apps/pkcs7.c
+++ b/apps/pkcs7.c
@@ -193,5 +193,5 @@ int pkcs7_main(int argc, char **argv)
release_engine(e);
BIO_free(in);
BIO_free_all(out);
- return (ret);
+ return ret;
}
diff --git a/apps/rand.c b/apps/rand.c
index cf45b43b2c..05b944287a 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -128,5 +128,5 @@ int rand_main(int argc, char **argv)
ERR_print_errors(bio_err);
release_engine(e);
BIO_free_all(out);
- return (ret);
+ return ret;
}
diff --git a/apps/rsa.c b/apps/rsa.c
index ebb02eaf7c..04f69c83c4 100644
--- a/apps/rsa.c
+++ b/apps/rsa.c
@@ -307,6 +307,6 @@ int rsa_main(int argc, char **argv)
RSA_free(rsa);
OPENSSL_free(passin);
OPENSSL_free(passout);
- return (ret);
+ return ret;
}
#endif
diff --git a/apps/s_cb.c b/apps/s_cb.c
index e82d4d036c..79d29199ea 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -100,7 +100,7 @@ int verify_callback(int ok, X509_STORE_CTX *ctx)
policies_print(ctx);
if (ok && !verify_args.quiet)
BIO_printf(bio_err, "verify return:%d\n", ok);
- return (ok);
+ return ok;
}
int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
@@ -111,7 +111,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
BIO_printf(bio_err, "unable to get certificate from '%s'\n",
cert_file);
ERR_print_errors(bio_err);
- return (0);
+ return 0;
}
if (key_file == NULL)
key_file = cert_file;
@@ -119,7 +119,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
BIO_printf(bio_err, "unable to get private key from '%s'\n",
key_file);
ERR_print_errors(bio_err);
- return (0);
+ return 0;
}
/*
@@ -134,7 +134,7 @@ int set_cert_stuff(SSL_CTX *ctx, char *cert_file, char *key_file)
if (!SSL_CTX_check_private_key(ctx)) {
BIO_printf(bio_err,
"Private key does not match the certificate public key\n");
- return (0);
+ return 0;
}
}
return 1;
@@ -423,19 +423,19 @@ long bio_dump_callback(BIO *bio, int cmd, const char *argp,
out = (BIO *)BIO_get_callback_arg(bio);
if (out == NULL)
- return (ret);
+ return ret;
if (cmd == (BIO_CB_READ | BIO_CB_RETURN)) {
BIO_printf(out, "read from %p [%p] (%lu bytes => %ld (0x%lX))\n",
(void *)bio, (void *)argp, (unsigned long)argi, ret, ret);
BIO_dump(out, argp, (int)ret);
- return (ret);
+ return ret;
} else if (cmd == (BIO_CB_WRITE | BIO_CB_RETURN)) {
BIO_printf(out, "write to %p [%p] (%lu bytes => %ld (0x%lX))\n",
(void *)bio, (void *)argp, (unsigned long)argi, ret, ret);
BIO_dump(out, argp, (int)ret);
}
- return (ret);
+ return ret;
}
void apps_ssl_info_callback(const SSL *s, int where, int ret)
diff --git a/apps/s_client.c b/apps/s_client.c
index 1676696443..96bfc159d7 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -3053,7 +3053,7 @@ int s_client_main(int argc, char **argv)
bio_c_out = NULL;
BIO_free(bio_c_msg);
bio_c_msg = NULL;
- return (ret);
+ return ret;
}
static void print_stuff(BIO *bio, SSL *s, int full)
diff --git a/apps/s_server.c b/apps/s_server.c
index ea23d892e7..a7d85f3849 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -255,7 +255,7 @@ static int ssl_srp_server_param_cb(SSL *s, int *ad, void *arg)
if (p->login == NULL && p->user == NULL) {
p->login = SSL_get_srp_username(s);
BIO_printf(bio_err, "SRP username = \"%s\"\n", p->login);
- return (-1);
+ return -1;
}
if (p->user == NULL) {
@@ -355,9 +355,9 @@ static int ebcdic_read(BIO *b, char *out, int outl)
BIO *next = BIO_next(b);
if (out == NULL || outl == 0)
- return (0);
+ return 0;
if (next == NULL)
- return (0);
+ return 0;
ret = BIO_read(next, out, outl);
if (ret > 0)
@@ -373,7 +373,7 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
int num;
if ((in == NULL) || (inl <= 0))
- return (0);
+ return 0;
if (next == NULL)
return 0;
@@ -396,7 +396,7 @@ static int ebcdic_write(BIO *b, const char *in, int inl)
ret = BIO_write(next, wbuf->buff, inl);
- return (ret);
+ return ret;
}
static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr)
@@ -405,7 +405,7 @@ static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr)
BIO *next = BIO_next(b);
if (next == NULL)
- return (0);
+ return 0;
switch (cmd) {
case BIO_CTRL_DUP:
ret = 0L;
@@ -414,7 +414,7 @@ static long ebcdic_ctrl(BIO *b, int cmd, long num, void *ptr)
ret = BIO_ctrl(next, cmd, num, ptr);
break;
}
- return (ret);
+ return ret;
}
static int ebcdic_gets(BIO *bp, char *buf, int size)
@@ -2140,7 +2140,7 @@ int s_server_main(int argc, char *argv[])
#ifdef CHARSET_EBCDIC
BIO_meth_free(methods_ebcdic);
#endif
- return (ret);
+ return ret;
}
static void print_stats(BIO *bio, SSL_CTX *ssl_ctx)
@@ -2657,7 +2657,7 @@ static int sv_body(int s, int stype, int prot, unsigned char *context)
if (ret >= 0)
BIO_printf(bio_s_out, "ACCEPT\n");
(void)BIO_flush(bio_s_out);
- return (ret);
+ return ret;
}
static void close_accept_socket(void)
@@ -2772,7 +2772,7 @@ static int init_ssl_connection(SSL *con)
}
/* Always print any error messages */
ERR_print_errors(bio_err);
- return (0);
+ return 0;
}
print_connection_info(con);
@@ -2875,7 +2875,7 @@ static DH *load_dh_param(const char *dhfile)
ret = PEM_read_bio_DHparams(bio, NULL, NULL, NULL);
err:
BIO_free(bio);
- return (ret);
+ return ret;
}
#endif
@@ -3263,7 +3263,7 @@ static int www_body(int s, int stype, int prot, unsigned char *context)
BIO_printf(bio_s_out, "ACCEPT\n");
OPENSSL_free(buf);
BIO_free_all(io);
- return (ret);
+ return ret;
}
static int rev_body(int s, int stype, int prot, unsigned char *context)
@@ -3416,7 +3416,7 @@ static int rev_body(int s, int stype, int prot, unsigned char *context)
OPENSSL_free(buf);
BIO_free_all(io);
- return (ret);
+ return ret;
}
#define MAX_SESSION_ID_ATTEMPTS 10
diff --git a/apps/sess_id.c b/apps/sess_id.c
index b9f249e5ac..f0c76b1917 100644
--- a/apps/sess_id.c
+++ b/apps/sess_id.c
@@ -163,7 +163,7 @@ int sess_id_main(int argc, char **argv)
end:
BIO_free_all(out);
SSL_SESSION_free(x);
- return (ret);
+ return ret;
}
static SSL_SESSION *load_sess_id(char *infile, int format)
@@ -186,5 +186,5 @@ static SSL_SESSION *load_sess_id(char *infile, int format)
end:
BIO_free(in);
- return (x);
+ return x;
}
diff --git a/apps/smime.c b/apps/smime.c
index 8617ba4937..43d63704f9 100644
--- a/apps/smime.c
+++ b/apps/smime.c
@@ -609,7 +609,7 @@ int smime_main(int argc, char **argv)
BIO_free(indata);
BIO_free_all(out);
OPENSSL_free(passin);
- return (ret);
+ return ret;
}
static int save_certs(char *signerfile, STACK_OF(X509) *signers)
diff --git a/apps/speed.c b/apps/speed.c
index 44aeb44f5f..5f293ec55b 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -2938,7 +2938,7 @@ int speed_main(int argc, char **argv)
}
OPENSSL_free(loopargs);
release_engine(e);
- return (ret);
+ return ret;
}
static void print_message(const char *s, long num, int length)
diff --git a/apps/spkac.c b/apps/spkac.c
index d1414d6713..c0817517c2 100644
--- a/apps/spkac.c
+++ b/apps/spkac.c
@@ -197,5 +197,5 @@ int spkac_main(int argc, char **argv)
EVP_PKEY_free(pkey);
release_engine(e);
OPENSSL_free(passin);
- return (ret);
+ return ret;
}
diff --git a/apps/srp.c b/apps/srp.c
index ceb0640c2f..b8fcf71609 100644
--- a/apps/srp.c
+++ b/apps/srp.c
@@ -603,6 +603,6 @@ int srp_main(int argc, char **argv)
NCONF_free(conf);
free_index(db);
release_engine(e);
- return (ret);
+ return ret;
}
#endif
diff --git a/apps/ts.c b/apps/ts.c
index 5e7729e388..96da50e51e 100644
--- a/apps/ts.c
+++ b/apps/ts.c
@@ -320,7 +320,7 @@ int ts_main(int argc, char **argv)
X509_VERIFY_PARAM_free(vpm);
NCONF_free(conf);
OPENSSL_free(password);
- return (ret);
+ return ret;
}
/*
diff --git a/apps/verify.c b/apps/verify.c
index a814649987..1dccf76130 100644
--- a/apps/verify.c
+++ b/apps/verify.c
@@ -313,5 +313,5 @@ static int cb(int ok, X509_STORE_CTX *ctx)
policies_print(ctx);
if (!v_verbose)
ERR_clear_error();
- return (ok);
+ return ok;
}
diff --git a/apps/version.c b/apps/version.c
index 57b9fd663f..7fc9a27d67 100644
--- a/apps/version.c
+++ b/apps/version.c
@@ -188,5 +188,5 @@ opthelp:
}
ret = 0;
end:
- return (ret);
+ return ret;
}
diff --git a/apps/vms_term_sock.c b/apps/vms_term_sock.c
index ff954ed283..64521224ec 100644
--- a/apps/vms_term_sock.c
+++ b/apps/vms_term_sock.c
@@ -184,7 +184,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
close (TerminalSocketPair[0]);
if (TerminalSocketPair[1])
close (TerminalSocketPair[1]);
- return (TERM_SOCK_FAILURE);
+ return TERM_SOCK_FAILURE;
}
/*
@@ -197,7 +197,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
LogMessage ("TerminalSocket: SYS$ASSIGN () - %08X", status);
close (TerminalSocketPair[0]);
close (TerminalSocketPair[1]);
- return (TERM_SOCK_FAILURE);
+ return TERM_SOCK_FAILURE;
}
/*
@@ -216,7 +216,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
LogMessage ("TerminalSocket: SYS$QIO () - %08X", status);
close (TerminalSocketPair[0]);
close (TerminalSocketPair[1]);
- return (TERM_SOCK_FAILURE);
+ return TERM_SOCK_FAILURE;
}
/*
@@ -234,7 +234,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
LogMessage ("TerminalSocket: SYS$CANCEL () - %08X", status);
close (TerminalSocketPair[0]);
close (TerminalSocketPair[1]);
- return (TERM_SOCK_FAILURE);
+ return TERM_SOCK_FAILURE;
}
/*
@@ -245,7 +245,7 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
LogMessage ("TerminalSocket: SYS$DASSGN () - %08X", status);
close (TerminalSocketPair[0]);
close (TerminalSocketPair[1]);
- return (TERM_SOCK_FAILURE);
+ return TERM_SOCK_FAILURE;
}
/*
@@ -265,14 +265,14 @@ int TerminalSocket (int FunctionCode, int *ReturnSocket)
** Invalid function code
*/
LogMessage ("TerminalSocket: Invalid Function Code - %d", FunctionCode);
- return (TERM_SOCK_FAILURE);
+ return TERM_SOCK_FAILURE;
break;
}
/*
** Return success
*/
- return (TERM_SOCK_SUCCESS);
+ return TERM_SOCK_SUCCESS;
}
@@ -312,7 +312,7 @@ static int CreateSocketPair (int SocketFamily,
SockDesc1 = socket (SocketFamily, SocketType, 0);
if (SockDesc1 < 0) {
LogMessage ("CreateSocketPair: socket () - %d", errno);
- return (-1);
+ return -1;
}
/*
@@ -331,7 +331,7 @@ static int CreateSocketPair (int SocketFamily,
if (status < 0) {
LogMessage ("CreateSocketPair: bind () - %d", errno);
close (SockDesc1);
- return (-1);
+ return -1;
}
/*
@@ -341,7 +341,7 @@ static int CreateSocketPair (int SocketFamily,
if (status < 0) {
LogMessage ("CreateSocketPair: getsockname () - %d", errno);
close (SockDesc1);
- return (-1);
+ return -1;
} else
LocalHostPort = sin.sin_port;
@@ -360,7 +360,7 @@ static int CreateSocketPair (int SocketFamily,
if (! (status & 1)) {
LogMessage ("CreateSocketPair: SYS$BINTIM () - %08X", status);
close (SockDesc1);
- return (-1);
+ return -1;
}
/*
@@ -371,7 +371,7 @@ static int CreateSocketPair (int SocketFamily,
if (! (status & 1)) {
LogMessage ("CreateSocketPair: SYS$ASSIGN () - %08X", status);
close (SockDesc1);
- return (-1);
+ return -1;
}
/*
@@ -393,7 +393,7 @@ static int CreateSocketPair (int SocketFamily,
LogMessage ("CreateSocketPair: SYS$QIO () - %08X", status);
close (SockDesc1);
sys$dassgn (TcpDeviceChan);
- return (-1);
+ return -1;
}
/*
@@ -429,7 +429,7 @@ static int CreateSocketPair (int SocketFamily,
close (SockDesc1);
close (SockDesc2);
sys$dassgn (TcpDeviceChan);
- return (-1);
+ return -1;
}
/*
@@ -448,7 +448,7 @@ static int CreateSocketPair (int SocketFamily,
close (SockDesc1);
close (SockDesc2);
sys$dassgn (TcpDeviceChan);
- return (-1);
+ return -1;
}
/*
@@ -468,7 +468,7 @@ static int CreateSocketPair (int SocketFamily,
close (SockDesc1);
close (SockDesc2);
sys$dassgn (TcpDeviceChan);
- return (-1);
+ return -1;
}
/*