Skip to content

Commit

Permalink
csrypto: ccp - Expand RSA support for a v5 ccp
Browse files Browse the repository at this point in the history
A version 5 CCP can handle an RSA modulus up to 16k bits.

Signed-off-by: Gary R Hook <gary.hook@amd.com>
Signed-off-by: Herbert Xu <herbert@gondor.apana.org.au>
  • Loading branch information
Gary R Hook authored and Herbert Xu committed Jul 28, 2017
1 parent ceeec0a commit e28c190
Show file tree
Hide file tree
Showing 7 changed files with 12 additions and 2 deletions.
5 changes: 4 additions & 1 deletion drivers/crypto/ccp/ccp-crypto-rsa.c
Original file line number Diff line number Diff line change
Expand Up @@ -60,7 +60,10 @@ static int ccp_rsa_complete(struct crypto_async_request *async_req, int ret)

static unsigned int ccp_rsa_maxsize(struct crypto_akcipher *tfm)
{
return CCP_RSA_MAXMOD;
if (ccp_version() > CCP_VERSION(3, 0))
return CCP5_RSA_MAXMOD;
else
return CCP_RSA_MAXMOD;
}

static int ccp_rsa_crypt(struct akcipher_request *req, bool encrypt)
Expand Down
1 change: 1 addition & 0 deletions drivers/crypto/ccp/ccp-crypto.h
Original file line number Diff line number Diff line change
Expand Up @@ -255,6 +255,7 @@ struct ccp_rsa_req_ctx {
};

#define CCP_RSA_MAXMOD (4 * 1024 / 8)
#define CCP5_RSA_MAXMOD (16 * 1024 / 8)

/***** Common Context Structure *****/
struct ccp_ctx {
Expand Down
1 change: 1 addition & 0 deletions drivers/crypto/ccp/ccp-dev-v3.c
Original file line number Diff line number Diff line change
Expand Up @@ -597,4 +597,5 @@ const struct ccp_vdata ccpv3 = {
.setup = NULL,
.perform = &ccp3_actions,
.offset = 0x20000,
.rsamax = CCP_RSA_MAX_WIDTH,
};
2 changes: 2 additions & 0 deletions drivers/crypto/ccp/ccp-dev-v5.c
Original file line number Diff line number Diff line change
Expand Up @@ -1112,6 +1112,7 @@ const struct ccp_vdata ccpv5a = {
.setup = ccp5_config,
.perform = &ccp5_actions,
.offset = 0x0,
.rsamax = CCP5_RSA_MAX_WIDTH,
};

const struct ccp_vdata ccpv5b = {
Expand All @@ -1120,4 +1121,5 @@ const struct ccp_vdata ccpv5b = {
.setup = ccp5other_config,
.perform = &ccp5_actions,
.offset = 0x0,
.rsamax = CCP5_RSA_MAX_WIDTH,
};
1 change: 1 addition & 0 deletions drivers/crypto/ccp/ccp-dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -202,6 +202,7 @@
#define CCP_SHA_SB_COUNT 1

#define CCP_RSA_MAX_WIDTH 4096
#define CCP5_RSA_MAX_WIDTH 16384

#define CCP_PASSTHRU_BLOCKSIZE 256
#define CCP_PASSTHRU_MASKSIZE 32
Expand Down
3 changes: 2 additions & 1 deletion drivers/crypto/ccp/ccp-ops.c
Original file line number Diff line number Diff line change
Expand Up @@ -1736,7 +1736,8 @@ static int ccp_run_rsa_cmd(struct ccp_cmd_queue *cmd_q, struct ccp_cmd *cmd)
unsigned int sb_count, i_len, o_len;
int ret;

if (rsa->key_size > CCP_RSA_MAX_WIDTH)
/* Check against the maximum allowable size, in bits */
if (rsa->key_size > cmd_q->ccp->vdata->rsamax)
return -EINVAL;

if (!rsa->exp || !rsa->mod || !rsa->src || !rsa->dst)
Expand Down
1 change: 1 addition & 0 deletions drivers/crypto/ccp/sp-dev.h
Original file line number Diff line number Diff line change
Expand Up @@ -40,6 +40,7 @@ struct ccp_vdata {
void (*setup)(struct ccp_device *);
const struct ccp_actions *perform;
const unsigned int offset;
const unsigned int rsamax;
};
/* Structure to hold SP device data */
struct sp_dev_vdata {
Expand Down

0 comments on commit e28c190

Please sign in to comment.