From 6126e9c49f01b315c82cae340caaa1d8f588c0e7 Mon Sep 17 00:00:00 2001
From: Laurent Bercot <ska-skaware@skarnet.org>
Date: Tue, 14 Mar 2017 09:07:27 +0000
Subject:  Cleanup superfluous includes

---
 src/conn-tools/s6-tlsc.c                       |  2 +-
 src/conn-tools/s6-tlsd.c                       |  2 +-
 src/libs6net/s6net_ident_client.c              |  3 ---
 src/libs6net/s6net_ident_reply_get.c           |  4 +---
 src/libs6net/s6net_ident_reply_parse.c         |  3 +--
 src/sbearssl/sbearssl_append.c                 |  1 -
 src/sbearssl/sbearssl_cert_from.c              |  1 -
 src/sbearssl/sbearssl_cert_to.c                |  1 -
 src/sbearssl/sbearssl_clean_tls_and_spawn.c    |  1 -
 src/sbearssl/sbearssl_ec_pkey_from.c           |  1 -
 src/sbearssl/sbearssl_ec_pkey_to.c             |  1 -
 src/sbearssl/sbearssl_ec_skey_from.c           |  1 -
 src/sbearssl/sbearssl_ec_skey_to.c             |  1 -
 src/sbearssl/sbearssl_isder.c                  |  1 -
 src/sbearssl/sbearssl_pem_decode_from_string.c |  1 -
 src/sbearssl/sbearssl_pem_push.c               |  1 -
 src/sbearssl/sbearssl_pkey_from.c              |  1 -
 src/sbearssl/sbearssl_rsa_pkey_from.c          |  1 -
 src/sbearssl/sbearssl_rsa_pkey_to.c            |  1 -
 src/sbearssl/sbearssl_rsa_skey_from.c          |  2 --
 src/sbearssl/sbearssl_rsa_skey_to.c            |  1 -
 src/sbearssl/sbearssl_run.c                    |  1 -
 src/sbearssl/sbearssl_s6tlsc.c                 |  2 --
 src/sbearssl/sbearssl_s6tlsd.c                 |  2 --
 src/sbearssl/sbearssl_setclientcert.c          | 28 --------------------------
 src/sbearssl/sbearssl_skey_from.c              |  1 -
 src/sbearssl/sbearssl_ta_certs.c               |  1 -
 src/sbearssl/sbearssl_ta_from.c                |  1 -
 src/sbearssl/sbearssl_ta_to.c                  |  1 -
 src/sbearssl/sbearssl_x500_from_ta.c           |  1 -
 src/sbearssl/sbearssl_x500_name_len.c          |  1 -
 src/sbearssl/sbearssl_x509_minimal_set_tai.c   |  1 -
 src/stls/stls_clean_tls_and_spawn.c            |  1 -
 src/stls/stls_run.c                            |  1 -
 src/stls/stls_s6tlsc.c                         |  2 --
 src/stls/stls_s6tlsd.c                         |  1 -
 36 files changed, 4 insertions(+), 72 deletions(-)
 delete mode 100644 src/sbearssl/sbearssl_setclientcert.c

(limited to 'src')

diff --git a/src/conn-tools/s6-tlsc.c b/src/conn-tools/s6-tlsc.c
index fb7272f..cbac1eb 100644
--- a/src/conn-tools/s6-tlsc.c
+++ b/src/conn-tools/s6-tlsc.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <errno.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
diff --git a/src/conn-tools/s6-tlsd.c b/src/conn-tools/s6-tlsd.c
index d76b423..6746fa3 100644
--- a/src/conn-tools/s6-tlsd.c
+++ b/src/conn-tools/s6-tlsd.c
@@ -1,7 +1,7 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <stdint.h>
+#include <unistd.h>
 #include <skalibs/types.h>
 #include <skalibs/sgetopt.h>
 #include <skalibs/strerr2.h>
