fix warnings

This commit is contained in:
Bodo Möller 2002-08-09 11:58:28 +00:00
parent 60cc56b1a9
commit 41fdcfa71e
5 changed files with 22 additions and 6 deletions

View File

@ -616,7 +616,7 @@ int MAIN(int argc, char **argv)
EC_KEY *ecdh_a[EC_NUM], *ecdh_b[EC_NUM]; EC_KEY *ecdh_a[EC_NUM], *ecdh_b[EC_NUM];
unsigned char secret_a[MAX_ECDH_SIZE], secret_b[MAX_ECDH_SIZE]; unsigned char secret_a[MAX_ECDH_SIZE], secret_b[MAX_ECDH_SIZE];
int secret_size_a, secret_size_b; int secret_size_a, secret_size_b;
int ecdh_check = 0; int ecdh_checks = 0;
int secret_idx = 0; int secret_idx = 0;
long ecdh_c[EC_NUM][2]; long ecdh_c[EC_NUM][2];
#endif #endif
@ -2065,19 +2065,20 @@ int MAIN(int argc, char **argv)
ecdh_a[j]->pub_key, ecdh_a[j]->pub_key,
ecdh_b[j]); ecdh_b[j]);
if (secret_size_a != secret_size_b) if (secret_size_a != secret_size_b)
ecdh_check = 0; ecdh_checks = 0;
else else
ecdh_check = 1; ecdh_checks = 1;
for (secret_idx = 0; for (secret_idx = 0;
(secret_idx < secret_size_a) && (ecdh_check == 1); (secret_idx < secret_size_a)
&& (ecdh_checks == 1);
secret_idx++) secret_idx++)
{ {
if (secret_a[secret_idx] != secret_b[secret_idx]) if (secret_a[secret_idx] != secret_b[secret_idx])
ecdh_check = 0; ecdh_checks = 0;
} }
if (ecdh_check == 0) if (ecdh_checks == 0)
{ {
BIO_printf(bio_err,"ECDH computations don't match.\n"); BIO_printf(bio_err,"ECDH computations don't match.\n");
ERR_print_errors(bio_err); ERR_print_errors(bio_err);

View File

@ -105,6 +105,9 @@ int main(int argc, char * argv[]) { puts("Elliptic curves are disabled."); retur
exit(1); \ exit(1); \
} while (0) } while (0)
void prime_field_tests(void);
void char2_field_tests(void);
#if 0 #if 0
static void timings(EC_GROUP *group, int multi, BN_CTX *ctx) static void timings(EC_GROUP *group, int multi, BN_CTX *ctx)
{ {

View File

@ -117,6 +117,7 @@ static void MS_CALLBACK cb(int p, int n, void *arg);
static const char rnd_seed[] = "string to make the random number generator think it has entropy"; static const char rnd_seed[] = "string to make the random number generator think it has entropy";
int test_ecdh_curve(int , char *, BN_CTX *, BIO *);
int test_ecdh_curve(int nid, char *text, BN_CTX *ctx, BIO *out) int test_ecdh_curve(int nid, char *text, BN_CTX *ctx, BIO *out)
{ {

View File

@ -116,6 +116,15 @@ static const char rnd_seed[] = "string to make the random number generator think
ECDSA_SIG* signatures[ECDSA_NIST_TESTS]; ECDSA_SIG* signatures[ECDSA_NIST_TESTS];
unsigned char digest[ECDSA_NIST_TESTS][20]; unsigned char digest[ECDSA_NIST_TESTS][20];
/* some declarations */
void clear_ecdsa(EC_KEY *);
int set_p192_param(EC_KEY *);
int set_p239_param(EC_KEY *);
int test_sig_vrf(EC_KEY *, const unsigned char *);
int test_x962_sig_vrf(EC_KEY *, const unsigned char *,
const char *, const char *, const char *);
int ecdsa_cmp(const EC_KEY *, const EC_KEY *);
void clear_ecdsa(EC_KEY *ecdsa) void clear_ecdsa(EC_KEY *ecdsa)
{ {
if (!ecdsa) if (!ecdsa)

View File

@ -640,6 +640,8 @@ int tls1_alert_code(int code);
int ssl3_alert_code(int code); int ssl3_alert_code(int code);
int ssl_ok(SSL *s); int ssl_ok(SSL *s);
int check_srvr_ecc_cert_and_alg(X509 *x, SSL_CIPHER *cs);
SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n); SSL_COMP *ssl3_comp_find(STACK_OF(SSL_COMP) *sk, int n);
STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void); STACK_OF(SSL_COMP) *SSL_COMP_get_compression_methods(void);