Prepare for 2.5.1.1; adapt to skalibs-2.12.0.0

Signed-off-by: Laurent Bercot <ska@appnovation.com>

11 files changed, 26 insertions, 20 deletions

diff --git a/COPYING b/COPYING
index 9e95f25..0dfd4b1 100644
--- a/COPYING
+++ b/COPYING
@@ -1,4 +1,4 @@
-Copyright (c) 2011-2021 Laurent Bercot <ska-skaware@skarnet.org>
+Copyright (c) 2011-2022 Laurent Bercot <ska-skaware@skarnet.org>
 
 Permission to use, copy, modify, and distribute this software for any
 purpose with or without fee is hereby granted, provided that the above
diff --git a/INSTALL b/INSTALL
index 861cbf3..431153e 100644
--- a/INSTALL
+++ b/INSTALL
@@ -6,10 +6,10 @@ Build Instructions
 
   - A POSIX-compliant C development environment
   - GNU make version 3.81 or later
-  - skalibs version 2.11.1.0 or later: https://skarnet.org/software/skalibs/
+  - skalibs version 2.12.0.0 or later: https://skarnet.org/software/skalibs/
   - Optional (but recommended): execline version 2.8.2.0 or later: https://skarnet.org/software/execline/
-  - s6 version 2.11.0.1 or later: https://skarnet.org/software/s6/
-  - s6-dns version 2.3.5.3 or later: https://skarnet.org/software/s6-dns/
+  - s6 version 2.12.0.0 or later: https://skarnet.org/software/s6/
+  - s6-dns version 2.3.5.4 or later: https://skarnet.org/software/s6-dns/
   - Depending on whether you build the SSL tools,
         bearssl version 0.6 or later: https://bearssl.org/
      or libressl version 3.3.4 or later: https://libressl.org/
diff --git a/NEWS b/NEWS
index 876295e..46b6cf2 100644
--- a/NEWS
+++ b/NEWS
@@ -1,5 +1,11 @@
 Changelog for s6-networking.
 
+In 2.5.1.1
+----------
+
+ - Adaptation to skalibs-2.12.0.0.
+
+
 In 2.5.1.0
 ----------
 
diff --git a/doc/index.html b/doc/index.html
index 3047ed2..ddd09d2 100644
--- a/doc/index.html
+++ b/doc/index.html
@@ -55,7 +55,7 @@ as extensions to the s6 ecosystem.
  <li> A POSIX-compliant system with a standard C development environment </li>
  <li> GNU make, version 3.81 or later </li>
  <li> <a href="//skarnet.org/software/skalibs/">skalibs</a> version
-2.11.1.0 or later. It's a build-time requirement. It's also a run-time
+2.12.0.0 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the skalibs
 library. </li>
  <li> (Optional, but recommended) <a href="//skarnet.org/software/execline/">execline</a> version
@@ -63,7 +63,7 @@ library. </li>
  <li> <a href="//skarnet.org/software/s6/">s6</a> version
 2.11.0.1 or later. It's a build-time and run-time requirement. </li>
  <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a> version
-2.3.5.3 or later. It's a build-time requirement. It's also a run-time
+2.3.5.4 or later. It's a build-time requirement. It's also a run-time
 requirement if you link against the shared version of the s6-dns
 libraries. </li>
  <li> If you want to build the secure communication tools:
@@ -91,7 +91,7 @@ run-time requirement if you link against its shared version. </li>
 
 <ul>
  <li> The current released version of s6-networking is
-<a href="s6-networking-2.5.1.0.tar.gz">2.5.1.0</a>. </li>
+<a href="s6-networking-2.5.1.1.tar.gz">2.5.1.1</a>. </li>
  <li> Alternatively, you can checkout a copy of the
 <a href="//git.skarnet.org/cgi-bin/cgit.cgi/s6-networking/">s6-networking
 git repository</a>:
diff --git a/doc/upgrade.html b/doc/upgrade.html
index 82ab8b7..a2ff43b 100644
--- a/doc/upgrade.html
+++ b/doc/upgrade.html
@@ -18,6 +18,15 @@
 
 <h1> What has changed in s6-networking </h1>
 
+<h2> in 2.5.1.1 </h2>
+
+<ul>
+ <li> <a href="//skarnet.org/software/skalibs/">skalibs</a>
+dependency bumped to 2.12.0.0 </li>
+ <li> <a href="//skarnet.org/software/s6-dns/">s6-dns</a>
+dependency bumped to 2.3.5.4 </li>
+</ul>
+
 <h2> in 2.5.1.0 </h2>
 
 <ul>
diff --git a/package/info b/package/info
index 29aca06..b3c1a8d 100644
--- a/package/info
+++ b/package/info
@@ -1,4 +1,4 @@
 package=s6-networking
-version=2.5.1.0
+version=2.5.1.1
 category=net
 package_macro_name=S6_NETWORKING