diff --git a/src/libs6net/s6net_ident_client.c b/src/libs6net/s6net_ident_client.c
index a014fe2..d09da7a 100644
--- a/src/libs6net/s6net_ident_client.c
+++ b/src/libs6net/s6net_ident_client.c
@@ -1,10 +1,7 @@
 /* ISC license. */
 
 #include <string.h>
-#include <stdint.h>
 #include <errno.h>
-#include <skalibs/tai.h>
-#include <skalibs/ip46.h>
 #include <s6-networking/ident.h>
 
 ssize_t s6net_ident_client (char *s, size_t max, ip46_t const *remoteip, uint16_t remoteport, ip46_t const *localip, uint16_t localport, tain_t const *deadline, tain_t *stamp)
diff --git a/src/libs6net/s6net_ident_reply_get.c b/src/libs6net/s6net_ident_reply_get.c
index 18a833d..f4d2b01 100644
--- a/src/libs6net/s6net_ident_reply_get.c
+++ b/src/libs6net/s6net_ident_reply_get.c
@@ -1,12 +1,10 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <errno.h>
-#include <skalibs/types.h>
+#include <skalibs/uint16.h>
 #include <skalibs/allreadwrite.h>
 #include <skalibs/buffer.h>
 #include <skalibs/error.h>
-#include <skalibs/tai.h>
 #include <skalibs/djbunix.h>
 #include <skalibs/ip46.h>
 #include <skalibs/unix-timed.h>
diff --git a/src/libs6net/s6net_ident_reply_parse.c b/src/libs6net/s6net_ident_reply_parse.c
index f2e3308..7f2daab 100644
--- a/src/libs6net/s6net_ident_reply_parse.c
+++ b/src/libs6net/s6net_ident_reply_parse.c
@@ -1,9 +1,8 @@
 /* ISC license. */
 
 #include <string.h>
-#include <stdint.h>
 #include <errno.h>
-#include <skalibs/types.h>
+#include <skalibs/uint16.h>
 #include <skalibs/bytestr.h>
 #include <skalibs/error.h>
 #include <s6-networking/ident.h>
diff --git a/src/sbearssl/sbearssl_append.c b/src/sbearssl/sbearssl_append.c
index ae4aac0..ca24ea9 100644
--- a/src/sbearssl/sbearssl_append.c
+++ b/src/sbearssl/sbearssl_append.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <skalibs/stralloc.h>
 #include "sbearssl-internal.h"
diff --git a/src/sbearssl/sbearssl_cert_from.c b/src/sbearssl/sbearssl_cert_from.c
index 3822e05..e9d397e 100644
--- a/src/sbearssl/sbearssl_cert_from.c
+++ b/src/sbearssl/sbearssl_cert_from.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
diff --git a/src/sbearssl/sbearssl_cert_to.c b/src/sbearssl/sbearssl_cert_to.c
index 1ab2d00..af7ad4c 100644
--- a/src/sbearssl/sbearssl_cert_to.c
+++ b/src/sbearssl/sbearssl_cert_to.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 void sbearssl_cert_to (sbearssl_cert const *sc, br_x509_certificate *bc, char *s)
diff --git a/src/sbearssl/sbearssl_clean_tls_and_spawn.c b/src/sbearssl/sbearssl_clean_tls_and_spawn.c
index d1bc9d8..258db90 100644
--- a/src/sbearssl/sbearssl_clean_tls_and_spawn.c
+++ b/src/sbearssl/sbearssl_clean_tls_and_spawn.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 #include "sbearssl-internal.h"
diff --git a/src/sbearssl/sbearssl_ec_pkey_from.c b/src/sbearssl/sbearssl_ec_pkey_from.c
index fb97bfb..faf1194 100644
--- a/src/sbearssl/sbearssl_ec_pkey_from.c
+++ b/src/sbearssl/sbearssl_ec_pkey_from.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
diff --git a/src/sbearssl/sbearssl_ec_pkey_to.c b/src/sbearssl/sbearssl_ec_pkey_to.c
index df3d799..658ef1c 100644
--- a/src/sbearssl/sbearssl_ec_pkey_to.c
+++ b/src/sbearssl/sbearssl_ec_pkey_to.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 void sbearssl_ec_pkey_to (sbearssl_ec_pkey const *l, br_ec_public_key *k, char *s)
diff --git a/src/sbearssl/sbearssl_ec_skey_from.c b/src/sbearssl/sbearssl_ec_skey_from.c
index b579f7d..19e14ee 100644
--- a/src/sbearssl/sbearssl_ec_skey_from.c
+++ b/src/sbearssl/sbearssl_ec_skey_from.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
diff --git a/src/sbearssl/sbearssl_ec_skey_to.c b/src/sbearssl/sbearssl_ec_skey_to.c
index 7cba7ba..8f69d4f 100644
--- a/src/sbearssl/sbearssl_ec_skey_to.c
+++ b/src/sbearssl/sbearssl_ec_skey_to.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 void sbearssl_ec_skey_to (sbearssl_ec_skey const *l, br_ec_private_key *k, char *s)
diff --git a/src/sbearssl/sbearssl_isder.c b/src/sbearssl/sbearssl_isder.c
index c481da9..95b2b23 100644
--- a/src/sbearssl/sbearssl_isder.c
+++ b/src/sbearssl/sbearssl_isder.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <s6-networking/sbearssl.h>
 
 int sbearssl_isder (unsigned char const *s, size_t len)
