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>

diff --git a/crypto/ecc.c b/crypto/ecc.c
index 414c78a9c2143b700b7200dbf3216d285b93620c..69b4cc4303aa3295a3423a4ca3f22f6224b10399 100644 (file)
--- 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 37f438500255e8ecb25a4800692797df191b08f0..1ca9bf7437d7add7bc11e324b9dfb4263c26b55f 100644 (file)
--- 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 36233077a55261847b9c6f11bfe2d646add6a4fa..69c3951f0a03dc0abc4c605377d90a155a53a015 100644 (file)
--- 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;