Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Fix CAAM RSA inconsistent fails #3661

Merged
merged 3 commits into from
Mar 11, 2020
Merged

Fix CAAM RSA inconsistent fails #3661

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
1ab8f95
drivers: caam: fix RSA key format number 3
clementfaure Mar 6, 2020
4dc53d8
core: driver: fix RSA encoded message length computation
clementfaure Mar 6, 2020
25a89e2
drivers: caam: add descriptive defines for RSA key formats
clementfaure Mar 6, 2020
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
40 changes: 22 additions & 18 deletions core/drivers/crypto/caam/acipher/caam_rsa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -73,6 +73,10 @@ struct caam_rsa_keypair {
struct caambuf qp; /* Private [qp = 1/q mod p] */
};

#define RSA_PRIVATE_KEY_FORMAT_1 1
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

I can see why we didn't have these before, since the name of the key format happens to be a number. It's still an improvement though.

Copy link
Contributor Author

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

It helps with readability at least.
Tag applied!

#define RSA_PRIVATE_KEY_FORMAT_2 2
#define RSA_PRIVATE_KEY_FORMAT_3 3

/* CAAM Era version */
static uint8_t caam_era;

Expand All @@ -87,12 +91,12 @@ static void do_keypair_free(struct caam_rsa_keypair *key)
caam_free_buf(&key->n);
caam_free_buf(&key->d);

