From 5355a1fb140fcb8e5836ba90ed87ccb85d76f40b Mon Sep 17 00:00:00 2001 From: Ian Jackson Date: Tue, 1 Oct 2019 13:12:40 +0100 Subject: [PATCH] alg_msg_data: Remove "sig" from member names We are going to want to use this for other algorithms too. Suggested-by: Mark Wooding Signed-off-by: Ian Jackson --- rsa.c | 14 +++++++------- secnet.h | 4 ++-- 2 files changed, 9 insertions(+), 9 deletions(-) diff --git a/rsa.c b/rsa.c index ccfc556..28a4c1b 100644 --- a/rsa.c +++ b/rsa.c @@ -217,9 +217,9 @@ static bool_t rsa_sig_unpick(void *sst, struct buffer_if *msg, { uint8_t *lp = buf_unprepend(msg, 2); if (!lp) return False; - sig->siglen = get_uint16(lp); - sig->sigstart = buf_unprepend(msg, sig->siglen); - if (!sig->sigstart) return False; + sig->len = get_uint16(lp); + sig->start = buf_unprepend(msg, sig->len); + if (!sig->start) return False; /* In `rsa_sig_check' below, we assume that we can write a nul * terminator following the signature. Make sure there's enough space. @@ -246,10 +246,10 @@ static bool_t rsa_sig_check(void *sst, uint8_t *data, int32_t datalen, emsa_pkcs1(&st->n, &a, st->common.hashbuf, st->common.hashi->hlen); /* Terminate signature with a '0' - already checked that this will fit */ - int save = sig->sigstart[sig->siglen]; - sig->sigstart[sig->siglen] = 0; - mpz_set_str(&b, sig->sigstart, 16); - sig->sigstart[sig->siglen] = save; + int save = sig->start[sig->len]; + sig->start[sig->len] = 0; + mpz_set_str(&b, sig->start, 16); + sig->start[sig->len] = save; mpz_powm(&c, &b, &st->e, &st->n); diff --git a/secnet.h b/secnet.h index c6e8f49..eb8bf0c 100644 --- a/secnet.h +++ b/secnet.h @@ -379,8 +379,8 @@ extern init_module log_module; struct buffer_if; struct alg_msg_data { - uint8_t *sigstart; - int32_t siglen; + uint8_t *start; + int32_t len; }; /* PURE closure requires no interface */ -- 2.30.2