From 710069c19ee1795dfd614a4ba683d07e1b8e6f81 Mon Sep 17 00:00:00 2001
From: "Dr. Stephen Henson" <steve@openssl.org>
Date: Sun, 12 Aug 2007 17:44:32 +0000
Subject: [PATCH] Fix warnings.
---
apps/ocsp.c | 2 +-
apps/rand.c | 2 +-
apps/req.c | 2 +-
apps/s_cb.c | 4 +--
apps/s_client.c | 14 +++++-----
apps/s_server.c | 2 +-
crypto/bn/bntest.c | 60 ++++++++++++++++++++--------------------
crypto/ecdh/ecdhtest.c | 10 +++----
crypto/ecdsa/ecdsatest.c | 22 +++++++--------
crypto/ocsp/ocsp_ht.c | 2 +-
crypto/pkcs7/pk7_mime.c | 8 +++---
crypto/pkcs7/pk7_smime.c | 2 +-
ssl/d1_both.c | 2 +-
13 files changed, 66 insertions(+), 66 deletions(-)
diff --git a/apps/ocsp.c b/apps/ocsp.c
index 127eef6681..219dc2f359 100644
--- a/apps/ocsp.c
+++ b/apps/ocsp.c
@@ -1244,7 +1244,7 @@ static int send_ocsp_response(BIO *cbio, OCSP_RESPONSE *resp)
return 0;
BIO_printf(cbio, http_resp, i2d_OCSP_RESPONSE(resp, NULL));
i2d_OCSP_RESPONSE_bio(cbio, resp);
- BIO_flush(cbio);
+ (void)BIO_flush(cbio);
return 1;
}
diff --git a/apps/rand.c b/apps/rand.c
index a893896033..c3b26c466d 100644
--- a/apps/rand.c
+++ b/apps/rand.c
@@ -213,7 +213,7 @@ int MAIN(int argc, char **argv)
BIO_write(out, buf, chunk);
num -= chunk;
}
- BIO_flush(out);
+ (void)BIO_flush(out);
app_RAND_write_file(NULL, bio_err);
ret = 0;
diff --git a/apps/req.c b/apps/req.c
index 745ba7035f..cd59fe077e 100644
--- a/apps/req.c
+++ b/apps/req.c
@@ -1648,7 +1648,7 @@ static EVP_PKEY_CTX *set_keygen_ctx(BIO *err, const char *gstr, int *pkey_type,
if (!param)
{
X509 *x;
- BIO_reset(pbio);
+ (void)BIO_reset(pbio);
x = PEM_read_bio_X509(pbio, NULL, NULL, NULL);
if (x)
{
diff --git a/apps/s_cb.c b/apps/s_cb.c
index fb33dee287..31616bb66d 100644
--- a/apps/s_cb.c
+++ b/apps/s_cb.c
@@ -590,7 +590,7 @@ void MS_CALLBACK msg_cb(int write_p, int version, int content_type, const void *
BIO_printf(bio, " ...");
BIO_printf(bio, "\n");
}
- BIO_flush(bio);
+ (void)BIO_flush(bio);
}
void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
@@ -648,6 +648,6 @@ void MS_CALLBACK tlsext_cb(SSL *s, int client_server, int type,
BIO_printf(bio, "TLS %s extension \"%s\" (id=%d), len=%d\n",
client_server ? "server": "client",
extname, type, len);
- BIO_dump(bio, data, len);
+ BIO_dump(bio, (char *)data, len);
BIO_flush(bio);
}
diff --git a/apps/s_client.c b/apps/s_client.c
index 2d234a6926..59a4daa98a 100644
--- a/apps/s_client.c
+++ b/apps/s_client.c
@@ -893,7 +893,7 @@ re_start:
goto end;
}
- BIO_ctrl_set_connected(sbio, 1, &peer);
+ (void)BIO_ctrl_set_connected(sbio, 1, &peer);
if (enable_timeouts)
{
@@ -984,7 +984,7 @@ re_start:
while (mbuf_len>3 && mbuf[3]=='-');
/* STARTTLS command requires EHLO... */
BIO_printf(fbio,"EHLO openssl.client.net\r\n");
- BIO_flush(fbio);
+ (void)BIO_flush(fbio);
/* wait for multi-line response to end EHLO SMTP response */
do
{
@@ -993,7 +993,7 @@ re_start:
foundit=1;
}
while (mbuf_len>3 && mbuf[3]=='-');
- BIO_flush(fbio);
+ (void)BIO_flush(fbio);
BIO_pop(fbio);
BIO_free(fbio);
if (!foundit)
@@ -1017,7 +1017,7 @@ re_start:
BIO_gets(fbio,mbuf,BUFSIZZ);
/* STARTTLS command requires CAPABILITY... */
BIO_printf(fbio,". CAPABILITY\r\n");
- BIO_flush(fbio);
+ (void)BIO_flush(fbio);
/* wait for multi-line CAPABILITY response */
do
{
@@ -1026,7 +1026,7 @@ re_start:
foundit=1;
}
while (mbuf_len>3 && mbuf[0]!='.');
- BIO_flush(fbio);
+ (void)BIO_flush(fbio);
BIO_pop(fbio);
BIO_free(fbio);
if (!foundit)
@@ -1046,7 +1046,7 @@ re_start:
mbuf_len = BIO_gets(fbio,mbuf,BUFSIZZ);
}
while (mbuf_len>3 && mbuf[3]=='-');
- BIO_flush(fbio);
+ (void)BIO_flush(fbio);
BIO_pop(fbio);
BIO_free(fbio);
BIO_printf(sbio,"AUTH TLS\r\n");
@@ -1578,6 +1578,6 @@ static void print_stuff(BIO *bio, SSL *s, int full)
if (peer != NULL)
X509_free(peer);
/* flush, or debugging output gets mixed with http response */
- BIO_flush(bio);
+ (void)BIO_flush(bio);
}
diff --git a/apps/s_server.c b/apps/s_server.c
index fc6256afe8..ac36039a14 100644
--- a/apps/s_server.c
+++ b/apps/s_server.c
@@ -1458,7 +1458,7 @@ bad:
}
BIO_printf(bio_s_out,"ACCEPT\n");
- BIO_flush(bio_s_out);
+ (void)BIO_flush(bio_s_out);
if (www)
do_server(port,socket_type,&accept_socket,www_body, context);
else
diff --git a/crypto/bn/bntest.c b/crypto/bn/bntest.c
index fd5e21cbe6..565590a1f1 100644
--- a/crypto/bn/bntest.c
+++ b/crypto/bn/bntest.c
@@ -184,120 +184,120 @@ int main(int argc, char *argv[])
message(out,"BN_add");
if (!test_add(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_sub");
if (!test_sub(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_lshift1");
if (!test_lshift1(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_lshift (fixed)");
if (!test_lshift(out,ctx,BN_bin2bn(lst,sizeof(lst)-1,NULL)))
goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_lshift");
if (!test_lshift(out,ctx,NULL)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_rshift1");
if (!test_rshift1(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_rshift");
if (!test_rshift(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_sqr");
if (!test_sqr(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_mul");
if (!test_mul(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_div");
if (!test_div(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_div_word");
if (!test_div_word(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_div_recp");
if (!test_div_recp(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_mod");
if (!test_mod(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_mod_mul");
if (!test_mod_mul(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_mont");
if (!test_mont(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_mod_exp");
if (!test_mod_exp(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_mod_exp_mont_consttime");
if (!test_mod_exp_mont_consttime(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_exp");
if (!test_exp(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_kronecker");
if (!test_kron(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_mod_sqrt");
if (!test_sqrt(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_add");
if (!test_gf2m_add(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod");
if (!test_gf2m_mod(out)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod_mul");
if (!test_gf2m_mod_mul(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod_sqr");
if (!test_gf2m_mod_sqr(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod_inv");
if (!test_gf2m_mod_inv(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod_div");
if (!test_gf2m_mod_div(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod_exp");
if (!test_gf2m_mod_exp(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod_sqrt");
if (!test_gf2m_mod_sqrt(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
message(out,"BN_GF2m_mod_solve_quad");
if (!test_gf2m_mod_solve_quad(out,ctx)) goto err;
- BIO_flush(out);
+ (void)BIO_flush(out);
BN_CTX_free(ctx);
BIO_free(out);
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
err:
BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices
* the failure, see test_bn in test/Makefile.ssl*/
- BIO_flush(out);
+ (void)BIO_flush(out);
ERR_load_crypto_strings();
ERR_print_errors_fp(stderr);
EXIT(1);
diff --git a/crypto/ecdh/ecdhtest.c b/crypto/ecdh/ecdhtest.c
index 01baa5f494..1575006b51 100644
--- a/crypto/ecdh/ecdhtest.c
+++ b/crypto/ecdh/ecdhtest.c
@@ -148,7 +148,7 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
#ifdef NOISY
BIO_puts(out,"\n");
#else
- BIO_flush(out);
+ (void)BIO_flush(out);
#endif
if (!EC_KEY_generate_key(a)) goto err;
@@ -173,7 +173,7 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
BIO_puts(out,"\n");
#else
BIO_printf(out," .");
- BIO_flush(out);
+ (void)BIO_flush(out);
#endif
if (!EC_KEY_generate_key(b)) goto err;
@@ -199,7 +199,7 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
BIO_puts(out,"\n");
#else
BIO_printf(out,".");
- BIO_flush(out);
+ (void)BIO_flush(out);
#endif
alen=KDF1_SHA1_len;
@@ -216,7 +216,7 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
BIO_puts(out,"\n");
#else
BIO_printf(out,".");
- BIO_flush(out);
+ (void)BIO_flush(out);
#endif
blen=KDF1_SHA1_len;
@@ -233,7 +233,7 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
BIO_puts(out,"\n");
#else
BIO_printf(out,".");
- BIO_flush(out);
+ (void)BIO_flush(out);
#endif
if ((aout < 4) || (bout != aout) || (memcmp(abuf,bbuf,aout) != 0))
diff --git a/crypto/ecdsa/ecdsatest.c b/crypto/ecdsa/ecdsatest.c
index 59be39bb41..b07e31252b 100644
--- a/crypto/ecdsa/ecdsatest.c
+++ b/crypto/ecdsa/ecdsatest.c
@@ -203,13 +203,13 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
if (!EC_KEY_generate_key(key))
goto x962_int_err;
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* create the signature */
signature = ECDSA_do_sign(digest, 20, key);
if (signature == NULL)
goto x962_int_err;
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* compare the created signature with the expected signature */
if ((r = BN_new()) == NULL || (s = BN_new()) == NULL)
goto x962_int_err;
@@ -219,12 +219,12 @@ int x9_62_test_internal(BIO *out, int nid, const char *r_in, const char *s_in)
if (BN_cmp(signature->r ,r) || BN_cmp(signature->s, s))
goto x962_int_err;
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* verify the signature */
if (ECDSA_do_verify(digest, 20, signature, key) != 1)
goto x962_int_err;
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
BIO_printf(out, " ok\n");
ret = 1;
@@ -369,7 +369,7 @@ int test_builtin(BIO *out)
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* check key */
if (!EC_KEY_check_key(eckey))
{
@@ -377,7 +377,7 @@ int test_builtin(BIO *out)
goto builtin_err;
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* create signature */
sig_len = ECDSA_size(eckey);
if ((signature = OPENSSL_malloc(sig_len)) == NULL)
@@ -388,7 +388,7 @@ int test_builtin(BIO *out)
goto builtin_err;
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* verify signature */
if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1)
{
@@ -396,7 +396,7 @@ int test_builtin(BIO *out)
goto builtin_err;
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* verify signature with the wrong key */
if (ECDSA_verify(0, digest, 20, signature, sig_len,
wrong_eckey) == 1)
@@ -405,7 +405,7 @@ int test_builtin(BIO *out)
goto builtin_err;
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* wrong digest */
if (ECDSA_verify(0, wrong_digest, 20, signature, sig_len,
eckey) == 1)
@@ -414,7 +414,7 @@ int test_builtin(BIO *out)
goto builtin_err;
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* modify a single byte of the signature */
offset = signature[10] % sig_len;
dirt = signature[11];
@@ -425,7 +425,7 @@ int test_builtin(BIO *out)
goto builtin_err;
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
BIO_printf(out, " ok\n");
/* cleanup */
diff --git a/crypto/ocsp/ocsp_ht.c b/crypto/ocsp/ocsp_ht.c
index 4b1992052d..a8e569b74a 100644
--- a/crypto/ocsp/ocsp_ht.c
+++ b/crypto/ocsp/ocsp_ht.c
@@ -279,7 +279,7 @@ int OCSP_sendreq_nbio(OCSP_RESPONSE **presp, OCSP_REQ_CTX *rctx)
rctx->state = OHS_ASN1_FLUSH;
- BIO_reset(rctx->mem);
+ (void)BIO_reset(rctx->mem);
case OHS_ASN1_FLUSH:
diff --git a/crypto/pkcs7/pk7_mime.c b/crypto/pkcs7/pk7_mime.c
index 2d321a9e91..de710c3d68 100644
--- a/crypto/pkcs7/pk7_mime.c
+++ b/crypto/pkcs7/pk7_mime.c
@@ -125,7 +125,7 @@ int i2d_PKCS7_bio_stream(BIO *out, PKCS7 *p7, BIO *in, int flags)
return 0;
}
SMIME_crlf_copy(in, bio, flags);
- BIO_flush(bio);
+ (void)BIO_flush(bio);
/* Free up successive BIOs until we hit the old output BIO */
do
{
@@ -158,7 +158,7 @@ static int B64_write_PKCS7(BIO *out, PKCS7 *p7, BIO *in, int flags)
*/
out = BIO_push(b64, out);
r = i2d_PKCS7_bio_stream(out, p7, in, flags);
- BIO_flush(out);
+ (void)BIO_flush(out);
BIO_pop(out);
BIO_free(b64);
return r;
@@ -175,7 +175,7 @@ static PKCS7 *B64_read_PKCS7(BIO *bio)
bio = BIO_push(b64, bio);
if(!(p7 = d2i_PKCS7_bio(bio, NULL)))
PKCS7err(PKCS7_F_B64_READ_PKCS7,PKCS7_R_DECODE_ERROR);
- BIO_flush(bio);
+ (void)BIO_flush(bio);
bio = BIO_pop(bio);
BIO_free(b64);
return p7;
@@ -542,7 +542,7 @@ int SMIME_crlf_copy(BIO *in, BIO *out, int flags)
if(eol) BIO_write(out, "\r\n", 2);
}
}
- BIO_flush(out);
+ (void)BIO_flush(out);
BIO_pop(out);
BIO_free(bf);
return 1;
diff --git a/crypto/pkcs7/pk7_smime.c b/crypto/pkcs7/pk7_smime.c
index 39b18a4a46..ac4afc9fec 100644
--- a/crypto/pkcs7/pk7_smime.c
+++ b/crypto/pkcs7/pk7_smime.c
@@ -124,7 +124,7 @@ int PKCS7_final(PKCS7 *p7, BIO *data, int flags)
SMIME_crlf_copy(data, p7bio, flags);
- BIO_flush(p7bio);
+ (void)BIO_flush(p7bio);
if (!PKCS7_dataFinal(p7,p7bio))
diff --git a/ssl/d1_both.c b/ssl/d1_both.c
index a584511c84..ffac2c2415 100644
--- a/ssl/d1_both.c
+++ b/ssl/d1_both.c
@@ -1141,7 +1141,7 @@ dtls1_retransmit_message(SSL *s, unsigned short seq, unsigned long frag_off,
SSL3_RT_CHANGE_CIPHER_SPEC : SSL3_RT_HANDSHAKE);
s->d1->retransmitting = 0;
- BIO_flush(SSL_get_wbio(s));
+ (void)BIO_flush(SSL_get_wbio(s));
return ret;
}
--
2.40.0