if (key->format > 1 && key->p.data) {
if (key->format > RSA_PRIVATE_KEY_FORMAT_1 && key->p.data) {
key->p.length += key->q.length;
caam_free_buf(&key->p);
}

if (key->format > 2 && key->dp.data) {
if (key->format > RSA_PRIVATE_KEY_FORMAT_2 && key->dp.data) {
key->dp.length += key->dq.length + key->qp.length;
caam_free_buf(&key->dp);
}
Expand Down Expand Up @@ -222,7 +226,7 @@ static enum caam_status do_keypair_conv_f3(struct caam_rsa_keypair *outkey,
outkey->dp.length + outkey->dq.length +
outkey->qp.length);

outkey->format = 2;
outkey->format = RSA_PRIVATE_KEY_FORMAT_3;

return CAAM_NO_ERROR;
}
Expand Down Expand Up @@ -270,9 +274,9 @@ static enum caam_status do_keypair_conv_f2(struct caam_rsa_keypair *outkey,
/* Push fields value to the physical memory */
cache_operation(TEE_CACHECLEAN, outkey->p.data, size_p + size_q);

outkey->format = 2;
outkey->format = RSA_PRIVATE_KEY_FORMAT_2;

if (CFG_NXP_CAAM_RSA_KEY_FORMAT > 2) {
if (CFG_NXP_CAAM_RSA_KEY_FORMAT > RSA_PRIVATE_KEY_FORMAT_2) {
retstatus = do_keypair_conv_f3(outkey, inkey);
RSA_TRACE("do_keypair_conv_f3 returned 0x%" PRIx32, retstatus);
}
Expand Down Expand Up @@ -313,9 +317,9 @@ static enum caam_status do_keypair_conv(struct caam_rsa_keypair *outkey,
crypto_bignum_bn2bin(inkey->d, outkey->d.data);
cache_operation(TEE_CACHECLEAN, outkey->d.data, outkey->d.length);

outkey->format = 1;
outkey->format = RSA_PRIVATE_KEY_FORMAT_1;

if (CFG_NXP_CAAM_RSA_KEY_FORMAT > 1) {
if (CFG_NXP_CAAM_RSA_KEY_FORMAT > RSA_PRIVATE_KEY_FORMAT_1) {
retstatus = do_keypair_conv_f2(outkey, inkey);
RSA_TRACE("do_keypair_conv_f2 returned 0x%" PRIx32, retstatus);
}
Expand Down Expand Up @@ -490,7 +494,7 @@ static TEE_Result gen_keypair_get_f2(struct rsa_keypair *key,

ret = crypto_bignum_bin2bn(genkey->q.data, genkey->q.length, key->q);

if (ret == TEE_SUCCESS && genkey->format > 2)
if (ret == TEE_SUCCESS && genkey->format > RSA_PRIVATE_KEY_FORMAT_2)
ret = gen_keypair_get_f3(key, genkey);

return ret;
Expand Down Expand Up @@ -565,7 +569,7 @@ static TEE_Result do_gen_keypair(struct rsa_keypair *key, size_t key_size)
genkey.n.length = size_n;
genkey.n.paddr = genkey.d.paddr + size_d;

if (genkey.format > 2) {
if (genkey.format > RSA_PRIVATE_KEY_FORMAT_2) {
/* Allocate dp, dq and qp in one buffer */
retstatus = caam_calloc_align_buf(&genkey.dp,
((key_size / 8) / 2) * 3);
Expand Down Expand Up @@ -616,7 +620,7 @@ static TEE_Result do_gen_keypair(struct rsa_keypair *key, size_t key_size)
caam_desc_add_ptr(desc, genkey.d.paddr + sizeof(uint32_t));
caam_desc_add_ptr(desc, genkey.d.paddr);

if (genkey.format > 2) {
if (genkey.format > RSA_PRIVATE_KEY_FORMAT_2) {
caam_desc_add_ptr(desc, genkey.dp.paddr);
caam_desc_add_ptr(desc, genkey.dq.paddr);
caam_desc_add_ptr(desc, genkey.qp.paddr);
Expand Down Expand Up @@ -664,7 +668,7 @@ static TEE_Result do_gen_keypair(struct rsa_keypair *key, size_t key_size)
if (ret != TEE_SUCCESS)
goto exit_gen_keypair;

if (genkey.format > 1)
if (genkey.format > RSA_PRIVATE_KEY_FORMAT_1)
ret = gen_keypair_get_f2(key, &genkey);
} else {
RSA_TRACE("CAAM Status 0x%08" PRIx32, jobctx.status);
Expand Down Expand Up @@ -1394,17 +1398,17 @@ static TEE_Result do_caam_decrypt(struct drvcrypt_rsa_ed *rsa_data,

/* Allocate the job descriptor function of the Private key format */
switch (key.format) {
case 1:
case RSA_PRIVATE_KEY_FORMAT_1:
desc = caam_calloc_desc(MAX_DESC_DEC_1);
if (!desc) {
ret = TEE_ERROR_OUT_OF_MEMORY;
goto exit_decrypt;
}
break;

case 2:
case 3:
if (key.format == 2)
case RSA_PRIVATE_KEY_FORMAT_2:
case RSA_PRIVATE_KEY_FORMAT_3:
if (key.format == RSA_PRIVATE_KEY_FORMAT_2)
desc = caam_calloc_desc(MAX_DESC_DEC_2);
else
desc = caam_calloc_desc(MAX_DESC_DEC_3);
Expand Down Expand Up @@ -1434,7 +1438,7 @@ static TEE_Result do_caam_decrypt(struct drvcrypt_rsa_ed *rsa_data,

/* Build the descriptor function of the Private Key format */
switch (key.format) {
case 1:
case RSA_PRIVATE_KEY_FORMAT_1:
caam_desc_add_word(desc,
PDB_RSA_DEC_D_SIZE(key.d.length) |
PDB_RSA_DEC_N_SIZE(key.n.length) |
Expand All @@ -1446,7 +1450,7 @@ static TEE_Result do_caam_decrypt(struct drvcrypt_rsa_ed *rsa_data,

break;

case 2:
case RSA_PRIVATE_KEY_FORMAT_2:
caam_desc_add_word(desc,
PDB_RSA_DEC_D_SIZE(key.d.length) |
PDB_RSA_DEC_N_SIZE(key.n.length) |
Expand All @@ -1463,7 +1467,7 @@ static TEE_Result do_caam_decrypt(struct drvcrypt_rsa_ed *rsa_data,
PDB_RSA_DEC_P_SIZE(key.p.length));
break;

case 3:
case RSA_PRIVATE_KEY_FORMAT_3:
caam_desc_add_word(desc, PDB_RSA_DEC_N_SIZE(key.n.length) |
pdb_sgt_flags);
caam_desc_add_ptr(desc, paddr_cipher);
Expand Down
7 changes: 3 additions & 4 deletions core/drivers/crypto/crypto_api/acipher/rsassa.c
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -740,13 +740,14 @@ static TEE_Result rsassa_pss_sign(struct drvcrypt_rsa_ssa *ssa_data)
* EM Length = (modBits - 1) / 8
* if (modBits - 1) is not divisible by 8, one more byte is needed
*/
modBits--;
EM.length = ROUNDUP(modBits, 8) / 8;

EM.data = malloc(EM.length);
if (!EM.data)
return TEE_ERROR_OUT_OF_MEMORY;

CRYPTO_TRACE("modBits = %zu, hence EM Length = %zu", modBits,
CRYPTO_TRACE("modBits = %zu, hence EM Length = %zu", modBits + 1,
EM.length);

/* Encode the Message */
Expand Down Expand Up @@ -811,9 +812,7 @@ static TEE_Result rsassa_pss_verify(struct drvcrypt_rsa_ssa *ssa_data)
* if (modBits - 1) is not divisible by 8, one more byte is needed
*/
modBits--;
EM.length = modBits / 8;
if (modBits % 8)
EM.length++;
EM.length = ROUNDUP(modBits, 8) / 8;

EM.data = malloc(EM.length);
if (!EM.data)
Expand Down