diff options
| author | Dr. Stephen Henson <steve@openssl.org> | 2011-03-12 17:27:03 +0000 |
|---|---|---|
| committer | Dr. Stephen Henson <steve@openssl.org> | 2011-03-12 17:27:03 +0000 |
| commit | d70fcb96ac3ed2d6182a966010f4bcdc7e898a67 (patch) | |
| tree | ddbf913d8b6bf4b3ab8b7dd135e747f8ee9a51c5 /apps | |
| parent | 5e374d2ee85992523a3eafd7dfa8095e51b1a9a0 (diff) | |
Fix warnings: signed/unisgned comparison, shadowing (in some cases global
functions such as rand() ).
Diffstat (limited to 'apps')
| -rw-r--r-- | apps/s_client.c | 4 | ||||
| -rw-r--r-- | apps/srp.c | 10 |
2 files changed, 7 insertions, 7 deletions
diff --git a/apps/s_client.c b/apps/s_client.c index 5e2a5efc95..8a57dcfc9f 100644 --- a/apps/s_client.c +++ b/apps/s_client.c @@ -403,11 +403,11 @@ static int SRP_Verify_N_and_g(const BIGNUM *N, const BIGNUM *g) BIGNUM *r = BN_new(); int ret = g != NULL && N != NULL && bn_ctx != NULL && BN_is_odd(N) && - BN_is_prime(N,SRP_NUMBER_ITERATIONS_FOR_PRIME,NULL,bn_ctx,NULL) && + BN_is_prime_ex(N,SRP_NUMBER_ITERATIONS_FOR_PRIME,bn_ctx,NULL) && p != NULL && BN_rshift1(p, N) && /* p = (N-1)/2 */ - BN_is_prime(p,SRP_NUMBER_ITERATIONS_FOR_PRIME,NULL,bn_ctx,NULL) && + BN_is_prime_ex(p,SRP_NUMBER_ITERATIONS_FOR_PRIME,bn_ctx,NULL) && r != NULL && /* verify g^((N-1)/2) == -1 (mod N) */ diff --git a/apps/srp.c b/apps/srp.c index 5e1b23c869..e397011c0e 100644 --- a/apps/srp.c +++ b/apps/srp.c @@ -140,12 +140,12 @@ static int get_index(CA_DB *db, char* id, char type) return -1 ; } -static void print_entry(CA_DB *db, BIO * bio, int index, int verbose, char * s) +static void print_entry(CA_DB *db, BIO * bio, int indx, int verbose, char * s) { - if (index >= 0 && verbose) + if (indx >= 0 && verbose) { int j; - char **pp=sk_OPENSSL_PSTRING_value(db->db->data,index); + char **pp=sk_OPENSSL_PSTRING_value(db->db->data,indx); BIO_printf(bio,"%s \"%s\"\n",s,pp[DB_srpid]); for (j = 0; j < DB_NUMBER; j++) { @@ -696,10 +696,10 @@ bad: } else { - char ** pp = sk_OPENSSL_PSTRING_value(db->db->data,userindex); + char ** xpp = sk_OPENSSL_PSTRING_value(db->db->data,userindex); BIO_printf(bio_err,"user \"%s\" revoked. t\n",user); - pp[DB_srptype][0] = 'R' ; + xpp[DB_srptype][0] = 'R' ; doupdatedb = 1; } |