[openssl] master update
Dr. Paul Dale
pauli at openssl.org
Tue Jan 18 04:11:01 UTC 2022
The branch master has been updated
via 14951ef01f9b54d804baf2fabdf0a715c630827b (commit)
via b461aff257e57b8ba8e72667078fdf6d5047bc91 (commit)
via a09a342ffb459d0913954111b7802815e9a3481a (commit)
via d715dbd8e566e7827ce8b2e9b6687c2bcd8a89a0 (commit)
via e52698f9e33d77419dca827774e5d0bc1815100d (commit)
via 1e3317278e4890e812a032b39c7c9dc43ca01458 (commit)
from f242ce9817157817b19ccb303fd436fe487539b3 (commit)
- Log -----------------------------------------------------------------
commit 14951ef01f9b54d804baf2fabdf0a715c630827b
Author: Pauli <pauli at openssl.org>
Date: Mon Jan 17 16:51:03 2022 +1100
e_dasync: remove empty statement
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17528)
commit b461aff257e57b8ba8e72667078fdf6d5047bc91
Author: Pauli <pauli at openssl.org>
Date: Mon Jan 17 16:50:16 2022 +1100
demo: remove end of line whitespace
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17528)
commit a09a342ffb459d0913954111b7802815e9a3481a
Author: Pauli <pauli at openssl.org>
Date: Mon Jan 17 16:49:58 2022 +1100
speed: rework if condition to avoid empty statement
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17528)
commit d715dbd8e566e7827ce8b2e9b6687c2bcd8a89a0
Author: Pauli <pauli at openssl.org>
Date: Mon Jan 17 10:37:20 2022 +1100
replace ;; with ; as statement separator
Fixes #17525
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17528)
commit e52698f9e33d77419dca827774e5d0bc1815100d
Author: Pauli <pauli at openssl.org>
Date: Mon Jan 17 10:36:46 2022 +1100
apps/ca: replace ;; with ; as statement separator
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17528)
commit 1e3317278e4890e812a032b39c7c9dc43ca01458
Author: Pauli <pauli at openssl.org>
Date: Mon Jan 17 10:36:06 2022 +1100
ssl: replace ;; with ; as statement separator
Reviewed-by: Tim Hudson <tjh at openssl.org>
Reviewed-by: Bernd Edlinger <bernd.edlinger at hotmail.de>
Reviewed-by: Matt Caswell <matt at openssl.org>
(Merged from https://github.com/openssl/openssl/pull/17528)
-----------------------------------------------------------------------
Summary of changes:
apps/ca.c | 2 +-
apps/speed.c | 4 +---
crypto/rsa/rsa_backend.c | 2 +-
crypto/x509/x509_trust.c | 2 +-
demos/digest/EVP_MD_demo.c | 2 +-
engines/e_dasync.c | 1 -
providers/implementations/keymgmt/dh_kmgmt.c | 2 +-
ssl/ssl_rsa.c | 2 +-
ssl/statem/statem_lib.c | 2 +-
ssl/t1_lib.c | 2 +-
10 files changed, 9 insertions(+), 12 deletions(-)
diff --git a/apps/ca.c b/apps/ca.c
index a9d6c5c1a6..271f7de9df 100644
--- a/apps/ca.c
+++ b/apps/ca.c
@@ -1855,7 +1855,7 @@ static int do_body(X509 **xret, EVP_PKEY *pkey, X509 *x509,
p = "Valid";
else
p = "\ninvalid type, Data base error\n";
- BIO_printf(bio_err, "Type :%s\n", p);;
+ BIO_printf(bio_err, "Type :%s\n", p);
if (rrow[DB_type][0] == DB_TYPE_REV) {
p = rrow[DB_exp_date];
if (p == NULL)
diff --git a/apps/speed.c b/apps/speed.c
index 0ee7347f5b..02e7b1f9b2 100644
--- a/apps/speed.c
+++ b/apps/speed.c
@@ -3551,9 +3551,7 @@ static int do_multi(int multi, int size_num)
d = atof(sstrsep(&p, sep));
ffdh_results[k][0] += d;
# endif /* OPENSSL_NO_DH */
- } else if (HAS_PREFIX(buf, "+H:")) {
- ;
- } else {
+ } else if (!HAS_PREFIX(buf, "+H:")) {
BIO_printf(bio_err, "Unknown type '%s' from child %d\n", buf,
n);
}
diff --git a/crypto/rsa/rsa_backend.c b/crypto/rsa/rsa_backend.c
index dc397a6676..ae071f18bf 100644
--- a/crypto/rsa/rsa_backend.c
+++ b/crypto/rsa/rsa_backend.c
@@ -523,7 +523,7 @@ int ossl_rsa_pss_get_param_unverified(const RSA_PSS_PARAMS *pss,
if (pss->trailerField)
*ptrailerField = ASN1_INTEGER_get(pss->trailerField);
else
- *ptrailerField = ossl_rsa_pss_params_30_trailerfield(&pss_params);;
+ *ptrailerField = ossl_rsa_pss_params_30_trailerfield(&pss_params);
return 1;
}
diff --git a/crypto/x509/x509_trust.c b/crypto/x509/x509_trust.c
index ff578aee73..e71db0c9a1 100644
--- a/crypto/x509/x509_trust.c
+++ b/crypto/x509/x509_trust.c
@@ -166,7 +166,7 @@ int X509_TRUST_add(int id, int flags, int (*ck) (X509_TRUST *, X509 *, int),
if (trtable == NULL
&& (trtable = sk_X509_TRUST_new(tr_cmp)) == NULL) {
ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE);
- goto err;;
+ goto err;
}
if (!sk_X509_TRUST_push(trtable, trtmp)) {
ERR_raise(ERR_LIB_X509, ERR_R_MALLOC_FAILURE);
diff --git a/demos/digest/EVP_MD_demo.c b/demos/digest/EVP_MD_demo.c
index 99589bd344..747ce64775 100644
--- a/demos/digest/EVP_MD_demo.c
+++ b/demos/digest/EVP_MD_demo.c
@@ -62,7 +62,7 @@ const char * hamlet_2 =
"And lose the name of Action. Soft you now,\n"
"The fair Ophelia? Nymph in thy Orisons\n"
"Be all my sins remember'd.\n"
-;
+;
/* The known value of the SHA3-512 digest of the above soliloqy */
const unsigned char known_answer[] = {
diff --git a/engines/e_dasync.c b/engines/e_dasync.c
index 5a303a9f85..9f95fa2145 100644
--- a/engines/e_dasync.c
+++ b/engines/e_dasync.c
@@ -209,7 +209,6 @@ static int dasync_cipher_nids[] = {
static int bind_dasync(ENGINE *e)
{
/* Setup RSA */
- ;
if ((dasync_rsa_orig = EVP_PKEY_meth_find(EVP_PKEY_RSA)) == NULL
|| (dasync_rsa = EVP_PKEY_meth_new(EVP_PKEY_RSA,
EVP_PKEY_FLAG_AUTOARGLEN)) == NULL)
diff --git a/providers/implementations/keymgmt/dh_kmgmt.c b/providers/implementations/keymgmt/dh_kmgmt.c
index ab8ef3ac52..b49cfd5291 100644
--- a/providers/implementations/keymgmt/dh_kmgmt.c
+++ b/providers/implementations/keymgmt/dh_kmgmt.c
@@ -391,7 +391,7 @@ static int dh_validate_private(const DH *dh)
DH_get0_key(dh, NULL, &priv_key);
if (priv_key == NULL)
return 0;
- return ossl_dh_check_priv_key(dh, priv_key, &status);;
+ return ossl_dh_check_priv_key(dh, priv_key, &status);
}
static int dh_validate(const void *keydata, int selection, int checktype)
diff --git a/ssl/ssl_rsa.c b/ssl/ssl_rsa.c
index bba0051437..2b20cece92 100644
--- a/ssl/ssl_rsa.c
+++ b/ssl/ssl_rsa.c
@@ -573,7 +573,7 @@ static int serverinfo_find_extension(const unsigned char *serverinfo,
if (type == extension_type) {
*extension_data = PACKET_data(&data);
- *extension_length = PACKET_remaining(&data);;
+ *extension_length = PACKET_remaining(&data);
return 1; /* Success */
}
}
diff --git a/ssl/statem/statem_lib.c b/ssl/statem/statem_lib.c
index 334e1c7bd4..5c37e16b7f 100644
--- a/ssl/statem/statem_lib.c
+++ b/ssl/statem/statem_lib.c
@@ -2299,7 +2299,7 @@ int parse_ca_names(SSL *s, PACKET *pkt)
const STACK_OF(X509_NAME) *get_ca_names(SSL *s)
{
- const STACK_OF(X509_NAME) *ca_sk = NULL;;
+ const STACK_OF(X509_NAME) *ca_sk = NULL;
if (s->server) {
ca_sk = SSL_get_client_CA_list(s);
diff --git a/ssl/t1_lib.c b/ssl/t1_lib.c
index 88912be23c..ad248c4cdf 100644
--- a/ssl/t1_lib.c
+++ b/ssl/t1_lib.c
@@ -982,7 +982,7 @@ static int tls1_check_cert_param(SSL *s, X509 *x, int check_ee_md)
return 0; /* Should never happen */
for (i = 0; i < s->shared_sigalgslen; i++) {
if (check_md == s->shared_sigalgs[i]->sigandhash)
- return 1;;
+ return 1;
}
return 0;
}
More information about the openssl-commits
mailing list