diff --git a/src/sbearssl/sbearssl_pem_decode_from_string.c b/src/sbearssl/sbearssl_pem_decode_from_string.c
index efcb431..b9f7f15 100644
--- a/src/sbearssl/sbearssl_pem_decode_from_string.c
+++ b/src/sbearssl/sbearssl_pem_decode_from_string.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <bearssl.h>
 #include <skalibs/error.h>
diff --git a/src/sbearssl/sbearssl_pem_push.c b/src/sbearssl/sbearssl_pem_push.c
index cd9eba5..10d6cc9 100644
--- a/src/sbearssl/sbearssl_pem_push.c
+++ b/src/sbearssl/sbearssl_pem_push.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <errno.h>
 #include <bearssl.h>
 #include <skalibs/stralloc.h>
diff --git a/src/sbearssl/sbearssl_pkey_from.c b/src/sbearssl/sbearssl_pkey_from.c
index a1d1076..c7bc707 100644
--- a/src/sbearssl/sbearssl_pkey_from.c
+++ b/src/sbearssl/sbearssl_pkey_from.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <bearssl.h>
-#include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
 int sbearssl_pkey_from (sbearssl_pkey *l, br_x509_pkey const *k, stralloc *sa)
diff --git a/src/sbearssl/sbearssl_rsa_pkey_from.c b/src/sbearssl/sbearssl_rsa_pkey_from.c
index 3032bb3..4c61432 100644
--- a/src/sbearssl/sbearssl_rsa_pkey_from.c
+++ b/src/sbearssl/sbearssl_rsa_pkey_from.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
diff --git a/src/sbearssl/sbearssl_rsa_pkey_to.c b/src/sbearssl/sbearssl_rsa_pkey_to.c
index 2f80997..f2f98d7 100644
--- a/src/sbearssl/sbearssl_rsa_pkey_to.c
+++ b/src/sbearssl/sbearssl_rsa_pkey_to.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 void sbearssl_rsa_pkey_to (sbearssl_rsa_pkey const *l, br_rsa_public_key *k, char *s)
diff --git a/src/sbearssl/sbearssl_rsa_skey_from.c b/src/sbearssl/sbearssl_rsa_skey_from.c
index c9f1c0c..a7a37d1 100644
--- a/src/sbearssl/sbearssl_rsa_skey_from.c
+++ b/src/sbearssl/sbearssl_rsa_skey_from.c
@@ -1,7 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
-#include <bearssl.h>
 #include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
