kris/boringssl
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Change the type of |EC_GROUP_get_degree| and friends to |unsigned|.

Browse Source 
These functions ultimately return the result of |BN_num_bits|, and that
function's return type is |unsigned|. Thus, these functions' return
type should also be |unsigned|.

Change-Id: I2cef63e6f75425857bac71f7c5517ef22ab2296b
Reviewed-on: https://boringssl-review.googlesource.com/6170
Reviewed-by: Adam Langley <alangley@gmail.com>
This commit is contained in:
Brian Smith 2015-10-08 17:10:15 -10:00 committed by Adam Langley
parent e93ffa5da7
commit 274341dd6e
6 changed files with 12 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
crypto/ec/ec.c
View File

@ -564,7 +564,7 @@ int EC_GROUP_get_curve_GFp(const EC_GROUP *group, BIGNUM *out_p, BIGNUM *out_a,
int EC_GROUP_get_curve_name(const EC_GROUP *group) { return group->curve_name; }
int EC_GROUP_get_degree(const EC_GROUP *group) {
unsigned EC_GROUP_get_degree(const EC_GROUP *group) {
return ec_GFp_simple_group_get_degree(group);
}

2
crypto/ec/internal.h
View File

@ -178,7 +178,7 @@ int ec_GFp_simple_group_set_curve(EC_GROUP *, const BIGNUM *p, const BIGNUM *a,
const BIGNUM *b, BN_CTX *);
int ec_GFp_simple_group_get_curve(const EC_GROUP *, BIGNUM *p, BIGNUM *a,
BIGNUM *b, BN_CTX *);
int ec_GFp_simple_group_get_degree(const EC_GROUP *);
unsigned ec_GFp_simple_group_get_degree(const EC_GROUP *);
int ec_GFp_simple_group_check_discriminant(const EC_GROUP *, BN_CTX *);
int ec_GFp_simple_point_init(EC_POINT *);
void ec_GFp_simple_point_finish(EC_POINT *);

2
crypto/ec/simple.c
View File

@ -245,7 +245,7 @@ err:
return ret;
}
int ec_GFp_simple_group_get_degree(const EC_GROUP *group) {
unsigned ec_GFp_simple_group_get_degree(const EC_GROUP *group) {
return BN_num_bits(&group->field);
}

2
include/openssl/ec.h
View File

@ -144,7 +144,7 @@ OPENSSL_EXPORT int EC_GROUP_get_curve_name(const EC_GROUP *group);
/* EC_GROUP_get_degree returns the number of bits needed to represent an
* element of the field underlying |group|. */
OPENSSL_EXPORT int EC_GROUP_get_degree(const EC_GROUP *group);
OPENSSL_EXPORT unsigned EC_GROUP_get_degree(const EC_GROUP *group);
/* EC_GROUP_precompute_mult precomputes multiplies of the generator in order to
* speed up operations that involve calculating generator multiples. It returns

8
ssl/s3_clnt.c
View File

@ -1566,6 +1566,8 @@ int ssl3_get_server_done(SSL *s) {
return 1;
}
OPENSSL_COMPILE_ASSERT(sizeof(size_t) >= sizeof(unsigned),
SIZE_T_IS_SMALLER_THAN_UNSIGNED);
int ssl3_send_client_key_exchange(SSL *s) {
uint8_t *p;
@ -1739,7 +1741,7 @@ int ssl3_send_client_key_exchange(SSL *s) {
} else if (alg_k & SSL_kECDHE) {
const EC_GROUP *srvr_group = NULL;
EC_KEY *tkey;
int field_size = 0, ecdh_len;
int ecdh_len;
if (s->s3->tmp.peer_ecdh_tmp == NULL) {
OPENSSL_PUT_ERROR(SSL, ERR_R_INTERNAL_ERROR);
@ -1772,8 +1774,8 @@ int ssl3_send_client_key_exchange(SSL *s) {
goto err;
}
field_size = EC_GROUP_get_degree(srvr_group);
if (field_size <= 0) {
unsigned field_size = EC_GROUP_get_degree(srvr_group);
if (field_size == 0) {
OPENSSL_PUT_ERROR(SSL, ERR_R_ECDH_LIB);
goto err;
}

6
ssl/s3_srvr.c
View File

@ -1854,7 +1854,7 @@ int ssl3_get_client_key_exchange(SSL *s) {
premaster_secret_len = dh_len;
} else if (alg_k & SSL_kECDHE) {
int field_size = 0, ecdh_len;
int ecdh_len;
const EC_KEY *tkey;
const EC_GROUP *group;
const BIGNUM *priv_key;
@ -1909,8 +1909,8 @@ int ssl3_get_client_key_exchange(SSL *s) {
}
/* Allocate a buffer for both the secret and the PSK. */
field_size = EC_GROUP_get_degree(group);
if (field_size <= 0) {
unsigned field_size = EC_GROUP_get_degree(group);
if (field_size == 0) {
OPENSSL_PUT_ERROR(SSL, ERR_R_ECDH_LIB);
goto err;
}