Skip to content

Commit 557cb62

Browse files
karel-msjaeckel
authored andcommitted
RSA: use consistently ltc_rsa_op_checked (+ cosmetic renaming op_check >> op_checked)
1 parent c1b3281 commit 557cb62

3 files changed

Lines changed: 8 additions & 8 deletions

File tree

src/headers/tomcrypt_private.h

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -469,7 +469,7 @@ typedef enum ltc_rsa_op {
469469
LTC_PKCS1_VERIFY = LTC_RSA_OP_PKCS1 | LTC_RSA_VERIFY,
470470
} ltc_rsa_op;
471471

472-
typedef struct ltc_rsa_op_check {
472+
typedef struct ltc_rsa_op_checked {
473473
const rsa_key *key;
474474
ltc_rsa_op_parameters *params;
475475
int hash_alg, mgf1_hash_alg;

src/pk/rsa/rsa_sign_hash.c

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -25,14 +25,14 @@ int rsa_sign_hash_v2(const unsigned char *hash, unsigned long hashlen,
2525
{
2626
unsigned long modulus_bitlen, modulus_bytelen, x, y;
2727
int err;
28-
ltc_rsa_op_checked op_check = ltc_rsa_op_checked_init(key, params);
28+
ltc_rsa_op_checked op_checked = ltc_rsa_op_checked_init(key, params);
2929

3030
LTC_ARGCHK(hash != NULL);
3131
LTC_ARGCHK(sig != NULL);
3232
LTC_ARGCHK(siglen != NULL);
3333
LTC_ARGCHK(key != NULL);
3434

35-
if ((err = rsa_key_valid_op(LTC_RSA_SIGN, &op_check)) != CRYPT_OK) {
35+
if ((err = rsa_key_valid_op(LTC_RSA_SIGN, &op_checked)) != CRYPT_OK) {
3636
return err;
3737
}
3838

@@ -68,7 +68,7 @@ int rsa_sign_hash_v2(const unsigned char *hash, unsigned long hashlen,
6868
hash OCTET STRING
6969
}
7070
*/
71-
LTC_SET_ASN1(digestinfo, 0, LTC_ASN1_OBJECT_IDENTIFIER, hash_descriptor[op_check.hash_alg].OID, hash_descriptor[op_check.hash_alg].OIDlen);
71+
LTC_SET_ASN1(digestinfo, 0, LTC_ASN1_OBJECT_IDENTIFIER, hash_descriptor[op_checked.hash_alg].OID, hash_descriptor[op_checked.hash_alg].OIDlen);
7272
LTC_SET_ASN1(digestinfo, 1, LTC_ASN1_NULL, NULL, 0);
7373
LTC_SET_ASN1(siginfo, 0, LTC_ASN1_SEQUENCE, digestinfo, 2);
7474
LTC_SET_ASN1(siginfo, 1, LTC_ASN1_OCTET_STRING, hash, hashlen);

src/pk/rsa/rsa_verify_hash.c

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ int rsa_verify_hash_v2(const unsigned char *sig, unsigned long siglen,
2929
unsigned long modulus_bitlen, modulus_bytelen, x;
3030
int err;
3131
unsigned char *tmpbuf;
32-
ltc_rsa_op_checked op_check = ltc_rsa_op_checked_init(key, params);
32+
ltc_rsa_op_checked op_checked = ltc_rsa_op_checked_init(key, params);
3333

3434
LTC_ARGCHK(hash != NULL);
3535
LTC_ARGCHK(sig != NULL);
@@ -39,7 +39,7 @@ int rsa_verify_hash_v2(const unsigned char *sig, unsigned long siglen,
3939
/* default to invalid */
4040
*stat = 0;
4141

42-
if ((err = rsa_key_valid_op(LTC_RSA_VERIFY, &op_check)) != CRYPT_OK) {
42+
if ((err = rsa_key_valid_op(LTC_RSA_VERIFY, &op_checked)) != CRYPT_OK) {
4343
return err;
4444
}
4545

@@ -131,8 +131,8 @@ int rsa_verify_hash_v2(const unsigned char *sig, unsigned long siglen,
131131

132132
/* test OID */
133133
if ((reallen == outlen) &&
134-
(digestinfo[0].size == hash_descriptor[op_check.hash_alg].OIDlen) &&
135-
(XMEMCMP(digestinfo[0].data, hash_descriptor[op_check.hash_alg].OID, sizeof(unsigned long) * hash_descriptor[op_check.hash_alg].OIDlen) == 0) &&
134+
(digestinfo[0].size == hash_descriptor[op_checked.hash_alg].OIDlen) &&
135+
(XMEMCMP(digestinfo[0].data, hash_descriptor[op_checked.hash_alg].OID, sizeof(unsigned long) * hash_descriptor[op_checked.hash_alg].OIDlen) == 0) &&
136136
(siginfo[1].size == hashlen) &&
137137
(XMEMCMP(siginfo[1].data, hash, hashlen) == 0)) {
138138
*stat = 1;

0 commit comments

Comments
 (0)