diff --git a/src/sbearssl/sbearssl_rsa_skey_to.c b/src/sbearssl/sbearssl_rsa_skey_to.c
index 93c90b0..b6a0d3b 100644
--- a/src/sbearssl/sbearssl_rsa_skey_to.c
+++ b/src/sbearssl/sbearssl_rsa_skey_to.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 void sbearssl_rsa_skey_to (sbearssl_rsa_skey const *l, br_rsa_private_key *k, char *s)
diff --git a/src/sbearssl/sbearssl_run.c b/src/sbearssl/sbearssl_run.c
index c496cba..ca4a79e 100644
--- a/src/sbearssl/sbearssl_run.c
+++ b/src/sbearssl/sbearssl_run.c
@@ -2,7 +2,6 @@
 
 #include <skalibs/nonposix.h>
 #include <sys/types.h>
-#include <stdint.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/src/sbearssl/sbearssl_s6tlsc.c b/src/sbearssl/sbearssl_s6tlsc.c
index 057929f..e01e25e 100644
--- a/src/sbearssl/sbearssl_s6tlsc.c
+++ b/src/sbearssl/sbearssl_s6tlsc.c
@@ -1,11 +1,9 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
 #include <bearssl.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/tai.h>
 #include <skalibs/env.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
diff --git a/src/sbearssl/sbearssl_s6tlsd.c b/src/sbearssl/sbearssl_s6tlsd.c
index e91ef54..dd7f52a 100644
--- a/src/sbearssl/sbearssl_s6tlsd.c
+++ b/src/sbearssl/sbearssl_s6tlsd.c
@@ -1,11 +1,9 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
 #include <bearssl.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/tai.h>
 #include <skalibs/env.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
diff --git a/src/sbearssl/sbearssl_setclientcert.c b/src/sbearssl/sbearssl_setclientcert.c
deleted file mode 100644
index 74bfd20..0000000
--- a/src/sbearssl/sbearssl_setclientcert.c
+++ /dev/null
@@ -1,28 +0,0 @@
-/* ISC license. */
-
-#include <sys/types.h>
-#include <bearssl.h>
-#include <s6-networking/sbearssl.h>
-
-int sbearssl_setclientcert (br_ssl_client_context *cc, br_x509_certificate const *certs, size_t certlen, br_skey const *key)
-{
-  if (!certlen) return 0 ;
-  switch (key.type)
-  {
-    case BR_KEYTYPE_RSA :
-      br_ssl_client_set_single_rsa(cc, certs, certlen, &key->rsa, &br_rsa_i31_pkcs1_sign) ;
-      break ;
-    case BR_KEYTYPE_EC :
-    {
-      int kt, r ;
-      r = sbearssl_ec_issuer_keytype(&kt, &certs[0]) ;
-      if (r) return r ;
-      br_ssl_client_set_single_ec(cc, certs, certlen, &key->ec, BR_KEYTYPE_KEYX | BR_KEYTYPE_SIGN, kt, &br_ec_prime_i31, ) ;
-      break ;
-    }
-    default :
-    strerr_dief1x(96, "unsupported private key type") ;
-  }
-
-  return 0 ;
-}
diff --git a/src/sbearssl/sbearssl_skey_from.c b/src/sbearssl/sbearssl_skey_from.c
index b1bc938..ac16969 100644
--- a/src/sbearssl/sbearssl_skey_from.c
+++ b/src/sbearssl/sbearssl_skey_from.c
@@ -2,7 +2,6 @@
 
 #include <errno.h>
 #include <bearssl.h>
-#include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
 int sbearssl_skey_from (sbearssl_skey *l, br_skey const *k, stralloc *sa)
diff --git a/src/sbearssl/sbearssl_ta_certs.c b/src/sbearssl/sbearssl_ta_certs.c
index 9f96a0a..68dab7a 100644
--- a/src/sbearssl/sbearssl_ta_certs.c
+++ b/src/sbearssl/sbearssl_ta_certs.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <sys/types.h>
 #include <bearssl.h>
 #include <skalibs/stralloc.h>
 #include <skalibs/genalloc.h>
