* [PATCH v2 00/11] fixes for ecc, ec(dh), rsa & testmgr
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Hi,
These are various fixes that I made while reading kpp and akcipher
implementations.
For KEYS there is only one patch. It checks the return value of
crypto_akcipher_maxsize().
Changes in v2:
- squash the patches that removed the unnecessary casts
- add the last five patches
v1 can be found at:
http://www.mail-archive.com/linux-crypto@vger.kernel.org/msg25139.html
Tudor Ambarus (11):
crypto: kpp, (ec)dh - fix typos
crypto: ecc - remove unused function arguments
crypto: ecc - remove unnecessary casts
crypto: dh - fix dh_max_size
crypto: ecdh - fix ecdh_max_size
crypto: ecc - don't be selfish on pubkeys
crypto: dh - fix memleak in setkey
crypto: testmgr - check err on akcipher maxsize
crypto: testmgr - check err on kpp maxsize
crypto: KEYS: check err on akcipher maxsize
crypto: rsa - do checks before allocating data
crypto/asymmetric_keys/public_key.c | 5 +++++
crypto/dh.c | 9 ++++++---
crypto/dh_helper.c | 4 ++--
crypto/ecc.c | 32 ++++++++++++++------------------
crypto/ecc.h | 25 ++++++++++---------------
crypto/ecdh.c | 24 +++++++++++-------------
crypto/ecdh_helper.c | 4 ++--
crypto/rsa.c | 16 ++++++----------
crypto/testmgr.c | 10 ++++++++++
include/crypto/dh.h | 4 ++--
include/crypto/ecdh.h | 4 ++--
include/crypto/kpp.h | 4 ++--
12 files changed, 72 insertions(+), 69 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 00/11] fixes for ecc, ec(dh), rsa & testmgr
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Hi,
These are various fixes that I made while reading kpp and akcipher
implementations.
For KEYS there is only one patch. It checks the return value of
crypto_akcipher_maxsize().
Changes in v2:
- squash the patches that removed the unnecessary casts
- add the last five patches
v1 can be found at:
http://www.mail-archive.com/linux-crypto@vger.kernel.org/msg25139.html
Tudor Ambarus (11):
crypto: kpp, (ec)dh - fix typos
crypto: ecc - remove unused function arguments
crypto: ecc - remove unnecessary casts
crypto: dh - fix dh_max_size
crypto: ecdh - fix ecdh_max_size
crypto: ecc - don't be selfish on pubkeys
crypto: dh - fix memleak in setkey
crypto: testmgr - check err on akcipher maxsize
crypto: testmgr - check err on kpp maxsize
crypto: KEYS: check err on akcipher maxsize
crypto: rsa - do checks before allocating data
crypto/asymmetric_keys/public_key.c | 5 +++++
crypto/dh.c | 9 ++++++---
crypto/dh_helper.c | 4 ++--
crypto/ecc.c | 32 ++++++++++++++------------------
crypto/ecc.h | 25 ++++++++++---------------
crypto/ecdh.c | 24 +++++++++++-------------
crypto/ecdh_helper.c | 4 ++--
crypto/rsa.c | 16 ++++++----------
crypto/testmgr.c | 10 ++++++++++
include/crypto/dh.h | 4 ++--
include/crypto/ecdh.h | 4 ++--
include/crypto/kpp.h | 4 ++--
12 files changed, 72 insertions(+), 69 deletions(-)
--
2.7.4
^ permalink raw reply [flat|nested] 34+ messages in thread
* [PATCH v2 01/11] crypto: kpp, (ec)dh - fix typos
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
While here, add missing argument description (ndigits).
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/dh.c | 4 ++--
crypto/dh_helper.c | 4 ++--
crypto/ecc.h | 8 +++++---
crypto/ecdh.c | 4 ++--
crypto/ecdh_helper.c | 4 ++--
include/crypto/dh.h | 4 ++--
include/crypto/ecdh.h | 4 ++--
include/crypto/kpp.h | 4 ++--
8 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/crypto/dh.c b/crypto/dh.c
index 87e3542..7cec0498 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -4,9 +4,9 @@
* Authors: Salvatore Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/module.h>
diff --git a/crypto/dh_helper.c b/crypto/dh_helper.c
index 02db76b..8ba8a3f 100644
--- a/crypto/dh_helper.c
+++ b/crypto/dh_helper.c
@@ -3,9 +3,9 @@
* Authors: Salvatore Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/kernel.h>
#include <linux/export.h>
diff --git a/crypto/ecc.h b/crypto/ecc.h
index 663d598..37f4385 100644
--- a/crypto/ecc.h
+++ b/crypto/ecc.h
@@ -34,9 +34,9 @@
* ecc_is_key_valid() - Validate a given ECDH private key
*
* @curve_id: id representing the curve to use
- * @ndigits: curve number of digits
+ * @ndigits: curve's number of digits
* @private_key: private key to be used for the given curve
- * @private_key_len: private key len
+ * @private_key_len: private key length
*
* Returns 0 if the key is acceptable, a negative value otherwise
*/
@@ -47,9 +47,10 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
* ecdh_make_pub_key() - Compute an ECC public key
*
* @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 public key generated
+ * @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
@@ -63,6 +64,7 @@ int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits,
* crypto_ecdh_shared_secret() - Compute a shared secret
*
* @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
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 63ca337..3623307 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -4,9 +4,9 @@
* Authors: Salvator Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/module.h>
diff --git a/crypto/ecdh_helper.c b/crypto/ecdh_helper.c
index 3cd8a24..f05bea5 100644
--- a/crypto/ecdh_helper.c
+++ b/crypto/ecdh_helper.c
@@ -3,9 +3,9 @@
* Authors: Salvatore Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/kernel.h>
#include <linux/export.h>
diff --git a/include/crypto/dh.h b/include/crypto/dh.h
index 6b424ad..f638998 100644
--- a/include/crypto/dh.h
+++ b/include/crypto/dh.h
@@ -73,9 +73,9 @@ int crypto_dh_encode_key(char *buf, unsigned int len, const struct dh *params);
/**
* crypto_dh_decode_key() - decode a private key
* @buf: Buffer holding a packet key that should be decoded
- * @len: Lenth of the packet private key buffer
+ * @len: Length of the packet private key buffer
* @params: Buffer allocated by the caller that is filled with the
- * unpacket DH private key.
+ * unpacked DH private key.
*
* The unpacking obtains the private key by pointing @p to the correct location
* in @buf. Thus, both pointers refer to the same memory.
diff --git a/include/crypto/ecdh.h b/include/crypto/ecdh.h
index 03a64f6..1aff2a8 100644
--- a/include/crypto/ecdh.h
+++ b/include/crypto/ecdh.h
@@ -74,9 +74,9 @@ int crypto_ecdh_encode_key(char *buf, unsigned int len, const struct ecdh *p);
/**
* crypto_ecdh_decode_key() - decode a private key
* @buf: Buffer holding a packet key that should be decoded
- * @len: Lenth of the packet private key buffer
+ * @len: Length of the packet private key buffer
* @p: Buffer allocated by the caller that is filled with the
- * unpacket ECDH private key.
+ * unpacked ECDH private key.
*
* The unpacking obtains the private key by pointing @p to the correct location
* in @buf. Thus, both pointers refer to the same memory.
diff --git a/include/crypto/kpp.h b/include/crypto/kpp.h
index ce8e1f7..c190825 100644
--- a/include/crypto/kpp.h
+++ b/include/crypto/kpp.h
@@ -53,7 +53,7 @@ struct crypto_kpp {
*
* @set_secret: Function invokes the protocol specific function to
* store the secret private key along with parameters.
- * The implementation knows how to decode thie buffer
+ * The implementation knows how to decode the buffer
* @generate_public_key: Function generate the public key to be sent to the
* counterpart. In case of error, where output is not big
* enough req->dst_len will be updated to the size
@@ -102,7 +102,7 @@ struct kpp_alg {
* @mask: specifies the mask for the algorithm
*
* Allocate a handle for kpp algorithm. The returned struct crypto_kpp
- * is requeried for any following API invocation
+ * is required for any following API invocation
*
* Return: allocated handle in case of success; IS_ERR() is true in case of
* an error, PTR_ERR() returns the error code.
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 01/11] crypto: kpp, (ec)dh - fix typos
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
While here, add missing argument description (ndigits).
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/dh.c | 4 ++--
crypto/dh_helper.c | 4 ++--
crypto/ecc.h | 8 +++++---
crypto/ecdh.c | 4 ++--
crypto/ecdh_helper.c | 4 ++--
include/crypto/dh.h | 4 ++--
include/crypto/ecdh.h | 4 ++--
include/crypto/kpp.h | 4 ++--
8 files changed, 19 insertions(+), 17 deletions(-)
diff --git a/crypto/dh.c b/crypto/dh.c
index 87e3542..7cec0498 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -4,9 +4,9 @@
* Authors: Salvatore Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/module.h>
diff --git a/crypto/dh_helper.c b/crypto/dh_helper.c
index 02db76b..8ba8a3f 100644
--- a/crypto/dh_helper.c
+++ b/crypto/dh_helper.c
@@ -3,9 +3,9 @@
* Authors: Salvatore Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/kernel.h>
#include <linux/export.h>
diff --git a/crypto/ecc.h b/crypto/ecc.h
index 663d598..37f4385 100644
--- a/crypto/ecc.h
+++ b/crypto/ecc.h
@@ -34,9 +34,9 @@
* ecc_is_key_valid() - Validate a given ECDH private key
*
* @curve_id: id representing the curve to use
- * @ndigits: curve number of digits
+ * @ndigits: curve's number of digits
* @private_key: private key to be used for the given curve
- * @private_key_len: private key len
+ * @private_key_len: private key length
*
* Returns 0 if the key is acceptable, a negative value otherwise
*/
@@ -47,9 +47,10 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
* ecdh_make_pub_key() - Compute an ECC public key
*
* @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 public key generated
+ * @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
@@ -63,6 +64,7 @@ int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits,
* crypto_ecdh_shared_secret() - Compute a shared secret
*
* @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
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 63ca337..3623307 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -4,9 +4,9 @@
* Authors: Salvator Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/module.h>
diff --git a/crypto/ecdh_helper.c b/crypto/ecdh_helper.c
index 3cd8a24..f05bea5 100644
--- a/crypto/ecdh_helper.c
+++ b/crypto/ecdh_helper.c
@@ -3,9 +3,9 @@
* Authors: Salvatore Benedetto <salvatore.benedetto@intel.com>
*
* This program is free software; you can redistribute it and/or
- * modify it under the terms of the GNU General Public Licence
+ * modify it under the terms of the GNU General Public License
* as published by the Free Software Foundation; either version
- * 2 of the Licence, or (at your option) any later version.
+ * 2 of the License, or (at your option) any later version.
*/
#include <linux/kernel.h>
#include <linux/export.h>
diff --git a/include/crypto/dh.h b/include/crypto/dh.h
index 6b424ad..f638998 100644
--- a/include/crypto/dh.h
+++ b/include/crypto/dh.h
@@ -73,9 +73,9 @@ int crypto_dh_encode_key(char *buf, unsigned int len, const struct dh *params);
/**
* crypto_dh_decode_key() - decode a private key
* @buf: Buffer holding a packet key that should be decoded
- * @len: Lenth of the packet private key buffer
+ * @len: Length of the packet private key buffer
* @params: Buffer allocated by the caller that is filled with the
- * unpacket DH private key.
+ * unpacked DH private key.
*
* The unpacking obtains the private key by pointing @p to the correct location
* in @buf. Thus, both pointers refer to the same memory.
diff --git a/include/crypto/ecdh.h b/include/crypto/ecdh.h
index 03a64f6..1aff2a8 100644
--- a/include/crypto/ecdh.h
+++ b/include/crypto/ecdh.h
@@ -74,9 +74,9 @@ int crypto_ecdh_encode_key(char *buf, unsigned int len, const struct ecdh *p);
/**
* crypto_ecdh_decode_key() - decode a private key
* @buf: Buffer holding a packet key that should be decoded
- * @len: Lenth of the packet private key buffer
+ * @len: Length of the packet private key buffer
* @p: Buffer allocated by the caller that is filled with the
- * unpacket ECDH private key.
+ * unpacked ECDH private key.
*
* The unpacking obtains the private key by pointing @p to the correct location
* in @buf. Thus, both pointers refer to the same memory.
diff --git a/include/crypto/kpp.h b/include/crypto/kpp.h
index ce8e1f7..c190825 100644
--- a/include/crypto/kpp.h
+++ b/include/crypto/kpp.h
@@ -53,7 +53,7 @@ struct crypto_kpp {
*
* @set_secret: Function invokes the protocol specific function to
* store the secret private key along with parameters.
- * The implementation knows how to decode thie buffer
+ * The implementation knows how to decode the buffer
* @generate_public_key: Function generate the public key to be sent to the
* counterpart. In case of error, where output is not big
* enough req->dst_len will be updated to the size
@@ -102,7 +102,7 @@ struct kpp_alg {
* @mask: specifies the mask for the algorithm
*
* Allocate a handle for kpp algorithm. The returned struct crypto_kpp
- * is requeried for any following API invocation
+ * is required for any following API invocation
*
* Return: allocated handle in case of success; IS_ERR() is true in case of
* an error, PTR_ERR() returns the error code.
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 02/11] crypto: ecc - remove unused function arguments
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecc.c | 8 +++-----
crypto/ecc.h | 13 +++----------
crypto/ecdh.c | 11 +++++------
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index 414c78a..69b4cc4 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 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
}
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 37f4385..1ca9bf7 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 3623307..69c3951 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;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 02/11] crypto: ecc - remove unused function arguments
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecc.c | 8 +++-----
crypto/ecc.h | 13 +++----------
crypto/ecdh.c | 11 +++++------
3 files changed, 11 insertions(+), 21 deletions(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index 414c78a..69b4cc4 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 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
}
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 37f4385..1ca9bf7 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 3623307..69c3951 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;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 03/11] crypto: ecc - remove unnecessary casts
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
ecc software implementation works with chunks of u64 data. There were some
unnecessary casts to u8 and then back to u64 for the ecc keys. This patch
removes the unnecessary casts.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecc.c | 28 +++++++++++++---------------
crypto/ecc.h | 8 ++++----
crypto/ecdh.c | 11 +++++------
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index 69b4cc4..e3a2b8f 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -904,7 +904,7 @@ static inline void ecc_swap_digits(const u64 *in, u64 *out,
}
int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, unsigned int private_key_len)
+ const u64 *private_key, unsigned int private_key_len)
{
int nbytes;
const struct ecc_curve *curve = ecc_get_curve(curve_id);
@@ -917,23 +917,22 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
if (private_key_len != nbytes)
return -EINVAL;
- if (vli_is_zero((const u64 *)&private_key[0], ndigits))
+ if (vli_is_zero(private_key, ndigits))
return -EINVAL;
/* Make sure the private key is in the range [1, n-1]. */
- if (vli_cmp(curve->n, (const u64 *)&private_key[0], ndigits) != 1)
+ if (vli_cmp(curve->n, private_key, ndigits) != 1)
return -EINVAL;
return 0;
}
int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, u8 *public_key)
+ const u64 *private_key, u64 *public_key)
{
int ret = 0;
struct ecc_point *pk;
u64 priv[ndigits];
- unsigned int nbytes;
const struct ecc_curve *curve = ecc_get_curve(curve_id);
if (!private_key || !curve) {
@@ -941,7 +940,7 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
goto out;
}
- ecc_swap_digits((const u64 *)private_key, priv, ndigits);
+ ecc_swap_digits(private_key, priv, ndigits);
pk = ecc_alloc_point(ndigits);
if (!pk) {
@@ -955,9 +954,8 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
goto err_free_point;
}
- nbytes = ndigits << ECC_DIGITS_TO_BYTES_SHIFT;
- ecc_swap_digits(pk->x, (u64 *)public_key, ndigits);
- ecc_swap_digits(pk->y, (u64 *)&public_key[nbytes], ndigits);
+ ecc_swap_digits(pk->x, public_key, ndigits);
+ ecc_swap_digits(pk->y, &public_key[ndigits], ndigits);
err_free_point:
ecc_free_point(pk);
@@ -966,8 +964,8 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
}
int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, const u8 *public_key,
- u8 *secret)
+ const u64 *private_key, const u64 *public_key,
+ u64 *secret)
{
int ret = 0;
struct ecc_point *product, *pk;
@@ -997,13 +995,13 @@ int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,
goto err_alloc_product;
}
- ecc_swap_digits((const u64 *)public_key, pk->x, ndigits);
- ecc_swap_digits((const u64 *)&public_key[nbytes], pk->y, ndigits);
- ecc_swap_digits((const u64 *)private_key, priv, ndigits);
+ ecc_swap_digits(public_key, pk->x, ndigits);
+ ecc_swap_digits(&public_key[ndigits], pk->y, ndigits);
+ ecc_swap_digits(private_key, priv, ndigits);
ecc_point_mult(product, pk, priv, rand_z, curve->p, ndigits);
- ecc_swap_digits(product->x, (u64 *)secret, ndigits);
+ ecc_swap_digits(product->x, secret, ndigits);
if (ecc_point_is_zero(product))
ret = -EFAULT;
diff --git a/crypto/ecc.h b/crypto/ecc.h
index 1ca9bf7..af2ffdb 100644
--- a/crypto/ecc.h
+++ b/crypto/ecc.h
@@ -41,7 +41,7 @@
* Returns 0 if the key is acceptable, a negative value otherwise
*/
int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, unsigned int private_key_len);
+ const u64 *private_key, unsigned int private_key_len);
/**
* ecdh_make_pub_key() - Compute an ECC public key
@@ -55,7 +55,7 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
* if an error occurred.
*/
int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, u8 *public_key);
+ const u64 *private_key, u64 *public_key);
/**
* crypto_ecdh_shared_secret() - Compute a shared secret
@@ -73,6 +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, const u8 *public_key,
- u8 *secret);
+ const u64 *private_key, const u64 *public_key,
+ u64 *secret);
#endif
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 69c3951..c1f0163 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -56,7 +56,7 @@ static int ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
ctx->ndigits = ndigits;
if (ecc_is_key_valid(ctx->curve_id, ctx->ndigits,
- (const u8 *)params.key, params.key_size) < 0)
+ (const u64 *)params.key, params.key_size) < 0)
return -EINVAL;
memcpy(ctx->private_key, params.key, params.key_size);
@@ -81,15 +81,14 @@ 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,
- (const u8 *)ctx->public_key,
- (u8 *)ctx->shared_secret);
+ ctx->private_key,
+ ctx->public_key,
+ ctx->shared_secret);
buf = ctx->shared_secret;
} else {
ret = ecdh_make_pub_key(ctx->curve_id, ctx->ndigits,
- (const u8 *)ctx->private_key,
- (u8 *)ctx->public_key);
+ ctx->private_key, ctx->public_key);
buf = ctx->public_key;
/* Public part is a point thus it has both coordinates */
nbytes *= 2;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 03/11] crypto: ecc - remove unnecessary casts
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
ecc software implementation works with chunks of u64 data. There were some
unnecessary casts to u8 and then back to u64 for the ecc keys. This patch
removes the unnecessary casts.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecc.c | 28 +++++++++++++---------------
crypto/ecc.h | 8 ++++----
crypto/ecdh.c | 11 +++++------
3 files changed, 22 insertions(+), 25 deletions(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index 69b4cc4..e3a2b8f 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -904,7 +904,7 @@ static inline void ecc_swap_digits(const u64 *in, u64 *out,
}
int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, unsigned int private_key_len)
+ const u64 *private_key, unsigned int private_key_len)
{
int nbytes;
const struct ecc_curve *curve = ecc_get_curve(curve_id);
@@ -917,23 +917,22 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
if (private_key_len != nbytes)
return -EINVAL;
- if (vli_is_zero((const u64 *)&private_key[0], ndigits))
+ if (vli_is_zero(private_key, ndigits))
return -EINVAL;
/* Make sure the private key is in the range [1, n-1]. */
- if (vli_cmp(curve->n, (const u64 *)&private_key[0], ndigits) != 1)
+ if (vli_cmp(curve->n, private_key, ndigits) != 1)
return -EINVAL;
return 0;
}
int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, u8 *public_key)
+ const u64 *private_key, u64 *public_key)
{
int ret = 0;
struct ecc_point *pk;
u64 priv[ndigits];
- unsigned int nbytes;
const struct ecc_curve *curve = ecc_get_curve(curve_id);
if (!private_key || !curve) {
@@ -941,7 +940,7 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
goto out;
}
- ecc_swap_digits((const u64 *)private_key, priv, ndigits);
+ ecc_swap_digits(private_key, priv, ndigits);
pk = ecc_alloc_point(ndigits);
if (!pk) {
@@ -955,9 +954,8 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
goto err_free_point;
}
- nbytes = ndigits << ECC_DIGITS_TO_BYTES_SHIFT;
- ecc_swap_digits(pk->x, (u64 *)public_key, ndigits);
- ecc_swap_digits(pk->y, (u64 *)&public_key[nbytes], ndigits);
+ ecc_swap_digits(pk->x, public_key, ndigits);
+ ecc_swap_digits(pk->y, &public_key[ndigits], ndigits);
err_free_point:
ecc_free_point(pk);
@@ -966,8 +964,8 @@ int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
}
int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, const u8 *public_key,
- u8 *secret)
+ const u64 *private_key, const u64 *public_key,
+ u64 *secret)
{
int ret = 0;
struct ecc_point *product, *pk;
@@ -997,13 +995,13 @@ int crypto_ecdh_shared_secret(unsigned int curve_id, unsigned int ndigits,
goto err_alloc_product;
}
- ecc_swap_digits((const u64 *)public_key, pk->x, ndigits);
- ecc_swap_digits((const u64 *)&public_key[nbytes], pk->y, ndigits);
- ecc_swap_digits((const u64 *)private_key, priv, ndigits);
+ ecc_swap_digits(public_key, pk->x, ndigits);
+ ecc_swap_digits(&public_key[ndigits], pk->y, ndigits);
+ ecc_swap_digits(private_key, priv, ndigits);
ecc_point_mult(product, pk, priv, rand_z, curve->p, ndigits);
- ecc_swap_digits(product->x, (u64 *)secret, ndigits);
+ ecc_swap_digits(product->x, secret, ndigits);
if (ecc_point_is_zero(product))
ret = -EFAULT;
diff --git a/crypto/ecc.h b/crypto/ecc.h
index 1ca9bf7..af2ffdb 100644
--- a/crypto/ecc.h
+++ b/crypto/ecc.h
@@ -41,7 +41,7 @@
* Returns 0 if the key is acceptable, a negative value otherwise
*/
int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, unsigned int private_key_len);
+ const u64 *private_key, unsigned int private_key_len);
/**
* ecdh_make_pub_key() - Compute an ECC public key
@@ -55,7 +55,7 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
* if an error occurred.
*/
int ecdh_make_pub_key(const unsigned int curve_id, unsigned int ndigits,
- const u8 *private_key, u8 *public_key);
+ const u64 *private_key, u64 *public_key);
/**
* crypto_ecdh_shared_secret() - Compute a shared secret
@@ -73,6 +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, const u8 *public_key,
- u8 *secret);
+ const u64 *private_key, const u64 *public_key,
+ u64 *secret);
#endif
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 69c3951..c1f0163 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -56,7 +56,7 @@ static int ecdh_set_secret(struct crypto_kpp *tfm, const void *buf,
ctx->ndigits = ndigits;
if (ecc_is_key_valid(ctx->curve_id, ctx->ndigits,
- (const u8 *)params.key, params.key_size) < 0)
+ (const u64 *)params.key, params.key_size) < 0)
return -EINVAL;
memcpy(ctx->private_key, params.key, params.key_size);
@@ -81,15 +81,14 @@ 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,
- (const u8 *)ctx->public_key,
- (u8 *)ctx->shared_secret);
+ ctx->private_key,
+ ctx->public_key,
+ ctx->shared_secret);
buf = ctx->shared_secret;
} else {
ret = ecdh_make_pub_key(ctx->curve_id, ctx->ndigits,
- (const u8 *)ctx->private_key,
- (u8 *)ctx->public_key);
+ ctx->private_key, ctx->public_key);
buf = ctx->public_key;
/* Public part is a point thus it has both coordinates */
nbytes *= 2;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 04/11] crypto: dh - fix dh_max_size
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
The function should return minimum size for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/dh.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/dh.c b/crypto/dh.c
index 7cec0498..325a5dd 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -148,7 +148,7 @@ static int dh_max_size(struct crypto_kpp *tfm)
{
struct dh_ctx *ctx = dh_get_ctx(tfm);
- return mpi_get_size(ctx->p);
+ return ctx->p ? mpi_get_size(ctx->p) : -EINVAL;
}
static void dh_exit_tfm(struct crypto_kpp *tfm)
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 04/11] crypto: dh - fix dh_max_size
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
The function should return minimum size for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/dh.c | 2 +-
1 file changed, 1 insertion(+), 1 deletion(-)
diff --git a/crypto/dh.c b/crypto/dh.c
index 7cec0498..325a5dd 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -148,7 +148,7 @@ static int dh_max_size(struct crypto_kpp *tfm)
{
struct dh_ctx *ctx = dh_get_ctx(tfm);
- return mpi_get_size(ctx->p);
+ return ctx->p ? mpi_get_size(ctx->p) : -EINVAL;
}
static void dh_exit_tfm(struct crypto_kpp *tfm)
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 05/11] crypto: ecdh - fix ecdh_max_size
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
The function should return minimum size for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecdh.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index c1f0163..830dfb6 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -107,10 +107,10 @@ static int ecdh_compute_value(struct kpp_request *req)
static int ecdh_max_size(struct crypto_kpp *tfm)
{
struct ecdh_ctx *ctx = ecdh_get_ctx(tfm);
- int nbytes = ctx->ndigits << ECC_DIGITS_TO_BYTES_SHIFT;
- /* Public key is made of two coordinates */
- return 2 * nbytes;
+ /* Public key is made of two coordinates, add one to the left shift */
+ return ctx->ndigits ? ctx->ndigits << (ECC_DIGITS_TO_BYTES_SHIFT + 1) :
+ -EINVAL;
}
static void no_exit_tfm(struct crypto_kpp *tfm)
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 05/11] crypto: ecdh - fix ecdh_max_size
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
The function should return minimum size for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecdh.c | 6 +++---
1 file changed, 3 insertions(+), 3 deletions(-)
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index c1f0163..830dfb6 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -107,10 +107,10 @@ static int ecdh_compute_value(struct kpp_request *req)
static int ecdh_max_size(struct crypto_kpp *tfm)
{
struct ecdh_ctx *ctx = ecdh_get_ctx(tfm);
- int nbytes = ctx->ndigits << ECC_DIGITS_TO_BYTES_SHIFT;
- /* Public key is made of two coordinates */
- return 2 * nbytes;
+ /* Public key is made of two coordinates, add one to the left shift */
+ return ctx->ndigits ? ctx->ndigits << (ECC_DIGITS_TO_BYTES_SHIFT + 1) :
+ -EINVAL;
}
static void no_exit_tfm(struct crypto_kpp *tfm)
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 06/11] crypto: ecc - don't be selfish on pubkeys
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Rename ecdh_make_pub_key() to ecc_make_pub_key().
This function might as well be used by ecdsa.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecc.c | 4 ++--
crypto/ecc.h | 4 ++--
crypto/ecdh.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index e3a2b8f..6c33c43 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -927,8 +927,8 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
return 0;
}
-int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
- const u64 *private_key, u64 *public_key)
+int ecc_make_pub_key(unsigned int curve_id, unsigned int ndigits,
+ const u64 *private_key, u64 *public_key)
{
int ret = 0;
struct ecc_point *pk;
diff --git a/crypto/ecc.h b/crypto/ecc.h
index af2ffdb..673c834 100644
--- a/crypto/ecc.h
+++ b/crypto/ecc.h
@@ -54,8 +54,8 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
* 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 u64 *private_key, u64 *public_key);
+int ecc_make_pub_key(const unsigned int curve_id, unsigned int ndigits,
+ const u64 *private_key, u64 *public_key);
/**
* crypto_ecdh_shared_secret() - Compute a shared secret
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 830dfb6..8b6450d 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -87,8 +87,8 @@ static int ecdh_compute_value(struct kpp_request *req)
buf = ctx->shared_secret;
} else {
- ret = ecdh_make_pub_key(ctx->curve_id, ctx->ndigits,
- ctx->private_key, ctx->public_key);
+ ret = ecc_make_pub_key(ctx->curve_id, ctx->ndigits,
+ ctx->private_key, ctx->public_key);
buf = ctx->public_key;
/* Public part is a point thus it has both coordinates */
nbytes *= 2;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 06/11] crypto: ecc - don't be selfish on pubkeys
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Rename ecdh_make_pub_key() to ecc_make_pub_key().
This function might as well be used by ecdsa.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/ecc.c | 4 ++--
crypto/ecc.h | 4 ++--
crypto/ecdh.c | 4 ++--
3 files changed, 6 insertions(+), 6 deletions(-)
diff --git a/crypto/ecc.c b/crypto/ecc.c
index e3a2b8f..6c33c43 100644
--- a/crypto/ecc.c
+++ b/crypto/ecc.c
@@ -927,8 +927,8 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
return 0;
}
-int ecdh_make_pub_key(unsigned int curve_id, unsigned int ndigits,
- const u64 *private_key, u64 *public_key)
+int ecc_make_pub_key(unsigned int curve_id, unsigned int ndigits,
+ const u64 *private_key, u64 *public_key)
{
int ret = 0;
struct ecc_point *pk;
diff --git a/crypto/ecc.h b/crypto/ecc.h
index af2ffdb..673c834 100644
--- a/crypto/ecc.h
+++ b/crypto/ecc.h
@@ -54,8 +54,8 @@ int ecc_is_key_valid(unsigned int curve_id, unsigned int ndigits,
* 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 u64 *private_key, u64 *public_key);
+int ecc_make_pub_key(const unsigned int curve_id, unsigned int ndigits,
+ const u64 *private_key, u64 *public_key);
/**
* crypto_ecdh_shared_secret() - Compute a shared secret
diff --git a/crypto/ecdh.c b/crypto/ecdh.c
index 830dfb6..8b6450d 100644
--- a/crypto/ecdh.c
+++ b/crypto/ecdh.c
@@ -87,8 +87,8 @@ static int ecdh_compute_value(struct kpp_request *req)
buf = ctx->shared_secret;
} else {
- ret = ecdh_make_pub_key(ctx->curve_id, ctx->ndigits,
- ctx->private_key, ctx->public_key);
+ ret = ecc_make_pub_key(ctx->curve_id, ctx->ndigits,
+ ctx->private_key, ctx->public_key);
buf = ctx->public_key;
/* Public part is a point thus it has both coordinates */
nbytes *= 2;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 07/11] crypto: dh - fix memleak in setkey
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
setkey can be called multiple times during the existence
of the transformation object. Free the old MPI key if any.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/dh.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/crypto/dh.c b/crypto/dh.c
index 325a5dd..b55b03d 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -85,6 +85,9 @@ static int dh_set_secret(struct crypto_kpp *tfm, const void *buf,
struct dh_ctx *ctx = dh_get_ctx(tfm);
struct dh params;
+ /* Free the old MPI key if any */
+ dh_free_ctx(ctx);
+
if (crypto_dh_decode_key(buf, len, ¶ms) < 0)
return -EINVAL;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 07/11] crypto: dh - fix memleak in setkey
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
setkey can be called multiple times during the existence
of the transformation object. Free the old MPI key if any.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/dh.c | 3 +++
1 file changed, 3 insertions(+)
diff --git a/crypto/dh.c b/crypto/dh.c
index 325a5dd..b55b03d 100644
--- a/crypto/dh.c
+++ b/crypto/dh.c
@@ -85,6 +85,9 @@ static int dh_set_secret(struct crypto_kpp *tfm, const void *buf,
struct dh_ctx *ctx = dh_get_ctx(tfm);
struct dh params;
+ /* Free the old MPI key if any */
+ dh_free_ctx(ctx);
+
if (crypto_dh_decode_key(buf, len, ¶ms) < 0)
return -EINVAL;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
crypto_akcipher_maxsize() returns minimum length for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/testmgr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 6f5f3ed..87a4abd 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2150,6 +2150,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
err = -ENOMEM;
out_len_max = crypto_akcipher_maxsize(tfm);
+ if (out_len_max < 0) {
+ err = out_len_max;
+ goto free_req;
+ }
+
outbuf_enc = kzalloc(out_len_max, GFP_KERNEL);
if (!outbuf_enc)
goto free_req;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
crypto_akcipher_maxsize() returns minimum length for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/testmgr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 6f5f3ed..87a4abd 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2150,6 +2150,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
err = -ENOMEM;
out_len_max = crypto_akcipher_maxsize(tfm);
+ if (out_len_max < 0) {
+ err = out_len_max;
+ goto free_req;
+ }
+
outbuf_enc = kzalloc(out_len_max, GFP_KERNEL);
if (!outbuf_enc)
goto free_req;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 09/11] crypto: testmgr - check err on kpp maxsize
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
crypto_kpp_maxsize() returns minimum length for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/testmgr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 87a4abd..0bf9a00 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2013,6 +2013,11 @@ static int do_test_kpp(struct crypto_kpp *tfm, const struct kpp_testvec *vec,
goto free_req;
out_len_max = crypto_kpp_maxsize(tfm);
+ if (out_len_max < 0) {
+ err = out_len_max;
+ goto free_req;
+ }
+
output_buf = kzalloc(out_len_max, GFP_KERNEL);
if (!output_buf) {
err = -ENOMEM;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 09/11] crypto: testmgr - check err on kpp maxsize
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
crypto_kpp_maxsize() returns minimum length for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/testmgr.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/crypto/testmgr.c b/crypto/testmgr.c
index 87a4abd..0bf9a00 100644
--- a/crypto/testmgr.c
+++ b/crypto/testmgr.c
@@ -2013,6 +2013,11 @@ static int do_test_kpp(struct crypto_kpp *tfm, const struct kpp_testvec *vec,
goto free_req;
out_len_max = crypto_kpp_maxsize(tfm);
+ if (out_len_max < 0) {
+ err = out_len_max;
+ goto free_req;
+ }
+
output_buf = kzalloc(out_len_max, GFP_KERNEL);
if (!output_buf) {
err = -ENOMEM;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 10/11] crypto: KEYS: check err on akcipher maxsize
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
crypto_akcipher_maxsize() returns minimum length for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/asymmetric_keys/public_key.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index d3a989e..2b2f8bf 100644
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
@@ -123,6 +123,11 @@ int public_key_verify_signature(const struct public_key *pkey,
ret = -ENOMEM;
outlen = crypto_akcipher_maxsize(tfm);
+ if (outlen < 0) {
+ ret = outlen;
+ goto error_free_req;
+ }
+
output = kmalloc(outlen, GFP_KERNEL);
if (!output)
goto error_free_req;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 10/11] crypto: KEYS: check err on akcipher maxsize
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
crypto_akcipher_maxsize() returns minimum length for output buffer
or error code if key hasn't been set.
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/asymmetric_keys/public_key.c | 5 +++++
1 file changed, 5 insertions(+)
diff --git a/crypto/asymmetric_keys/public_key.c b/crypto/asymmetric_keys/public_key.c
index d3a989e..2b2f8bf 100644
--- a/crypto/asymmetric_keys/public_key.c
+++ b/crypto/asymmetric_keys/public_key.c
@@ -123,6 +123,11 @@ int public_key_verify_signature(const struct public_key *pkey,
ret = -ENOMEM;
outlen = crypto_akcipher_maxsize(tfm);
+ if (outlen < 0) {
+ ret = outlen;
+ goto error_free_req;
+ }
+
output = kmalloc(outlen, GFP_KERNEL);
if (!output)
goto error_free_req;
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 11/11] crypto: rsa - do checks before allocating data
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-17 15:00 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/rsa.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/crypto/rsa.c b/crypto/rsa.c
index 4c280b6..a80f76d 100644
--- a/crypto/rsa.c
+++ b/crypto/rsa.c
@@ -279,6 +279,9 @@ static int rsa_set_pub_key(struct crypto_akcipher *tfm, const void *key,
if (ret)
return ret;
+ if (rsa_check_key_length(raw_key.n_sz << 3))
+ return -EINVAL;
+
mpi_key->e = mpi_read_raw_data(raw_key.e, raw_key.e_sz);
if (!mpi_key->e)
goto err;
@@ -287,11 +290,6 @@ static int rsa_set_pub_key(struct crypto_akcipher *tfm, const void *key,
if (!mpi_key->n)
goto err;
- if (rsa_check_key_length(mpi_get_size(mpi_key->n) << 3)) {
- rsa_free_mpi_key(mpi_key);
- return -EINVAL;
- }
-
return 0;
err:
@@ -313,6 +311,9 @@ static int rsa_set_priv_key(struct crypto_akcipher *tfm, const void *key,
if (ret)
return ret;
+ if (rsa_check_key_length(raw_key.n_sz << 3))
+ return -EINVAL;
+
mpi_key->d = mpi_read_raw_data(raw_key.d, raw_key.d_sz);
if (!mpi_key->d)
goto err;
@@ -325,11 +326,6 @@ static int rsa_set_priv_key(struct crypto_akcipher *tfm, const void *key,
if (!mpi_key->n)
goto err;
- if (rsa_check_key_length(mpi_get_size(mpi_key->n) << 3)) {
- rsa_free_mpi_key(mpi_key);
- return -EINVAL;
- }
-
return 0;
err:
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* [PATCH v2 11/11] crypto: rsa - do checks before allocating data
@ 2017-05-17 15:00 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-17 15:00 UTC (permalink / raw
To: herbert, davem, dhowells
Cc: linux-crypto, keyrings, Nicolas.Ferre, Tudor Ambarus
Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
---
crypto/rsa.c | 16 ++++++----------
1 file changed, 6 insertions(+), 10 deletions(-)
diff --git a/crypto/rsa.c b/crypto/rsa.c
index 4c280b6..a80f76d 100644
--- a/crypto/rsa.c
+++ b/crypto/rsa.c
@@ -279,6 +279,9 @@ static int rsa_set_pub_key(struct crypto_akcipher *tfm, const void *key,
if (ret)
return ret;
+ if (rsa_check_key_length(raw_key.n_sz << 3))
+ return -EINVAL;
+
mpi_key->e = mpi_read_raw_data(raw_key.e, raw_key.e_sz);
if (!mpi_key->e)
goto err;
@@ -287,11 +290,6 @@ static int rsa_set_pub_key(struct crypto_akcipher *tfm, const void *key,
if (!mpi_key->n)
goto err;
- if (rsa_check_key_length(mpi_get_size(mpi_key->n) << 3)) {
- rsa_free_mpi_key(mpi_key);
- return -EINVAL;
- }
-
return 0;
err:
@@ -313,6 +311,9 @@ static int rsa_set_priv_key(struct crypto_akcipher *tfm, const void *key,
if (ret)
return ret;
+ if (rsa_check_key_length(raw_key.n_sz << 3))
+ return -EINVAL;
+
mpi_key->d = mpi_read_raw_data(raw_key.d, raw_key.d_sz);
if (!mpi_key->d)
goto err;
@@ -325,11 +326,6 @@ static int rsa_set_priv_key(struct crypto_akcipher *tfm, const void *key,
if (!mpi_key->n)
goto err;
- if (rsa_check_key_length(mpi_get_size(mpi_key->n) << 3)) {
- rsa_free_mpi_key(mpi_key);
- return -EINVAL;
- }
-
return 0;
err:
--
2.7.4
^ permalink raw reply related [flat|nested] 34+ messages in thread
* Re: [PATCH v2 04/11] crypto: dh - fix dh_max_size
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-23 4:07 ` Herbert Xu
-1 siblings, 0 replies; 34+ messages in thread
From: Herbert Xu @ 2017-05-23 4:07 UTC (permalink / raw
To: Tudor Ambarus; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On Wed, May 17, 2017 at 06:00:31PM +0300, Tudor Ambarus wrote:
> The function should return minimum size for output buffer
> or error code if key hasn't been set.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> crypto/dh.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/crypto/dh.c b/crypto/dh.c
> index 7cec0498..325a5dd 100644
> --- a/crypto/dh.c
> +++ b/crypto/dh.c
> @@ -148,7 +148,7 @@ static int dh_max_size(struct crypto_kpp *tfm)
> {
> struct dh_ctx *ctx = dh_get_ctx(tfm);
>
> - return mpi_get_size(ctx->p);
> + return ctx->p ? mpi_get_size(ctx->p) : -EINVAL;
How about ENOKEY?
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 04/11] crypto: dh - fix dh_max_size
@ 2017-05-23 4:07 ` Herbert Xu
0 siblings, 0 replies; 34+ messages in thread
From: Herbert Xu @ 2017-05-23 4:07 UTC (permalink / raw
To: Tudor Ambarus; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On Wed, May 17, 2017 at 06:00:31PM +0300, Tudor Ambarus wrote:
> The function should return minimum size for output buffer
> or error code if key hasn't been set.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> crypto/dh.c | 2 +-
> 1 file changed, 1 insertion(+), 1 deletion(-)
>
> diff --git a/crypto/dh.c b/crypto/dh.c
> index 7cec0498..325a5dd 100644
> --- a/crypto/dh.c
> +++ b/crypto/dh.c
> @@ -148,7 +148,7 @@ static int dh_max_size(struct crypto_kpp *tfm)
> {
> struct dh_ctx *ctx = dh_get_ctx(tfm);
>
> - return mpi_get_size(ctx->p);
> + return ctx->p ? mpi_get_size(ctx->p) : -EINVAL;
How about ENOKEY?
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-23 4:08 ` Herbert Xu
-1 siblings, 0 replies; 34+ messages in thread
From: Herbert Xu @ 2017-05-23 4:08 UTC (permalink / raw
To: Tudor Ambarus; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On Wed, May 17, 2017 at 06:00:35PM +0300, Tudor Ambarus wrote:
> crypto_akcipher_maxsize() returns minimum length for output buffer
> or error code if key hasn't been set.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> crypto/testmgr.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
> index 6f5f3ed..87a4abd 100644
> --- a/crypto/testmgr.c
> +++ b/crypto/testmgr.c
> @@ -2150,6 +2150,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
>
> err = -ENOMEM;
> out_len_max = crypto_akcipher_maxsize(tfm);
Can this call be reached without a setkey or with a failed setkey?
If not we should not check for errors.
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
@ 2017-05-23 4:08 ` Herbert Xu
0 siblings, 0 replies; 34+ messages in thread
From: Herbert Xu @ 2017-05-23 4:08 UTC (permalink / raw
To: Tudor Ambarus; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On Wed, May 17, 2017 at 06:00:35PM +0300, Tudor Ambarus wrote:
> crypto_akcipher_maxsize() returns minimum length for output buffer
> or error code if key hasn't been set.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
> ---
> crypto/testmgr.c | 5 +++++
> 1 file changed, 5 insertions(+)
>
> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
> index 6f5f3ed..87a4abd 100644
> --- a/crypto/testmgr.c
> +++ b/crypto/testmgr.c
> @@ -2150,6 +2150,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
>
> err = -ENOMEM;
> out_len_max = crypto_akcipher_maxsize(tfm);
Can this call be reached without a setkey or with a failed setkey?
If not we should not check for errors.
Cheers,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
2017-05-23 4:08 ` Herbert Xu
@ 2017-05-23 9:18 ` Tudor Ambarus
-1 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-23 9:18 UTC (permalink / raw
To: Herbert Xu; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On 23.05.2017 07:08, Herbert Xu wrote:
> On Wed, May 17, 2017 at 06:00:35PM +0300, Tudor Ambarus wrote:
>> crypto_akcipher_maxsize() returns minimum length for output buffer
>> or error code if key hasn't been set.
>>
>> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
>> ---
>> crypto/testmgr.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
>> index 6f5f3ed..87a4abd 100644
>> --- a/crypto/testmgr.c
>> +++ b/crypto/testmgr.c
>> @@ -2150,6 +2150,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
>>
>> err = -ENOMEM;
>> out_len_max = crypto_akcipher_maxsize(tfm);
>
> Can this call be reached without a setkey or with a failed setkey?
As of now, this call is reached only after a successful setkey.
If some user call it before setkey we will end up in a NULL dereference.
I tend to keep the error checking.
Thanks,
ta
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
@ 2017-05-23 9:18 ` Tudor Ambarus
0 siblings, 0 replies; 34+ messages in thread
From: Tudor Ambarus @ 2017-05-23 9:18 UTC (permalink / raw
To: Herbert Xu; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On 23.05.2017 07:08, Herbert Xu wrote:
> On Wed, May 17, 2017 at 06:00:35PM +0300, Tudor Ambarus wrote:
>> crypto_akcipher_maxsize() returns minimum length for output buffer
>> or error code if key hasn't been set.
>>
>> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
>> ---
>> crypto/testmgr.c | 5 +++++
>> 1 file changed, 5 insertions(+)
>>
>> diff --git a/crypto/testmgr.c b/crypto/testmgr.c
>> index 6f5f3ed..87a4abd 100644
>> --- a/crypto/testmgr.c
>> +++ b/crypto/testmgr.c
>> @@ -2150,6 +2150,11 @@ static int test_akcipher_one(struct crypto_akcipher *tfm,
>>
>> err = -ENOMEM;
>> out_len_max = crypto_akcipher_maxsize(tfm);
>
> Can this call be reached without a setkey or with a failed setkey?
As of now, this call is reached only after a successful setkey.
If some user call it before setkey we will end up in a NULL dereference.
I tend to keep the error checking.
Thanks,
ta
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
2017-05-23 9:18 ` Tudor Ambarus
@ 2017-05-24 3:51 ` Herbert Xu
-1 siblings, 0 replies; 34+ messages in thread
From: Herbert Xu @ 2017-05-24 3:51 UTC (permalink / raw
To: Tudor Ambarus; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On Tue, May 23, 2017 at 12:18:23PM +0300, Tudor Ambarus wrote:
>
> As of now, this call is reached only after a successful setkey.
> If some user call it before setkey we will end up in a NULL dereference.
> I tend to keep the error checking.
I fail to see how this could be an issue in testmgr.
Please just kill these unnecessary checks.
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize
@ 2017-05-24 3:51 ` Herbert Xu
0 siblings, 0 replies; 34+ messages in thread
From: Herbert Xu @ 2017-05-24 3:51 UTC (permalink / raw
To: Tudor Ambarus; +Cc: davem, dhowells, linux-crypto, keyrings, Nicolas.Ferre
On Tue, May 23, 2017 at 12:18:23PM +0300, Tudor Ambarus wrote:
>
> As of now, this call is reached only after a successful setkey.
> If some user call it before setkey we will end up in a NULL dereference.
> I tend to keep the error checking.
I fail to see how this could be an issue in testmgr.
Please just kill these unnecessary checks.
Thanks,
--
Email: Herbert Xu <herbert@gondor.apana.org.au>
Home Page: http://gondor.apana.org.au/~herbert/
PGP Key: http://gondor.apana.org.au/~herbert/pubkey.txt
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 10/11] crypto: KEYS: check err on akcipher maxsize
2017-05-17 15:00 ` Tudor Ambarus
@ 2017-05-24 12:49 ` David Howells
-1 siblings, 0 replies; 34+ messages in thread
From: David Howells @ 2017-05-24 12:49 UTC (permalink / raw
To: Tudor Ambarus
Cc: dhowells, herbert, davem, linux-crypto, keyrings, Nicolas.Ferre
Tudor Ambarus <tudor.ambarus@microchip.com> wrote:
> crypto_akcipher_maxsize() returns minimum length for output buffer
> or error code if key hasn't been set.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: David Howells <dhowells@redhat.com>
^ permalink raw reply [flat|nested] 34+ messages in thread
* Re: [PATCH v2 10/11] crypto: KEYS: check err on akcipher maxsize
@ 2017-05-24 12:49 ` David Howells
0 siblings, 0 replies; 34+ messages in thread
From: David Howells @ 2017-05-24 12:49 UTC (permalink / raw
To: Tudor Ambarus
Cc: dhowells, herbert, davem, linux-crypto, keyrings, Nicolas.Ferre
Tudor Ambarus <tudor.ambarus@microchip.com> wrote:
> crypto_akcipher_maxsize() returns minimum length for output buffer
> or error code if key hasn't been set.
>
> Signed-off-by: Tudor Ambarus <tudor.ambarus@microchip.com>
Reviewed-by: David Howells <dhowells@redhat.com>
^ permalink raw reply [flat|nested] 34+ messages in thread
end of thread, other threads:[~2017-05-24 12:49 UTC | newest]
Thread overview: 34+ messages (download: mbox.gz follow: Atom feed
-- links below jump to the message on this page --
2017-05-17 15:00 [PATCH v2 00/11] fixes for ecc, ec(dh), rsa & testmgr Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 01/11] crypto: kpp, (ec)dh - fix typos Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 02/11] crypto: ecc - remove unused function arguments Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 03/11] crypto: ecc - remove unnecessary casts Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 04/11] crypto: dh - fix dh_max_size Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-23 4:07 ` Herbert Xu
2017-05-23 4:07 ` Herbert Xu
2017-05-17 15:00 ` [PATCH v2 05/11] crypto: ecdh - fix ecdh_max_size Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 06/11] crypto: ecc - don't be selfish on pubkeys Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 07/11] crypto: dh - fix memleak in setkey Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 08/11] crypto: testmgr - check err on akcipher maxsize Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-23 4:08 ` Herbert Xu
2017-05-23 4:08 ` Herbert Xu
2017-05-23 9:18 ` Tudor Ambarus
2017-05-23 9:18 ` Tudor Ambarus
2017-05-24 3:51 ` Herbert Xu
2017-05-24 3:51 ` Herbert Xu
2017-05-17 15:00 ` [PATCH v2 09/11] crypto: testmgr - check err on kpp maxsize Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 10/11] crypto: KEYS: check err on akcipher maxsize Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-17 15:00 ` [PATCH v2 11/11] crypto: rsa - do checks before allocating data Tudor Ambarus
2017-05-17 15:00 ` Tudor Ambarus
2017-05-24 12:49 ` [PATCH v2 10/11] crypto: KEYS: check err on akcipher maxsize David Howells
2017-05-24 12:49 ` David Howells
This is an external index of several public inboxes,
see mirroring instructions on how to clone and mirror
all data and code used by this external index.