OpenSSL CVS Repository
http://cvs.openssl.org/
____________________________________________________________
________________
Server: cvs.openssl.org Name: Dr.
Stephen Henson
Root: /v/openssl/cvs Email: steve openssl.org
Module: openssl Date:
12-Aug-2007 19:44:32
Branch: HEAD Handle:
2007081218442705
Modified files:
openssl/apps ocsp.c rand.c req.c s_cb.c
s_client.c s_server.c
openssl/crypto/bn bntest.c
openssl/crypto/ecdh ecdhtest.c
openssl/crypto/ecdsa ecdsatest.c
openssl/crypto/ocsp ocsp_ht.c
openssl/crypto/pkcs7 pk7_mime.c pk7_smime.c
openssl/ssl d1_both.c
Log:
Fix warnings.
Summary:
Revision Changes Path
1.44 +1 -1 openssl/apps/ocsp.c
1.20 +1 -1 openssl/apps/rand.c
1.136 +1 -1 openssl/apps/req.c
1.21 +2 -2 openssl/apps/s_cb.c
1.104 +7 -7 openssl/apps/s_client.c
1.120 +1 -1 openssl/apps/s_server.c
1.70 +30 -30 openssl/crypto/bn/bntest.c
1.15 +5 -5 openssl/crypto/ecdh/ecdhtest.c
1.27 +11 -11
openssl/crypto/ecdsa/ecdsatest.c
1.10 +1 -1 openssl/crypto/ocsp/ocsp_ht.c
1.34 +4 -4 openssl/crypto/pkcs7/pk7_mime.c
1.39 +1 -1
openssl/crypto/pkcs7/pk7_smime.c
1.8 +1 -1 openssl/ssl/d1_both.c
____________________________________________________________
________________
patch -p0 <<' .'
Index: openssl/apps/ocsp.c
============================================================
================
$ cvs diff -u -r1.43 -r1.44 ocsp.c
--- openssl/apps/ocsp.c 16 May 2007 12:16:49 -0000 1.43
+++ openssl/apps/ocsp.c 12 Aug 2007 17:44:27 -0000 1.44
-1244,7 +1244,7
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;
}
.
patch -p0 <<' .'
Index: openssl/apps/rand.c
============================================================
================
$ cvs diff -u -r1.19 -r1.20 rand.c
--- openssl/apps/rand.c 29 Oct 2003 20:24:07 -0000 1.19
+++ openssl/apps/rand.c 12 Aug 2007 17:44:27 -0000 1.20
-213,7 +213,7
BIO_write(out, buf, chunk);
num -= chunk;
}
- BIO_flush(out);
+ (void)BIO_flush(out);
app_RAND_write_file(NULL, bio_err);
ret = 0;
.
patch -p0 <<' .'
Index: openssl/apps/req.c
============================================================
================
$ cvs diff -u -r1.135 -r1.136 req.c
--- openssl/apps/req.c 14 Jun 2006 01:16:22 -0000 1.135
+++ openssl/apps/req.c 12 Aug 2007 17:44:27 -0000 1.136
-1648,7 +1648,7
if (!param)
{
X509 *x;
- BIO_reset(pbio);
+ (void)BIO_reset(pbio);
x = PEM_read_bio_X509(pbio, NULL, NULL, NULL);
if (x)
{
.
patch -p0 <<' .'
Index: openssl/apps/s_cb.c
============================================================
================
$ cvs diff -u -r1.20 -r1.21 s_cb.c
--- openssl/apps/s_cb.c 11 Aug 2007 23:18:13 -0000 1.20
+++ openssl/apps/s_cb.c 12 Aug 2007 17:44:27 -0000 1.21
-590,7 +590,7
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
BIO_printf(bio, "TLS %s extension "%s"
(id=%d), len=%dn",
client_server ? "server":
"client",
extname, type, len);
- BIO_dump(bio, data, len);
+ BIO_dump(bio, (char *)data, len);
BIO_flush(bio);
}
.
patch -p0 <<' .'
Index: openssl/apps/s_client.c
============================================================
================
$ cvs diff -u -r1.103 -r1.104 s_client.c
--- openssl/apps/s_client.c 11 Aug 2007 23:18:15
-0000 1.103
+++ openssl/apps/s_client.c 12 Aug 2007 17:44:27
-0000 1.104
-893,7 +893,7
goto end;
}
- BIO_ctrl_set_connected(sbio, 1, &peer);
+ (void)BIO_ctrl_set_connected(sbio, 1, &peer);
if (enable_timeouts)
{
-984,7 +984,7
while (mbuf_len>3 && mbuf[3]=='-');
/* STARTTLS command requires EHLO... */
BIO_printf(fbio,"EHLO
openssl.client.netrn");
- BIO_flush(fbio);
+ (void)BIO_flush(fbio);
/* wait for multi-line response to end EHLO SMTP
response */
do
{
-993,7 +993,7
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
BIO_gets(fbio,mbuf,BUFSIZZ);
/* STARTTLS command requires CAPABILITY... */
BIO_printf(fbio,". CAPABILITYrn");
- BIO_flush(fbio);
+ (void)BIO_flush(fbio);
/* wait for multi-line CAPABILITY response */
do
{
-1026,7 +1026,7
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
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 TLSrn");
-1578,6 +1578,6
if (peer != NULL)
X509_free(peer);
/* flush, or debugging output gets mixed with http
response */
- BIO_flush(bio);
+ (void)BIO_flush(bio);
}
.
patch -p0 <<' .'
Index: openssl/apps/s_server.c
============================================================
================
$ cvs diff -u -r1.119 -r1.120 s_server.c
--- openssl/apps/s_server.c 11 Aug 2007 23:18:15
-0000 1.119
+++ openssl/apps/s_server.c 12 Aug 2007 17:44:27
-0000 1.120
-1458,7 +1458,7
}
BIO_printf(bio_s_out,"ACCEPTn");
- BIO_flush(bio_s_out);
+ (void)BIO_flush(bio_s_out);
if (www)
do_server(port,socket_type,&accept_socket,www_body,
context);
else
.
patch -p0 <<' .'
Index: openssl/crypto/bn/bntest.c
============================================================
================
$ cvs diff -u -r1.69 -r1.70 bntest.c
--- openssl/crypto/bn/bntest.c 18 Jun 2006 22:00:45
-0000 1.69
+++ openssl/crypto/bn/bntest.c 12 Aug 2007 17:44:28
-0000 1.70
-184,120 +184,120
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
err:
BIO_puts(out,"1n"); /* 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);
.
patch -p0 <<' .'
Index: openssl/crypto/ecdh/ecdhtest.c
============================================================
================
$ cvs diff -u -r1.14 -r1.15 ecdhtest.c
--- openssl/crypto/ecdh/ecdhtest.c 16 Jul 2005 12:37:31
-0000 1.14
+++ openssl/crypto/ecdh/ecdhtest.c 12 Aug 2007 17:44:29
-0000 1.15
-148,7 +148,7
#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
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
BIO_puts(out,"n");
#else
BIO_printf(out,".");
- BIO_flush(out);
+ (void)BIO_flush(out);
#endif
alen=KDF1_SHA1_len;
-216,7 +216,7
BIO_puts(out,"n");
#else
BIO_printf(out,".");
- BIO_flush(out);
+ (void)BIO_flush(out);
#endif
blen=KDF1_SHA1_len;
-233,7 +233,7
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))
.
patch -p0 <<' .'
Index: openssl/crypto/ecdsa/ecdsatest.c
============================================================
================
$ cvs diff -u -r1.26 -r1.27 ecdsatest.c
--- openssl/crypto/ecdsa/ecdsatest.c 17 Jul 2005 21:04:19
-0000 1.26
+++ openssl/crypto/ecdsa/ecdsatest.c 12 Aug 2007 17:44:29
-0000 1.27
-203,13 +203,13
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
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, " okn");
ret = 1;
-369,7 +369,7
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
/* check key */
if (!EC_KEY_check_key(eckey))
{
-377,7 +377,7
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
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
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
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
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
goto builtin_err;
}
BIO_printf(out, ".");
- BIO_flush(out);
+ (void)BIO_flush(out);
BIO_printf(out, " okn");
/* cleanup */
.
patch -p0 <<' .'
Index: openssl/crypto/ocsp/ocsp_ht.c
============================================================
================
$ cvs diff -u -r1.9 -r1.10 ocsp_ht.c
--- openssl/crypto/ocsp/ocsp_ht.c 17 Jul 2006 18:52:51
-0000 1.9
+++ openssl/crypto/ocsp/ocsp_ht.c 12 Aug 2007 17:44:30
-0000 1.10
-279,7 +279,7
rctx->state = OHS_ASN1_FLUSH;
- BIO_reset(rctx->mem);
+ (void)BIO_reset(rctx->mem);
case OHS_ASN1_FLUSH:
.
patch -p0 <<' .'
Index: openssl/crypto/pkcs7/pk7_mime.c
============================================================
================
$ cvs diff -u -r1.33 -r1.34 pk7_mime.c
--- openssl/crypto/pkcs7/pk7_mime.c 16 May 2007 00:14:32
-0000 1.33
+++ openssl/crypto/pkcs7/pk7_mime.c 12 Aug 2007 17:44:30
-0000 1.34
-125,7 +125,7
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
*/
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
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
if(eol) BIO_write(out, "rn", 2);
}
}
- BIO_flush(out);
+ (void)BIO_flush(out);
BIO_pop(out);
BIO_free(bf);
return 1;
.
patch -p0 <<' .'
Index: openssl/crypto/pkcs7/pk7_smime.c
============================================================
================
$ cvs diff -u -r1.38 -r1.39 pk7_smime.c
--- openssl/crypto/pkcs7/pk7_smime.c 13 Apr 2007 16:41:52
-0000 1.38
+++ openssl/crypto/pkcs7/pk7_smime.c 12 Aug 2007 17:44:30
-0000 1.39
-124,7 +124,7
SMIME_crlf_copy(data, p7bio, flags);
- BIO_flush(p7bio);
+ (void)BIO_flush(p7bio);
if (!PKCS7_dataFinal(p7,p7bio))
.
patch -p0 <<' .'
Index: openssl/ssl/d1_both.c
============================================================
================
$ cvs diff -u -r1.7 -r1.8 d1_both.c
--- openssl/ssl/d1_both.c 26 Jul 2005 04:25:05 -0000 1.7
+++ openssl/ssl/d1_both.c 12 Aug 2007 17:44:32 -0000 1.8
-1141,7 +1141,7
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;
}
.
____________________________________________________________
__________
OpenSSL Project http://www.openssl.org
CVS Repository Commit List
openssl-cvsopenssl.org
Automated List Manager
majordomoopenssl.org
|
