Skip to content

Commit 7d3e6b7

Browse files
levittesjaeckel
authored andcommitted
Remove unnecessary casts in the RSA implementation
1 parent e950699 commit 7d3e6b7

File tree

4 files changed

+16
-14
lines changed

4 files changed

+16
-14
lines changed

src/pk/rsa/rsa_exptmod.c

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -53,7 +53,7 @@ int rsa_exptmod(const unsigned char *in, unsigned long inlen,
5353
#endif /* LTC_RSA_BLINDING */
5454
NULL)) != CRYPT_OK)
5555
{ return err; }
56-
if ((err = mp_read_unsigned_bin(tmp, (unsigned char *)in, (int)inlen)) != CRYPT_OK)
56+
if ((err = mp_read_unsigned_bin(tmp, in, (int)inlen)) != CRYPT_OK)
5757
{ goto error; }
5858

5959

@@ -130,7 +130,7 @@ int rsa_exptmod(const unsigned char *in, unsigned long inlen,
130130
#ifdef LTC_RSA_CRT_HARDENING
131131
if (has_crt_parameters) {
132132
if ((err = mp_exptmod(tmp, key->e, key->N, tmpa)) != CRYPT_OK) { goto error; }
133-
if ((err = mp_read_unsigned_bin(tmpb, (unsigned char *)in, (int)inlen)) != CRYPT_OK) { goto error; }
133+
if ((err = mp_read_unsigned_bin(tmpb, in, (int)inlen)) != CRYPT_OK) { goto error; }
134134
if (mp_cmp(tmpa, tmpb) != LTC_MP_EQ) { err = CRYPT_ERROR; goto error; }
135135
}
136136
#endif

src/pk/rsa/rsa_make_key.c

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -130,7 +130,7 @@ int rsa_make_key_ubin_e(prng_state *prng, int wprng, int size,
130130
return err;
131131
}
132132

133-
if ((err = mp_read_unsigned_bin(tmp_e, (unsigned char *)e, elen)) == CRYPT_OK)
133+
if ((err = mp_read_unsigned_bin(tmp_e, e, elen)) == CRYPT_OK)
134134
err = rsa_make_key_bn_e(prng, wprng, size, tmp_e, key);
135135

136136
mp_clear(tmp_e);

src/pk/rsa/rsa_set.c

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -31,10 +31,10 @@ int rsa_set_key(const unsigned char *N, unsigned long Nlen,
3131

3232
if ((err = rsa_init(key)) != CRYPT_OK) return err;
3333

34-
if ((err = mp_read_unsigned_bin(key->N , (unsigned char *)N , Nlen)) != CRYPT_OK) { goto LBL_ERR; }
35-
if ((err = mp_read_unsigned_bin(key->e , (unsigned char *)e , elen)) != CRYPT_OK) { goto LBL_ERR; }
34+
if ((err = mp_read_unsigned_bin(key->N , N , Nlen)) != CRYPT_OK) { goto LBL_ERR; }
35+
if ((err = mp_read_unsigned_bin(key->e , e , elen)) != CRYPT_OK) { goto LBL_ERR; }
3636
if (d && dlen) {
37-
if ((err = mp_read_unsigned_bin(key->d , (unsigned char *)d , dlen)) != CRYPT_OK) { goto LBL_ERR; }
37+
if ((err = mp_read_unsigned_bin(key->d , d , dlen)) != CRYPT_OK) { goto LBL_ERR; }
3838
key->type = PK_PRIVATE;
3939
}
4040
else {
@@ -72,8 +72,8 @@ int rsa_set_factors(const unsigned char *p, unsigned long plen,
7272

7373
if (key->type != PK_PRIVATE) return CRYPT_PK_TYPE_MISMATCH;
7474

75-
if ((err = mp_read_unsigned_bin(key->p , (unsigned char *)p , plen)) != CRYPT_OK) { goto LBL_ERR; }
76-
if ((err = mp_read_unsigned_bin(key->q , (unsigned char *)q , qlen)) != CRYPT_OK) { goto LBL_ERR; }
75+
if ((err = mp_read_unsigned_bin(key->p , p , plen)) != CRYPT_OK) { goto LBL_ERR; }
76+
if ((err = mp_read_unsigned_bin(key->q , q , qlen)) != CRYPT_OK) { goto LBL_ERR; }
7777
return CRYPT_OK;
7878

7979
LBL_ERR:
@@ -110,9 +110,9 @@ int rsa_set_crt_params(const unsigned char *dP, unsigned long dPlen,
110110

111111
if (key->type != PK_PRIVATE) return CRYPT_PK_TYPE_MISMATCH;
112112

113-
if ((err = mp_read_unsigned_bin(key->dP, (unsigned char *)dP, dPlen)) != CRYPT_OK) { goto LBL_ERR; }
114-
if ((err = mp_read_unsigned_bin(key->dQ, (unsigned char *)dQ, dQlen)) != CRYPT_OK) { goto LBL_ERR; }
115-
if ((err = mp_read_unsigned_bin(key->qP, (unsigned char *)qP, qPlen)) != CRYPT_OK) { goto LBL_ERR; }
113+
if ((err = mp_read_unsigned_bin(key->dP, dP, dPlen)) != CRYPT_OK) { goto LBL_ERR; }
114+
if ((err = mp_read_unsigned_bin(key->dQ, dQ, dQlen)) != CRYPT_OK) { goto LBL_ERR; }
115+
if ((err = mp_read_unsigned_bin(key->qP, qP, qPlen)) != CRYPT_OK) { goto LBL_ERR; }
116116
return CRYPT_OK;
117117

118118
LBL_ERR:

src/pk/rsa/rsa_sign_hash.c

Lines changed: 5 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -78,7 +78,8 @@ int rsa_sign_hash_ex(const unsigned char *in, unsigned long inlen,
7878
}
7979
} else {
8080
/* PKCS #1 v1.5 pad the hash */
81-
unsigned char *tmpin;
81+
unsigned char *tmpin = NULL;
82+
const unsigned char *tmpin_ro;
8283

8384
if (padding == LTC_PKCS_1_V1_5) {
8485
ltc_asn1_list digestinfo[2], siginfo[2];
@@ -111,14 +112,15 @@ int rsa_sign_hash_ex(const unsigned char *in, unsigned long inlen,
111112
XFREE(tmpin);
112113
return err;
113114
}
115+
tmpin_ro = tmpin;
114116
} else {
115117
/* set the pointer and data-length to the input values */
116-
tmpin = (unsigned char *)in;
118+
tmpin_ro = in;
117119
y = inlen;
118120
}
119121

120122
x = *outlen;
121-
err = pkcs_1_v1_5_encode(tmpin, y, LTC_PKCS_1_EMSA, modulus_bitlen, NULL, 0, out, &x);
123+
err = pkcs_1_v1_5_encode(tmpin_ro, y, LTC_PKCS_1_EMSA, modulus_bitlen, NULL, 0, out, &x);
122124

123125
if (padding == LTC_PKCS_1_V1_5) {
124126
XFREE(tmpin);

0 commit comments

Comments
 (0)