diff options
Diffstat (limited to 'src/include')
-rw-r--r-- | src/include/s6-networking/ident.h | 4 | ||||
-rw-r--r-- | src/include/s6-networking/sbearssl.h | 8 | ||||
-rw-r--r-- | src/include/s6-networking/stls.h | 4 |
3 files changed, 8 insertions, 8 deletions
diff --git a/src/include/s6-networking/ident.h b/src/include/s6-networking/ident.h index ec2c93b..be494c7 100644 --- a/src/include/s6-networking/ident.h +++ b/src/include/s6-networking/ident.h @@ -13,14 +13,14 @@ /* High-level */ -extern ssize_t s6net_ident_client (char *, size_t, ip46_t const *, uint16_t, ip46_t const *, uint16_t, tain_t const *, tain_t *) ; +extern ssize_t s6net_ident_client (char *, size_t, ip46 const *, uint16_t, ip46 const *, uint16_t, tain const *, tain *) ; #define s6net_ident_client_g(s, max, ra, rp, la, lp, deadline) s6net_ident_client(s, max, ra, rp, la, lp, (deadline), &STAMP) extern char const *s6net_ident_error_str (int) ; /* Low-level */ -extern ssize_t s6net_ident_reply_get (char *, ip46_t const *, uint16_t, ip46_t const *, uint16_t, tain_t const *, tain_t *) ; +extern ssize_t s6net_ident_reply_get (char *, ip46 const *, uint16_t, ip46 const *, uint16_t, tain const *, tain *) ; #define s6net_ident_reply_get_g(s, ra, rp, la, lp, deadline) s6net_ident_reply_get(s, ra, rp, la, lp, (deadline), &STAMP) extern ssize_t s6net_ident_reply_parse (char const *, uint16_t, uint16_t) ; diff --git a/src/include/s6-networking/sbearssl.h b/src/include/s6-networking/sbearssl.h index 5e7c42a..4e4dca6 100644 --- a/src/include/s6-networking/sbearssl.h +++ b/src/include/s6-networking/sbearssl.h @@ -59,7 +59,7 @@ struct sbearssl_x509_small_context_s char *eehash ; } ; -extern int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *, tai_t const *) ; +extern int sbearssl_x509_minimal_set_tai (br_x509_minimal_context *, tai const *) ; #define sbearssl_x509_minimal_set_tain(ctx, a) sbearssl_x509_minimal_set_tai(ctx, tain_secp(a)) #define sbearssl_x509_small_set_tai(ctx, t) sbearssl_x509_minimal_set_tai(&(ctx)->minimal, t) #define sbearssl_x509_small_set_tain(ctx, a) sbearssl_x509_small_set_tai(ctx, tain_secp(a)) @@ -262,7 +262,7 @@ typedef int sbearssl_handshake_cbfunc (br_ssl_engine_context *, sbearssl_handsha typedef sbearssl_handshake_cbfunc *sbearssl_handshake_cbfunc_ref ; extern int sbearssl_send_environment (br_ssl_engine_context *, sbearssl_handshake_cbarg *) ; -extern void sbearssl_run (br_ssl_engine_context *, int *, tain_t const *, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; +extern void sbearssl_run (br_ssl_engine_context *, int *, tain const *, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; /* Generic server policy class and server-side SNI implementation */ @@ -298,7 +298,7 @@ extern void sbearssl_sctx_set_policy_sni (br_ssl_server_context *, sbearssl_sni_ /* s6-tlsc-io and s6-tlsd-io implementations */ -extern void sbearssl_client_init_and_run (int *, tain_t const *, uint32_t, uint32_t, unsigned int, char const *, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; -extern void sbearssl_server_init_and_run (int *, tain_t const *, uint32_t, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; +extern void sbearssl_client_init_and_run (int *, tain const *, uint32_t, uint32_t, unsigned int, char const *, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; +extern void sbearssl_server_init_and_run (int *, tain const *, uint32_t, uint32_t, unsigned int, sbearssl_handshake_cbfunc_ref, sbearssl_handshake_cbarg *) gccattr_noreturn ; #endif diff --git a/src/include/s6-networking/stls.h b/src/include/s6-networking/stls.h index 071b96b..e9f6136 100644 --- a/src/include/s6-networking/stls.h +++ b/src/include/s6-networking/stls.h @@ -21,7 +21,7 @@ extern void stls_run (struct tls *, int *, uint32_t, unsigned int) gccattr_noret /* s6-tlsc-io and s6-tlsd-io */ -struct tls *stls_client_init_and_handshake (int const *, tain_t const *, uint32_t, char const *) ; -struct tls *stls_server_init_and_handshake (int const *, tain_t const *, uint32_t) ; +struct tls *stls_client_init_and_handshake (int const *, tain const *, uint32_t, char const *) ; +struct tls *stls_server_init_and_handshake (int const *, tain const *, uint32_t) ; #endif |