diff options
| author | Laurent Bercot <ska-skaware@skarnet.org> | 2021-05-27 18:29:19 +0000 |
|---|---|---|
| committer | Laurent Bercot <ska-skaware@skarnet.org> | 2021-05-27 18:29:19 +0000 |
| commit | aabd183903bdf16952770fd130e94c29956e09aa (patch) | |
| tree | 433b5dd33bf8b9c8a8ef8fcf0ce86d77b4dcf7af | |
| parent | 807d1979262068c0679c4533eb23952f449ded61 (diff) | |
| download | s6-networking-aabd183903bdf16952770fd130e94c29956e09aa.tar.xz | |
Remove backtraces; add verification impls to server engines
| -rw-r--r-- | src/sbearssl/sbearssl_server_init_and_run.c | 2 | ||||
| -rw-r--r-- | src/sbearssl/sbearssl_x509_small_vtable.c | 9 |
2 files changed, 2 insertions, 9 deletions
diff --git a/src/sbearssl/sbearssl_server_init_and_run.c b/src/sbearssl/sbearssl_server_init_and_run.c index 56943bf..3182707 100644 --- a/src/sbearssl/sbearssl_server_init_and_run.c +++ b/src/sbearssl/sbearssl_server_init_and_run.c @@ -81,6 +81,8 @@ void sbearssl_server_init_and_run (int *fds, tain_t const *tto, uint32_t preopti if (!sbearssl_x509_small_set_tain(&xc, &STAMP)) strerr_diefu1sys(111, "initialize validation time") ; br_ssl_engine_set_x509(&sc.eng, &xc.vtable) ; + br_ssl_engine_set_default_rsavrfy(&sc.eng) ; + br_ssl_engine_set_default_ecdsa(&sc.eng) ; br_ssl_server_set_trust_anchor_names_alt(&sc, btas, n) ; cbarg->exportmask |= 3 ; } diff --git a/src/sbearssl/sbearssl_x509_small_vtable.c b/src/sbearssl/sbearssl_x509_small_vtable.c index 8fc7f46..d9ca46c 100644 --- a/src/sbearssl/sbearssl_x509_small_vtable.c +++ b/src/sbearssl/sbearssl_x509_small_vtable.c @@ -1,12 +1,5 @@ /* ISC license. */ -#ifdef DEBUG -#include <execinfo.h> -#define getbt() do { void *stack[512] ; int r = backtrace(stack, 512) ; backtrace_symbols_fd(stack, r, 2) ; } while (0) -#else -#define getbt() -#endif - #include <bearssl.h> #include <skalibs/lolstdio.h> @@ -31,7 +24,6 @@ static void start_cert (br_x509_class const **c, uint32_t len) if (!ctx->i) br_sha256_init(&ctx->hashctx) ; LOLDEBUG("small_context: start_cert %u", ctx->i) ; - getbt() ; } static void append (br_x509_class const **c, unsigned char const *s, size_t len) @@ -76,7 +68,6 @@ static br_x509_pkey const *get_pkey(br_x509_class const *const *c, unsigned int { sbearssl_x509_small_context *ctx = INSTANCE(c) ; LOLDEBUG("small_context: get_pkey") ; - getbt() ; return ctx->minimal.vtable->get_pkey(&ctx->minimal.vtable, usages) ; } |