diff --git a/src/clock/s6-taiclock.c b/src/clock/s6-taiclock.c
index 2bc0470..6701f9e 100644
--- a/src/clock/s6-taiclock.c
+++ b/src/clock/s6-taiclock.c
@@ -33,7 +33,7 @@ int tain_exchange (int s, ip46 const *ip, uint16_t port, tain *serversays, tain
   ssize_t r ;
   uint16_t dummyport ;
   tain_pack(query+4, &STAMP) ;
-  random_string(query+20, N-20) ; /* cookie */
+  random_buf(query+20, N-20) ; /* cookie */
   r = socket_sendnb46_g(s, query, N, ip, port, deadline) ;
   if (r < 0) return 0 ;
   if (r < N) return (errno = EPIPE, 0) ;
@@ -95,7 +95,6 @@ int main (int argc, char const *const *argv)
   }
   if (!argc) dieusage() ;
   if (!ip46_scan(argv[0], &ipremote)) dieusage() ;
-  if (!random_init()) strerr_diefu1sys(111, "init random generator") ;
 
   sock = socket_udp46(ip46_is6(&ipremote)) ;
   if (sock < 0) strerr_diefu1sys(111, "socket_udp") ;
diff --git a/src/sbearssl/sbearssl_client_init_and_run.c b/src/sbearssl/sbearssl_client_init_and_run.c
index a7d91e4..ab9d12d 100644
--- a/src/sbearssl/sbearssl_client_init_and_run.c
+++ b/src/sbearssl/sbearssl_client_init_and_run.c
@@ -79,8 +79,7 @@ void sbearssl_client_init_and_run (int *fds, tain const *tto, uint32_t preoption
     }
 
     br_ssl_engine_add_flags(&cc.eng, BR_OPT_NO_RENEGOTIATION) ;
-    random_string((char *)buf, 32) ;
-    random_finish() ;
+    random_buf((char *)buf, 32) ;
     br_ssl_engine_inject_entropy(&cc.eng, buf, 32) ;
     br_ssl_engine_set_buffer(&cc.eng, buf, sizeof(buf), 1) ;
     if (!br_ssl_client_reset(&cc, servername, 0))
diff --git a/src/sbearssl/sbearssl_server_init_and_run.c b/src/sbearssl/sbearssl_server_init_and_run.c
index 984e54e..41d4d9e 100644
--- a/src/sbearssl/sbearssl_server_init_and_run.c
+++ b/src/sbearssl/sbearssl_server_init_and_run.c
@@ -82,8 +82,7 @@ void sbearssl_server_init_and_run (int *fds, tain const *tto, uint32_t preoption
 
     sbearssl_sctx_init_full_generic(&sc) ;
     sbearssl_sctx_set_policy_sni(&sc, &pol) ;
-    random_string((char *)buf, 32) ;
-    random_finish() ;
+    random_buf((char *)buf, 32) ;
     br_ssl_engine_inject_entropy(&sc.eng, buf, 32) ;
     br_ssl_engine_set_buffer(&sc.eng, buf, sizeof(buf), 1) ;
 
diff --git a/src/tls/s6-tlsc-io.c b/src/tls/s6-tlsc-io.c
index 0070f8e..98e80e9 100644
--- a/src/tls/s6-tlsc-io.c
+++ b/src/tls/s6-tlsc-io.c
@@ -39,8 +39,6 @@ static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_
 
 #include <bearssl.h>
 
-#include <skalibs/random.h>
-
 #include <s6-networking/sbearssl.h>
 
 static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *cbarg)
@@ -56,7 +54,6 @@ static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *c
 static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, char const *servername, unsigned int notif)
 {
   sbearssl_handshake_cbarg cbarg = SBEARSSL_HANDSHAKE_CBARG_ZERO ;
-  if (!random_init()) strerr_diefu1sys(111, "initialize random device") ;
   cbarg.notif = notif ;
   sbearssl_client_init_and_run(fds, tto, preoptions, options, verbosity, servername, &handshake_cb, &cbarg) ;
 }
diff --git a/src/tls/s6-tlsd-io.c b/src/tls/s6-tlsd-io.c
index c8641b2..d013606 100644
--- a/src/tls/s6-tlsd-io.c
+++ b/src/tls/s6-tlsd-io.c
@@ -37,8 +37,6 @@ static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_
 #else
 #ifdef S6_NETWORKING_USE_BEARSSL
 
-#include <skalibs/random.h>
-
 #include <s6-networking/sbearssl.h>
 
 static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *cbarg)
@@ -54,7 +52,6 @@ static int handshake_cb (br_ssl_engine_context *ctx, sbearssl_handshake_cbarg *c
 static inline void doit (int *fds, tain const *tto, uint32_t preoptions, uint32_t options, unsigned int verbosity, unsigned int notif)
 {
   sbearssl_handshake_cbarg cbarg = SBEARSSL_HANDSHAKE_CBARG_ZERO ;
-  if (!random_init()) strerr_diefu1sys(111, "initialize random device") ;
   cbarg.notif = notif ;
   sbearssl_server_init_and_run(fds, tto, preoptions, options, verbosity, &handshake_cb, &cbarg) ;
 }