diff --git a/src/sbearssl/sbearssl_ta_from.c b/src/sbearssl/sbearssl_ta_from.c
index 1b4baca..09c5090 100644
--- a/src/sbearssl/sbearssl_ta_from.c
+++ b/src/sbearssl/sbearssl_ta_from.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <sys/types.h>
-#include <bearssl.h>
 #include <skalibs/stralloc.h>
 #include <s6-networking/sbearssl.h>
 
diff --git a/src/sbearssl/sbearssl_ta_to.c b/src/sbearssl/sbearssl_ta_to.c
index 8c16ce7..d19c4c1 100644
--- a/src/sbearssl/sbearssl_ta_to.c
+++ b/src/sbearssl/sbearssl_ta_to.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 void sbearssl_ta_to (sbearssl_ta const *sta, br_x509_trust_anchor *bta, char *s)
diff --git a/src/sbearssl/sbearssl_x500_from_ta.c b/src/sbearssl/sbearssl_x500_from_ta.c
index d655919..b396f27 100644
--- a/src/sbearssl/sbearssl_x500_from_ta.c
+++ b/src/sbearssl/sbearssl_x500_from_ta.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <string.h>
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 void sbearssl_x500_from_ta (br_x500_name *names, sbearssl_ta const *sta, size_t n, char *storage, char const *tastorage)
diff --git a/src/sbearssl/sbearssl_x500_name_len.c b/src/sbearssl/sbearssl_x500_name_len.c
index 02bc9d7..a3a3167 100644
--- a/src/sbearssl/sbearssl_x500_name_len.c
+++ b/src/sbearssl/sbearssl_x500_name_len.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <bearssl.h>
 #include <s6-networking/sbearssl.h>
 
 size_t sbearssl_x500_name_len (sbearssl_ta const *sta, size_t n)
diff --git a/src/sbearssl/sbearssl_x509_minimal_set_tai.c b/src/sbearssl/sbearssl_x509_minimal_set_tai.c
index cfa12be..1d9de2a 100644
--- a/src/sbearssl/sbearssl_x509_minimal_set_tai.c
+++ b/src/sbearssl/sbearssl_x509_minimal_set_tai.c
@@ -1,6 +1,5 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <bearssl.h>
 #include <skalibs/uint64.h>
 #include <skalibs/tai.h>
diff --git a/src/stls/stls_clean_tls_and_spawn.c b/src/stls/stls_clean_tls_and_spawn.c
index b7ee911..37ea619 100644
--- a/src/stls/stls_clean_tls_and_spawn.c
+++ b/src/stls/stls_clean_tls_and_spawn.c
@@ -1,7 +1,6 @@
 /* ISC license. */
 
 #include <sys/types.h>
-#include <stdint.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 #include "stls-internal.h"
diff --git a/src/stls/stls_run.c b/src/stls/stls_run.c
index 8d7478f..1a035e2 100644
--- a/src/stls/stls_run.c
+++ b/src/stls/stls_run.c
@@ -2,7 +2,6 @@
 
 #include <skalibs/nonposix.h>
 #include <sys/uio.h>
-#include <stdint.h>
 #include <sys/socket.h>
 #include <errno.h>
 #include <signal.h>
diff --git a/src/stls/stls_s6tlsc.c b/src/stls/stls_s6tlsc.c
index ed0476e..a9a2c98 100644
--- a/src/stls/stls_s6tlsc.c
+++ b/src/stls/stls_s6tlsc.c
@@ -1,11 +1,9 @@
 /* ISC license. */
 
-#include <stdint.h>
 #include <unistd.h>
 #include <errno.h>
 #include <tls.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/tai.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 #include <s6-networking/stls.h>
diff --git a/src/stls/stls_s6tlsd.c b/src/stls/stls_s6tlsd.c
index aac188e..fd59d48 100644
--- a/src/stls/stls_s6tlsd.c
+++ b/src/stls/stls_s6tlsd.c
@@ -5,7 +5,6 @@
 #include <errno.h>
 #include <tls.h>
 #include <skalibs/strerr2.h>
-#include <skalibs/tai.h>
 #include <skalibs/env.h>
 #include <skalibs/djbunix.h>
 #include <s6-networking/stls.h>
-- 
cgit v1.2.3