generic-library/openssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Fix warnings: C++ comments and computed value not used.

Browse Source
This commit is contained in:
Dr. Stephen Henson
2007-07-04 12:56:33 +00:00
parent 769f58aaaa
commit 14346b3456
8 changed files with 52 additions and 52 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/aes/aes_ige.c
View File

@@ -59,7 +59,7 @@ typedef struct {
unsigned long data[N_WORDS]; unsigned long data[N_WORDS];
} aes_block_t; } aes_block_t;
// XXX: probably some better way to do this /* XXX: probably some better way to do this */
#if defined(__i386__) || defined(__x86_64__) #if defined(__i386__) || defined(__x86_64__)
#define UNALIGNED_MEMOPS_ARE_FAST 1 #define UNALIGNED_MEMOPS_ARE_FAST 1
#endif #endif

60
crypto/bn/bntest.c
View File

@@ -184,120 +184,120 @@ int main(int argc, char *argv[])
message(out,"BN_add"); message(out,"BN_add");
if (!test_add(out)) goto err; if (!test_add(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_sub"); message(out,"BN_sub");
if (!test_sub(out)) goto err; if (!test_sub(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_lshift1"); message(out,"BN_lshift1");
if (!test_lshift1(out)) goto err; if (!test_lshift1(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_lshift (fixed)"); message(out,"BN_lshift (fixed)");
if (!test_lshift(out,ctx,BN_bin2bn(lst,sizeof(lst)-1,NULL))) if (!test_lshift(out,ctx,BN_bin2bn(lst,sizeof(lst)-1,NULL)))
goto err; goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_lshift"); message(out,"BN_lshift");
if (!test_lshift(out,ctx,NULL)) goto err; if (!test_lshift(out,ctx,NULL)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_rshift1"); message(out,"BN_rshift1");
if (!test_rshift1(out)) goto err; if (!test_rshift1(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_rshift"); message(out,"BN_rshift");
if (!test_rshift(out,ctx)) goto err; if (!test_rshift(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_sqr"); message(out,"BN_sqr");
if (!test_sqr(out,ctx)) goto err; if (!test_sqr(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_mul"); message(out,"BN_mul");
if (!test_mul(out)) goto err; if (!test_mul(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_div"); message(out,"BN_div");
if (!test_div(out,ctx)) goto err; if (!test_div(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_div_word"); message(out,"BN_div_word");
if (!test_div_word(out)) goto err; if (!test_div_word(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_div_recp"); message(out,"BN_div_recp");
if (!test_div_recp(out,ctx)) goto err; if (!test_div_recp(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_mod"); message(out,"BN_mod");
if (!test_mod(out,ctx)) goto err; if (!test_mod(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_mod_mul"); message(out,"BN_mod_mul");
if (!test_mod_mul(out,ctx)) goto err; if (!test_mod_mul(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_mont"); message(out,"BN_mont");
if (!test_mont(out,ctx)) goto err; if (!test_mont(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_mod_exp"); message(out,"BN_mod_exp");
if (!test_mod_exp(out,ctx)) goto err; if (!test_mod_exp(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_mod_exp_mont_consttime"); message(out,"BN_mod_exp_mont_consttime");
if (!test_mod_exp_mont_consttime(out,ctx)) goto err; if (!test_mod_exp_mont_consttime(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_exp"); message(out,"BN_exp");
if (!test_exp(out,ctx)) goto err; if (!test_exp(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_kronecker"); message(out,"BN_kronecker");
if (!test_kron(out,ctx)) goto err; if (!test_kron(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_mod_sqrt"); message(out,"BN_mod_sqrt");
if (!test_sqrt(out,ctx)) goto err; if (!test_sqrt(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_add"); message(out,"BN_GF2m_add");
if (!test_gf2m_add(out)) goto err; if (!test_gf2m_add(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod"); message(out,"BN_GF2m_mod");
if (!test_gf2m_mod(out)) goto err; if (!test_gf2m_mod(out)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod_mul"); message(out,"BN_GF2m_mod_mul");
if (!test_gf2m_mod_mul(out,ctx)) goto err; if (!test_gf2m_mod_mul(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod_sqr"); message(out,"BN_GF2m_mod_sqr");
if (!test_gf2m_mod_sqr(out,ctx)) goto err; if (!test_gf2m_mod_sqr(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod_inv"); message(out,"BN_GF2m_mod_inv");
if (!test_gf2m_mod_inv(out,ctx)) goto err; if (!test_gf2m_mod_inv(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod_div"); message(out,"BN_GF2m_mod_div");
if (!test_gf2m_mod_div(out,ctx)) goto err; if (!test_gf2m_mod_div(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod_exp"); message(out,"BN_GF2m_mod_exp");
if (!test_gf2m_mod_exp(out,ctx)) goto err; if (!test_gf2m_mod_exp(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod_sqrt"); message(out,"BN_GF2m_mod_sqrt");
if (!test_gf2m_mod_sqrt(out,ctx)) goto err; if (!test_gf2m_mod_sqrt(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
message(out,"BN_GF2m_mod_solve_quad"); message(out,"BN_GF2m_mod_solve_quad");
if (!test_gf2m_mod_solve_quad(out,ctx)) goto err; if (!test_gf2m_mod_solve_quad(out,ctx)) goto err;
BIO_flush(out); (void)BIO_flush(out);
BN_CTX_free(ctx); BN_CTX_free(ctx);
BIO_free(out); BIO_free(out);
@@ -307,7 +307,7 @@ int main(int argc, char *argv[])
err: err:
BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices BIO_puts(out,"1\n"); /* make sure the Perl script fed by bc notices
* the failure, see test_bn in test/Makefile.ssl*/ * the failure, see test_bn in test/Makefile.ssl*/
BIO_flush(out); (void)BIO_flush(out);
ERR_load_crypto_strings(); ERR_load_crypto_strings();
ERR_print_errors_fp(stderr); ERR_print_errors_fp(stderr);
EXIT(1); EXIT(1);

10
crypto/ecdh/ecdhtest.c
View File

@@ -148,7 +148,7 @@ static int test_ecdh_curve(int nid, const char *text, BN_CTX *ctx, BIO *out)
#ifdef NOISY #ifdef NOISY
BIO_puts(out,"\n"); BIO_puts(out,"\n");
#else #else
BIO_flush(out); (void)BIO_flush(out);
#endif #endif
if (!EC_KEY_generate_key(a)) goto err; 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"); BIO_puts(out,"\n");
#else #else
BIO_printf(out," ."); BIO_printf(out," .");
BIO_flush(out); (void)BIO_flush(out);
#endif #endif
if (!EC_KEY_generate_key(b)) goto err; 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"); BIO_puts(out,"\n");
#else #else
BIO_printf(out,"."); BIO_printf(out,".");
BIO_flush(out); (void)BIO_flush(out);
#endif #endif
alen=KDF1_SHA1_len; 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"); BIO_puts(out,"\n");
#else #else
BIO_printf(out,"."); BIO_printf(out,".");
BIO_flush(out); (void)BIO_flush(out);
#endif #endif
blen=KDF1_SHA1_len; 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"); BIO_puts(out,"\n");
#else #else
BIO_printf(out,"."); BIO_printf(out,".");
BIO_flush(out); (void)BIO_flush(out);
#endif #endif
if ((aout < 4) || (bout != aout) || (memcmp(abuf,bbuf,aout) != 0)) if ((aout < 4) || (bout != aout) || (memcmp(abuf,bbuf,aout) != 0))

22
crypto/ecdsa/ecdsatest.c
View File

@@ -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)) if (!EC_KEY_generate_key(key))
goto x962_int_err; goto x962_int_err;
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* create the signature */ /* create the signature */
signature = ECDSA_do_sign(digest, 20, key); signature = ECDSA_do_sign(digest, 20, key);
if (signature == NULL) if (signature == NULL)
goto x962_int_err; goto x962_int_err;
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* compare the created signature with the expected signature */ /* compare the created signature with the expected signature */
if ((r = BN_new()) == NULL || (s = BN_new()) == NULL) if ((r = BN_new()) == NULL || (s = BN_new()) == NULL)
goto x962_int_err; 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)) if (BN_cmp(signature->r ,r) || BN_cmp(signature->s, s))
goto x962_int_err; goto x962_int_err;
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* verify the signature */ /* verify the signature */
if (ECDSA_do_verify(digest, 20, signature, key) != 1) if (ECDSA_do_verify(digest, 20, signature, key) != 1)
goto x962_int_err; goto x962_int_err;
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
BIO_printf(out, " ok\n"); BIO_printf(out, " ok\n");
ret = 1; ret = 1;
@@ -369,7 +369,7 @@ int test_builtin(BIO *out)
} }
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* check key */ /* check key */
if (!EC_KEY_check_key(eckey)) if (!EC_KEY_check_key(eckey))
{ {
@@ -377,7 +377,7 @@ int test_builtin(BIO *out)
goto builtin_err; goto builtin_err;
} }
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* create signature */ /* create signature */
sig_len = ECDSA_size(eckey); sig_len = ECDSA_size(eckey);
if ((signature = OPENSSL_malloc(sig_len)) == NULL) if ((signature = OPENSSL_malloc(sig_len)) == NULL)
@@ -388,7 +388,7 @@ int test_builtin(BIO *out)
goto builtin_err; goto builtin_err;
} }
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* verify signature */ /* verify signature */
if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1) if (ECDSA_verify(0, digest, 20, signature, sig_len, eckey) != 1)
{ {
@@ -396,7 +396,7 @@ int test_builtin(BIO *out)
goto builtin_err; goto builtin_err;
} }
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* verify signature with the wrong key */ /* verify signature with the wrong key */
if (ECDSA_verify(0, digest, 20, signature, sig_len, if (ECDSA_verify(0, digest, 20, signature, sig_len,
wrong_eckey) == 1) wrong_eckey) == 1)
@@ -405,7 +405,7 @@ int test_builtin(BIO *out)
goto builtin_err; goto builtin_err;
} }
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* wrong digest */ /* wrong digest */
if (ECDSA_verify(0, wrong_digest, 20, signature, sig_len, if (ECDSA_verify(0, wrong_digest, 20, signature, sig_len,
eckey) == 1) eckey) == 1)
@@ -414,7 +414,7 @@ int test_builtin(BIO *out)
goto builtin_err; goto builtin_err;
} }
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
/* modify a single byte of the signature */ /* modify a single byte of the signature */
offset = signature[10] % sig_len; offset = signature[10] % sig_len;
dirt = signature[11]; dirt = signature[11];
@@ -425,7 +425,7 @@ int test_builtin(BIO *out)
goto builtin_err; goto builtin_err;
} }
BIO_printf(out, "."); BIO_printf(out, ".");
BIO_flush(out); (void)BIO_flush(out);
BIO_printf(out, " ok\n"); BIO_printf(out, " ok\n");
/* cleanup */ /* cleanup */

2
crypto/evp/e_seed.c
View File

@@ -54,11 +54,11 @@
*/ */
#include <openssl/opensslconf.h> #include <openssl/opensslconf.h>
#ifndef OPENSSL_NO_SEED
#include <openssl/evp.h> #include <openssl/evp.h>
#include <openssl/err.h> #include <openssl/err.h>
#include <string.h> #include <string.h>
#include <assert.h> #include <assert.h>
#ifndef OPENSSL_NO_SEED
#include <openssl/seed.h> #include <openssl/seed.h>
#include "evp_locl.h" #include "evp_locl.h"

4
crypto/pkcs7/pk7_mime.c
View File

@@ -121,7 +121,7 @@ static int B64_write_PKCS7(BIO *bio, PKCS7 *p7)
} }
bio = BIO_push(b64, bio); bio = BIO_push(b64, bio);
i2d_PKCS7_bio(bio, p7); i2d_PKCS7_bio(bio, p7);
BIO_flush(bio); (void)BIO_flush(bio);
bio = BIO_pop(bio); bio = BIO_pop(bio);
BIO_free(b64); BIO_free(b64);
return 1; return 1;
@@ -138,7 +138,7 @@ static PKCS7 *B64_read_PKCS7(BIO *bio)
bio = BIO_push(b64, bio); bio = BIO_push(b64, bio);
if(!(p7 = d2i_PKCS7_bio(bio, NULL))) if(!(p7 = d2i_PKCS7_bio(bio, NULL)))
PKCS7err(PKCS7_F_B64_READ_PKCS7,PKCS7_R_DECODE_ERROR); PKCS7err(PKCS7_F_B64_READ_PKCS7,PKCS7_R_DECODE_ERROR);
BIO_flush(bio); (void)BIO_flush(bio);
bio = BIO_pop(bio); bio = BIO_pop(bio);
BIO_free(b64); BIO_free(b64);
return p7; return p7;

2
crypto/pkcs7/pk7_smime.c
View File

@@ -426,7 +426,7 @@ PKCS7 *PKCS7_encrypt(STACK_OF(X509) *certs, BIO *in, const EVP_CIPHER *cipher,
SMIME_crlf_copy(in, p7bio, flags); SMIME_crlf_copy(in, p7bio, flags);
BIO_flush(p7bio); (void)BIO_flush(p7bio);
if (!PKCS7_dataFinal(p7,p7bio)) { if (!PKCS7_dataFinal(p7,p7bio)) {
PKCS7err(PKCS7_F_PKCS7_ENCRYPT,PKCS7_R_PKCS7_DATAFINAL_ERROR); PKCS7err(PKCS7_F_PKCS7_ENCRYPT,PKCS7_R_PKCS7_DATAFINAL_ERROR);

2
test/igetest.c
View File

@@ -221,7 +221,7 @@ static int run_test_vectors(void)
++errs; ++errs;
} }
// try with in == out /* try with in == out */
memcpy(iv, v->iv, sizeof iv); memcpy(iv, v->iv, sizeof iv);
memcpy(buf, v->in, v->length); memcpy(buf, v->in, v->length);
AES_ige_encrypt(buf, buf, v->length, &key, iv, v->encrypt); AES_ige_encrypt(buf, buf, v->length, &key, iv, v->encrypt);