summaryrefslogtreecommitdiff
path: root/src
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-11-19 15:41:40 +0000
committerLaurent Bercot <ska@appnovation.com>2021-11-19 15:41:40 +0000
commit9549e0518dc38697b5035adbe890644950535e18 (patch)
tree24314c51a057b27474595cd03f24d1ebff2a793d /src
parent46e49260b35a2a39bbb92f44ceb598ab2db94d6a (diff)
downloads6-networking-9549e0518dc38697b5035adbe890644950535e18.tar.xz
Add sbearssl_*_set_tain(n)_g convenience macros
Signed-off-by: Laurent Bercot <ska@appnovation.com>
Diffstat (limited to 'src')
-rw-r--r--src/include/s6-networking/sbearssl.h4
-rw-r--r--src/sbearssl/sbearssl_client_init_and_run.c2
-rw-r--r--src/sbearssl/sbearssl_server_init_and_run.c2
3 files changed, 6 insertions, 2 deletions
diff --git a/src/include/s6-networking/sbearssl.h b/src/include/s6-networking/sbearssl.h
index 4e4dca6..2d46261 100644
--- a/src/include/s6-networking/sbearssl.h
+++ b/src/include/s6-networking/sbearssl.h
@@ -61,8 +61,12 @@ struct sbearssl_x509_small_context_s
extern int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *, tai const *) ;
#define sbearssl_x509_minimal_set_tain(ctx, a) sbearssl_x509_minimal_set_tai(ctx, tain_secp(a))
+#define sbearssl_x509_minimal_set_tai_g(ctx) sbearssl_x509_minimal_set_tain((ctx), &STAMP)
+#define sbearssl_x509_minimal_set_tain_g(ctx) sbearssl_x509_minimal_set_tain((ctx), &STAMP)
#define sbearssl_x509_small_set_tai(ctx, t) sbearssl_x509_minimal_set_tai(&(ctx)->minimal, t)
#define sbearssl_x509_small_set_tain(ctx, a) sbearssl_x509_small_set_tai(ctx, tain_secp(a))
+#define sbearssl_x509_small_set_tai_g(ctx) sbearssl_x509_small_set_tain((ctx), &STAMP)
+#define sbearssl_x509_small_set_tain_g(ctx) sbearssl_x509_small_set_tain((ctx), &STAMP)
extern br_x509_class const sbearssl_x509_small_vtable ;
extern void sbearssl_x509_small_init_full (sbearssl_x509_small_context *, br_x509_trust_anchor *, size_t, sbearssl_dn *, uint8_t *, char *) ;
diff --git a/src/sbearssl/sbearssl_client_init_and_run.c b/src/sbearssl/sbearssl_client_init_and_run.c
index e32f146..a7d91e4 100644
--- a/src/sbearssl/sbearssl_client_init_and_run.c
+++ b/src/sbearssl/sbearssl_client_init_and_run.c
@@ -45,7 +45,7 @@ void sbearssl_client_init_and_run (int *fds, tain const *tto, uint32_t preoption
br_ssl_client_init_full(&cc, &dummy, btas, n) ;
}
sbearssl_x509_small_init_full(&xc, btas, n, &cbarg->eedn, &cbarg->eltstatus, cbarg->eehash) ;
- if (!sbearssl_x509_small_set_tain(&xc, &STAMP))
+ if (!sbearssl_x509_small_set_tain_g(&xc))
strerr_diefu1sys(111, "initialize validation time") ;
br_ssl_engine_set_x509(&cc.eng, &xc.vtable) ;
cbarg->exportmask |= 3 ;
diff --git a/src/sbearssl/sbearssl_server_init_and_run.c b/src/sbearssl/sbearssl_server_init_and_run.c
index be12c66..984e54e 100644
--- a/src/sbearssl/sbearssl_server_init_and_run.c
+++ b/src/sbearssl/sbearssl_server_init_and_run.c
@@ -99,7 +99,7 @@ void sbearssl_server_init_and_run (int *fds, tain const *tto, uint32_t preoption
sbearssl_ta_to(genalloc_s(sbearssl_ta, &tas) + i, btas + i, tastorage.s) ;
genalloc_free(sbearssl_ta, &tas) ;
sbearssl_x509_small_init_full(&xc, btas, n, &cbarg->eedn, &cbarg->eltstatus, cbarg->eehash) ;
- if (!sbearssl_x509_small_set_tain(&xc, &STAMP))
+ if (!sbearssl_x509_small_set_tain_g(&xc))
strerr_diefu1sys(111, "initialize validation time") ;
br_ssl_engine_set_default_rsavrfy(&sc.eng) ;
br_ssl_engine_set_default_ecdsa(&sc.eng) ;