summaryrefslogtreecommitdiff
path: root/src/sbearssl
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2021-05-27 19:14:07 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2021-05-27 19:14:07 +0000
commitd5ce828c97505e429e0cc87b5e87da4f7d291ad4 (patch)
tree0b33ef9b78d448d5d6d0d09b9c28e45db65e1ce9 /src/sbearssl
parentaabd183903bdf16952770fd130e94c29956e09aa (diff)
downloads6-networking-d5ce828c97505e429e0cc87b5e87da4f7d291ad4.tar.xz
All good, remove debug instructions
Diffstat (limited to 'src/sbearssl')
-rw-r--r--src/sbearssl/sbearssl_run.c4
-rw-r--r--src/sbearssl/sbearssl_server_init_and_run.c3
-rw-r--r--src/sbearssl/sbearssl_x509_small_vtable.c14
3 files changed, 1 insertions, 20 deletions
diff --git a/src/sbearssl/sbearssl_run.c b/src/sbearssl/sbearssl_run.c
index c440060..5c6f633 100644
--- a/src/sbearssl/sbearssl_run.c
+++ b/src/sbearssl/sbearssl_run.c
@@ -11,8 +11,6 @@
#include <skalibs/iopause.h>
#include <skalibs/djbunix.h>
-#include <skalibs/lolstdio.h>
-
#include <s6-networking/sbearssl.h>
#include "sbearssl-internal.h"
@@ -29,7 +27,6 @@ void sbearssl_run (br_ssl_engine_context *ctx, int *fds, tain_t const *tto, uint
|| ndelay_on(fds[3]) < 0)
strerr_diefu1sys(111, "set fds non-blocking") ;
- LOLDEBUG("entering engine") ;
for (;;)
{
tain_t deadline = TAIN_INFINITE ;
@@ -51,7 +48,6 @@ void sbearssl_run (br_ssl_engine_context *ctx, int *fds, tain_t const *tto, uint
xindex[0] = j++ ;
if (!handshake_done)
{
- LOLDEBUG("handshake done, calling cb") ;
if (!(*cb)(ctx, cbarg))
strerr_diefu1sys(111, "post-handshake callback failed") ;
handshake_done = 1 ;
diff --git a/src/sbearssl/sbearssl_server_init_and_run.c b/src/sbearssl/sbearssl_server_init_and_run.c
index 3182707..467041a 100644
--- a/src/sbearssl/sbearssl_server_init_and_run.c
+++ b/src/sbearssl/sbearssl_server_init_and_run.c
@@ -10,8 +10,6 @@
#include <skalibs/genalloc.h>
#include <skalibs/random.h>
-#include <skalibs/lolstdio.h>
-
#include <s6-networking/sbearssl.h>
#include "sbearssl-internal.h"
@@ -76,7 +74,6 @@ void sbearssl_server_init_and_run (int *fds, tain_t const *tto, uint32_t preopti
if (n)
{
- LOLDEBUG("sbearssl_server_init_and_run: trusts anchors found: %zu", n) ;
sbearssl_x509_small_init_full(&xc, btas, n, &cbarg->eedn, &cbarg->eltstatus, cbarg->eehash) ;
if (!sbearssl_x509_small_set_tain(&xc, &STAMP))
strerr_diefu1sys(111, "initialize validation time") ;
diff --git a/src/sbearssl/sbearssl_x509_small_vtable.c b/src/sbearssl/sbearssl_x509_small_vtable.c
index d9ca46c..3b39055 100644
--- a/src/sbearssl/sbearssl_x509_small_vtable.c
+++ b/src/sbearssl/sbearssl_x509_small_vtable.c
@@ -2,8 +2,6 @@
#include <bearssl.h>
-#include <skalibs/lolstdio.h>
-
#include <s6-networking/sbearssl.h>
#define INSTANCE(c) ((sbearssl_x509_small_context *)(c))
@@ -13,7 +11,6 @@ static void start_chain (br_x509_class const **c, char const *server_name)
sbearssl_x509_small_context *ctx = INSTANCE(c) ;
ctx->minimal.vtable->start_chain(&ctx->minimal.vtable, server_name) ;
- LOLDEBUG("small_context: start_chain") ;
ctx->i = 0 ;
}
@@ -23,7 +20,6 @@ static void start_cert (br_x509_class const **c, uint32_t len)
ctx->minimal.vtable->start_cert(&ctx->minimal.vtable, len) ;
if (!ctx->i) br_sha256_init(&ctx->hashctx) ;
- LOLDEBUG("small_context: start_cert %u", ctx->i) ;
}
static void append (br_x509_class const **c, unsigned char const *s, size_t len)
@@ -31,7 +27,6 @@ static void append (br_x509_class const **c, unsigned char const *s, size_t len)
sbearssl_x509_small_context *ctx = INSTANCE(c) ;
ctx->minimal.vtable->append(&ctx->minimal.vtable, s, len) ;
- LOLDEBUG("small_context: append") ;
if (!ctx->i) br_sha256_update(&ctx->hashctx, s, len) ;
}
@@ -40,12 +35,7 @@ static void end_cert (br_x509_class const **c)
sbearssl_x509_small_context *ctx = INSTANCE(c) ;
ctx->minimal.vtable->end_cert(&ctx->minimal.vtable) ;
- LOLDEBUG("small_context: end_cert") ;
- if (!ctx->i)
- {
- br_sha256_out(&ctx->hashctx, ctx->eehash) ;
- LOLDEBUG("finished parsing EE: CN=%.64s", ctx->elts[5].buf) ;
- }
+ if (!ctx->i) br_sha256_out(&ctx->hashctx, ctx->eehash) ;
ctx->i++ ;
}
@@ -53,7 +43,6 @@ static unsigned int end_chain (br_x509_class const **c)
{
sbearssl_x509_small_context *ctx = INSTANCE(c) ;
unsigned int r = ctx->minimal.vtable->end_chain(&ctx->minimal.vtable) ;
- LOLDEBUG("small_context: end_chain, returned %u", r) ;
if (!r)
{
uint8_t mask = 1 ;
@@ -67,7 +56,6 @@ static unsigned int end_chain (br_x509_class const **c)
static br_x509_pkey const *get_pkey(br_x509_class const *const *c, unsigned int *usages)
{
sbearssl_x509_small_context *ctx = INSTANCE(c) ;
- LOLDEBUG("small_context: get_pkey") ;
return ctx->minimal.vtable->get_pkey(&ctx->minimal.vtable, usages) ;
}