oysteikt/heimdal
0
0
Fork 0
Code Issues 5 Pull Requests Releases Activity

hcrypto: Fix more warnings (rsa-ltm)

Browse Source
This commit is contained in:
Nicolas Williams
2020-04-27 17:56:53 -05:00
parent 0d3682e6a8
commit 001cf39374
1 changed files with 12 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

23
lib/hcrypto/rsa-ltm.c
View File

@@ -166,7 +166,7 @@ static int
ltm_rsa_public_encrypt(int flen, const unsigned char* from, ltm_rsa_public_encrypt(int flen, const unsigned char* from,
unsigned char* to, RSA* rsa, int padding) unsigned char* to, RSA* rsa, int padding)
{ {
unsigned char *p, *p0 = NULL; unsigned char *p = NULL, *p0 = NULL;
size_t size, ssize, padlen; size_t size, ssize, padlen;
mp_int enc, dec, n, e; mp_int enc, dec, n, e;
mp_err ret; mp_err ret;
@@ -186,18 +186,19 @@ ltm_rsa_public_encrypt(int flen, const unsigned char* from,
THEN_IF_MP((mp_cmp_d(&e, 3) == MP_LT), MP_ERR); THEN_IF_MP((mp_cmp_d(&e, 3) == MP_LT), MP_ERR);
THEN_ALLOC((p = p0 = malloc(size - 1))); THEN_ALLOC((p = p0 = malloc(size - 1)));
padlen = size - flen - 3; if (ret == MP_OKAY) {
*p++ = 2; padlen = size - flen - 3;
*p++ = 2;
}
THEN_IF_MP((RAND_bytes(p, padlen) != 1), MP_ERR); THEN_IF_MP((RAND_bytes(p, padlen) != 1), MP_ERR);
while(padlen) {
if (*p == 0)
*p = 1;
padlen--;
p++;
}
if (ret == MP_OKAY) { if (ret == MP_OKAY) {
while (padlen) {
if (*p == 0)
*p = 1;
padlen--;
p++;
}
*p++ = 0; *p++ = 0;
memcpy(p, from, flen); memcpy(p, from, flen);
p += flen; p += flen;
@@ -471,7 +472,7 @@ enum gen_pq_type { GEN_P, GEN_Q };
static int static int
gen_p(int bits, enum gen_pq_type pq_type, uint8_t nibble_pair, mp_int *p, mp_int *e, BN_GENCB *cb) gen_p(int bits, enum gen_pq_type pq_type, uint8_t nibble_pair, mp_int *p, mp_int *e, BN_GENCB *cb)
{ {
unsigned char *buf; unsigned char *buf = NULL;
mp_bool res; mp_bool res;
mp_err ret = MP_MEM; mp_err ret = MP_MEM;
mp_int t1, t2; mp_int t1, t2;