diff options
| author | Tudor-Dan Ambarus <tudor.ambarus@microchip.com> | 2017-05-25 10:18:04 +0300 |
|---|---|---|
| committer | Herbert Xu <herbert@gondor.apana.org.au> | 2017-06-10 07:04:25 +0300 |
| commit | 099054d735a5e4cfc8e90b03b7422c9b48209d8b (patch) | |
| tree | 92f3c7bcf046e5f07e646b941708b58a4dd7e06f | |
| parent | c0ca1215dc92ee6a0f975c95a92fb7f9fb31e9e1 (diff) | |
| download | linux-099054d735a5e4cfc8e90b03b7422c9b48209d8b.tar.xz | |
crypto: ecc - remove unused function arguments
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
| -rw-r--r-- | crypto/ecc.c | 8 | ||||
| -rw-r--r-- | crypto/ecc.h | 13 | ||||
| -rw-r--r-- | crypto/ecdh.c | 11 |
3 files changed, 11 insertions, 21 deletions
diff --git a/crypto/ecc.c b/crypto/ecc.c index 414c78a9c214..69b4cc4303aa 100644 --- a/crypto/ecc.c +++ b/crypto/ecc.c @@ -928,8 +928,7 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits, } int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits, - const u8 *private_key, unsigned int private_key_len, - u8 *public_key, unsigned int public_key_len) + const u8 *private_key, u8 *public_key) { int ret = 0; struct ecc_point *pk; @@ -967,9 +966,8 @@ out: } int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits, - const u8 *private_key, unsigned int private_key_len, - const u8 *public_key, unsigned int public_key_len, - u8 *secret, unsigned int secret_len) + const u8 *private_key, const u8 *public_key, + u8 *secret) { int ret = 0; struct ecc_point *product, *pk; diff --git a/crypto/ecc.h b/crypto/ecc.h index 37f438500255..1ca9bf7437d7 100644 --- a/crypto/ecc.h +++ b/crypto/ecc.h @@ -49,16 +49,13 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits, * @curve_id: id representing the curve to use * @ndigits: curve's number of digits * @private_key: pregenerated private key for the given curve - * @private_key_len: length of private_key * @public_key: buffer for storing the generated public key - * @public_key_len: length of the public_key buffer * * Returns 0 if the public key was generated successfully, a negative value * if an error occurred. */ int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits, - const u8 *private_key, unsigned int private_key_len, - u8 *public_key, unsigned int public_key_len); + const u8 *private_key, u8 *public_key); /** * crypto_ecdh_shared_secret() - Compute a shared secret @@ -66,11 +63,8 @@ int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits, * @curve_id: id representing the curve to use * @ndigits: curve's number of digits * @private_key: private key of part A - * @private_key_len: length of private_key * @public_key: public key of counterpart B - * @public_key_len: length of public_key * @secret: buffer for storing the calculated shared secret - * @secret_len: length of the secret buffer * * Note: It is recommended that you hash the result of crypto_ecdh_shared_secret * before using it for symmetric encryption or HMAC. @@ -79,7 +73,6 @@ int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits, * if an error occurred. */ int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits, - const u8 *private_key, unsigned int private_key_len, - const u8 *public_key, unsigned int public_key_len, - u8 *secret, unsigned int secret_len); + const u8 *private_key, const u8 *public_key, + u8 *secret); #endif diff --git a/crypto/ecdh.c b/crypto/ecdh.c index 36233077a552..69c3951f0a03 100644 --- a/crypto/ecdh.c +++ b/crypto/ecdh.c @@ -81,16 +81,15 @@ static int ecdh_compute_value(struct kpp_request *req) return -EINVAL; ret = crypto_ecdh_shared_secret(ctx->curve_id, ctx->ndigits, - (const u8 *)ctx->private_key, nbytes, - (const u8 *)ctx->public_key, 2 * nbytes, - (u8 *)ctx->shared_secret, nbytes); + (const u8 *)ctx->private_key, + (const u8 *)ctx->public_key, + (u8 *)ctx->shared_secret); buf = ctx->shared_secret; } else { ret = ecdh_make_pub_key(ctx->curve_id, ctx->ndigits, - (const u8 *)ctx->private_key, nbytes, - (u8 *)ctx->public_key, - sizeof(ctx->public_key)); + (const u8 *)ctx->private_key, + (u8 *)ctx->public_key); buf = ctx->public_key; /* Public part is a point thus it has both coordinates */ nbytes *= 2; |