From 003b096d346b6c20d43d1127413d2db4b66e5b6e Mon Sep 17 00:00:00 2001 From: Laurent Bercot Date: Fri, 12 Aug 2022 01:52:05 +0000 Subject: sbearssl_sni_policy_vtable: use the COPY macro for ec as well Signed-off-by: Laurent Bercot --- src/sbearssl/sbearssl_sni_policy_vtable.c | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'src/sbearssl') diff --git a/src/sbearssl/sbearssl_sni_policy_vtable.c b/src/sbearssl/sbearssl_sni_policy_vtable.c index a1d878a..9e68550 100644 --- a/src/sbearssl/sbearssl_sni_policy_vtable.c +++ b/src/sbearssl/sbearssl_sni_policy_vtable.c @@ -15,7 +15,7 @@ #define INSTANCE(c) ((sbearssl_sni_policy_context *)(c)) -#define COPY(x) do { k->data.rsa.x##len = l->data.rsa.x##len ; k->data.rsa.x = (unsigned char *)s + m ; memcpy(s + m, t + l->data.rsa.x, l->data.rsa.x##len) ; m += l->data.rsa.x##len ; } while (0) +#define COPY(kt, x) do { k->data.kt.x##len = l->data.kt.x##len ; k->data.kt.x = (unsigned char *)s + m ; memcpy(s + m, t + l->data.kt.x, l->data.kt.x##len) ; m += l->data.kt.x##len ; } while (0) static inline size_t skey_copy (br_skey *k, sbearssl_skey const *l, char *s, char const *t) { @@ -25,11 +25,11 @@ static inline size_t skey_copy (br_skey *k, sbearssl_skey const *l, char *s, cha { case BR_KEYTYPE_RSA : k->data.rsa.n_bitlen = l->data.rsa.n_bitlen ; - COPY(p) ; COPY(q) ; COPY(dp) ; COPY(dq) ; COPY(iq) ; + COPY(rsa, p) ; COPY(rsa, q) ; COPY(rsa, dp) ; COPY(rsa, dq) ; COPY(rsa, iq) ; break ; case BR_KEYTYPE_EC : k->data.ec.curve = l->data.ec.curve ; - k->data.ec.xlen = l->data.ec.xlen ; k->data.ec.x = (unsigned char *)s + m ; memcpy(s + m, t + l->data.ec.x, l->data.ec.xlen) ; m += l->data.ec.xlen ; + COPY(ec, x) ; break ; } return m ; -- cgit v1.2.3