From 564631637bcd238b4c9aad5496aa9e049f948dd9 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Mon, 23 Nov 2020 14:25:24 +0000
Subject:  Fix more bugs; disable renegociation in bearssl client

---
 src/sbearssl/sbearssl_client_init_and_run.c |  1 +
 src/sbearssl/sbearssl_ta_readdir.c          | 28 ++++++++++++++++------------
 2 files changed, 17 insertions(+), 12 deletions(-)

(limited to 'src/sbearssl')

diff --git a/src/sbearssl/sbearssl_client_init_and_run.c b/src/sbearssl/sbearssl_client_init_and_run.c
index a6e7aca..73fac70 100644
--- a/src/sbearssl/sbearssl_client_init_and_run.c
+++ b/src/sbearssl/sbearssl_client_init_and_run.c
@@ -59,6 +59,7 @@ void sbearssl_client_init_and_run (int *fds, tain_t const *tto, uint32_t preopti
       sbearssl_ta_to(genalloc_s(sbearssl_ta, &tas) + i, btas + i, storage.s) ;
     genalloc_free(sbearssl_ta, &tas) ;
     br_ssl_client_init_full(&cc, &xc, btas, talen) ;
+    br_ssl_engine_add_flags(&cc.eng, BR_OPT_NO_RENEGOTIATION) ;
     random_string((char *)buf, 32) ;
     random_finish() ;
     br_ssl_engine_inject_entropy(&cc.eng, buf, 32) ;
diff --git a/src/sbearssl/sbearssl_ta_readdir.c b/src/sbearssl/sbearssl_ta_readdir.c
index 4093bcf..f340503 100644
--- a/src/sbearssl/sbearssl_ta_readdir.c
+++ b/src/sbearssl/sbearssl_ta_readdir.c
@@ -1,11 +1,15 @@
 /* ISC license. */
 
+#include <stdint.h>
 #include <string.h>
 #include <errno.h>
+
+#include <skalibs/uint32.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
 #include <skalibs/direntry.h>
 #include <skalibs/djbunix.h>
+
 #include <s6-networking/sbearssl.h>
 
 int sbearssl_ta_readdir (char const *dirfn, genalloc *taga, stralloc *tasa)
@@ -18,26 +22,26 @@ int sbearssl_ta_readdir (char const *dirfn, genalloc *taga, stralloc *tasa)
   stralloc certsa = STRALLOC_ZERO ;
   genalloc certga = GENALLOC_ZERO ;
   DIR *dir = opendir(dirfn) ;
+  char fn[dirfnlen + 12] ;
   if (!dir) return -1 ;
+  memcpy(fn, dirfn, dirfnlen) ;
+  fn[dirfnlen] = '/' ;
 
   for (;;)
   {
     direntry *d ;
+    uint32_t dummy ;
     errno = 0 ;
     d = readdir(dir) ;
     if (!d) break ;
-    if (d->d_name[0] == '.') continue ;
-    {
-      size_t dlen = strlen(d->d_name) ;
-      char fn[dirfnlen + dlen + 2] ;
-      memcpy(fn, dirfn, dirfnlen) ;
-      fn[dirfnlen] = '/' ;
-      memcpy(fn + dirfnlen + 1, d->d_name, dlen) ;
-      fn[dirfnlen + 1 + dlen] = 0 ;
-      genalloc_setlen(sbearssl_cert, &certga, 0) ;
-      certsa.len = 0 ;
-      if (sbearssl_cert_readfile(fn, &certga, &certsa)) continue ;
-    }
+
+   /* only process files with valid hash names */
+    if (uint32_xscan(d->d_name, &dummy) != 8 || d->d_name[8] != '.' || d->d_name[9] != '0' || d->d_name[10]) continue ;
+
+    memcpy(fn + dirfnlen + 1, d->d_name, 11) ;
+    genalloc_setlen(sbearssl_cert, &certga, 0) ;
+    certsa.len = 0 ;
+    if (sbearssl_cert_readfile(fn, &certga, &certsa)) continue ;
     sbearssl_ta_certs(taga, tasa, genalloc_s(sbearssl_cert, &certga), genalloc_len(sbearssl_cert, &certga), certsa.s) ;
   }
   if (errno) goto fail ;
-- 
cgit v1.2.3