summaryrefslogtreecommitdiff
path: root/src/stls
diff options
context:
space:
mode:
authorLaurent Bercot <ska-skaware@skarnet.org>2016-11-25 20:16:06 +0000
committerLaurent Bercot <ska-skaware@skarnet.org>2016-11-25 20:16:06 +0000
commit8d532683386121e70810b0d7c6642cc2c2b89cb0 (patch)
tree866010763c829a35b18603c5af58896bd14afd18 /src/stls
parent018025f0f36a4847df265c9948dbaf7073ed3245 (diff)
downloads6-networking-8d532683386121e70810b0d7c6642cc2c2b89cb0.tar.xz
Fix build bugs. It builds!
Two things remain to do: - how to pass SNI information to libtls - how to detect cert issuer key type for ECC in bearssl
Diffstat (limited to 'src/stls')
-rw-r--r--src/stls/stls_s6tlsc.c8
-rw-r--r--src/stls/stls_s6tlsd.c6
2 files changed, 7 insertions, 7 deletions
diff --git a/src/stls/stls_s6tlsc.c b/src/stls/stls_s6tlsc.c
index 7fd4325..3f8e9cd 100644
--- a/src/stls/stls_s6tlsc.c
+++ b/src/stls/stls_s6tlsc.c
@@ -24,7 +24,7 @@ int stls_s6tlsc (char const *const *argv, char const *const *envp, tain_t const
if (tls_init() < 0) strerr_diefu1sys(111, "tls_init") ;
cfg = tls_config_new() ;
- if (!cfg) strerr_diefu1sys(111, "tls_config_new")
+ if (!cfg) strerr_diefu1sys(111, "tls_config_new") ;
x = env_get2(envp, "CADIR") ;
if (x)
@@ -63,7 +63,7 @@ int stls_s6tlsc (char const *const *argv, char const *const *envp, tain_t const
diecfg(cfg, "tls_config_set_dheparams") ;
if (tls_config_set_ecdhecurve(cfg, "auto") < 0)
- diecfg("tls_config_set_ecdhecurve") ;
+ diecfg(cfg, "tls_config_set_ecdhecurve") ;
tls_config_verify(cfg) ;
tls_config_set_protocols(cfg, TLS_PROTOCOLS_DEFAULT) ;
@@ -71,7 +71,7 @@ int stls_s6tlsc (char const *const *argv, char const *const *envp, tain_t const
ctx = tls_client() ;
if (!ctx) strerr_diefu1sys(111, "tls_client") ;
- if (tls_configure(ctx, cfg) < 0) diectx(97, ctx, "tls_configure) ;
+ if (tls_configure(ctx, cfg) < 0) diectx(97, ctx, "tls_configure") ;
tls_config_free(cfg) ;
pid = child_spawn2(argv[0], argv, envp, fds) ;
@@ -80,7 +80,7 @@ int stls_s6tlsc (char const *const *argv, char const *const *envp, tain_t const
if (uid && setuid(uid) < 0) strerr_diefu1sys(111, "setuid") ;
if (tls_accept_fds(ctx, &cctx, fds[2], fds[3]) < 0)
- diectx(ctx, "tls_accept_fds") ;
+ diectx(97, ctx, "tls_accept_fds") ;
tls_free(ctx) ;
diff --git a/src/stls/stls_s6tlsd.c b/src/stls/stls_s6tlsd.c
index f6d5e7c..dcee5f4 100644
--- a/src/stls/stls_s6tlsd.c
+++ b/src/stls/stls_s6tlsd.c
@@ -24,7 +24,7 @@ int stls_s6tlsd (char const *const *argv, char const *const *envp, tain_t const
if (tls_init() < 0) strerr_diefu1sys(111, "tls_init") ;
cfg = tls_config_new() ;
- if (!cfg) strerr_diefu1sys(111, "tls_config_new")
+ if (!cfg) strerr_diefu1sys(111, "tls_config_new") ;
x = env_get2(envp, "CAFILE") ;
if (x)
@@ -57,7 +57,7 @@ int stls_s6tlsd (char const *const *argv, char const *const *envp, tain_t const
diecfg(cfg, "tls_config_set_dheparams") ;
if (tls_config_set_ecdhecurve(cfg, "auto") < 0)
- diecfg("tls_config_set_ecdhecurve") ;
+ diecfg(cfg, "tls_config_set_ecdhecurve") ;
if (preoptions & 1) tls_config_verify_client(cfg) ;
else tls_config_verify_client_optional(cfg) ;
@@ -76,7 +76,7 @@ int stls_s6tlsd (char const *const *argv, char const *const *envp, tain_t const
if (uid && setuid(uid) < 0) strerr_diefu1sys(111, "setuid") ;
if (tls_accept_fds(ctx, &cctx, fds[2], fds[3]) < 0)
- diectx(ctx, "tls_accept_fds") ;
+ diectx(97, ctx, "tls_accept_fds") ;
tls_free(ctx) ;