summaryrefslogtreecommitdiff
path: root/src/transport/tls/tls.c
diff options
context:
space:
mode:
authorGarrett D'Amore <garrett@damore.org>2018-01-09 18:42:28 -0800
committerGarrett D'Amore <garrett@damore.org>2018-01-09 18:42:28 -0800
commit6dddc0bfcb79615b8be470a5e16918360d57cadb (patch)
tree9f12e0db8a343d4f803da1b9420a80ee0a9cc0ee /src/transport/tls/tls.c
parent5db0c399e3a2289e5b6dacdec4035a827eb8a16d (diff)
downloadnng-6dddc0bfcb79615b8be470a5e16918360d57cadb.tar.gz
nng-6dddc0bfcb79615b8be470a5e16918360d57cadb.tar.bz2
nng-6dddc0bfcb79615b8be470a5e16918360d57cadb.zip
fixes #186 Suggested API changes for nng TLS certs
Diffstat (limited to 'src/transport/tls/tls.c')
-rw-r--r--src/transport/tls/tls.c113
1 files changed, 0 insertions, 113 deletions
diff --git a/src/transport/tls/tls.c b/src/transport/tls/tls.c
index 31426a78..408ff50c 100644
--- a/src/transport/tls/tls.c
+++ b/src/transport/tls/tls.c
@@ -843,93 +843,6 @@ tls_getopt_config(void *arg, void *v, size_t *szp)
}
static int
-tls_setopt_ca_cert(void *arg, const void *data, size_t sz)
-{
- nni_tls_ep *ep = arg;
-
- if (ep == NULL) {
- return (0);
- }
- return (nng_tls_config_ca_cert(ep->cfg, data, sz));
-}
-
-static int
-tls_setopt_cert(void *arg, const void *data, size_t sz)
-{
- nni_tls_ep *ep = arg;
-
- if (ep == NULL) {
- return (0);
- }
- return (nng_tls_config_cert(ep->cfg, data, sz));
-}
-
-static int
-tls_setopt_private_key(void *arg, const void *data, size_t sz)
-{
- nni_tls_ep *ep = arg;
-
- if (ep == NULL) {
- return (0);
- }
- return (nng_tls_config_key(ep->cfg, data, sz));
-}
-
-static int
-tls_setopt_pass(void *arg, const void *data, size_t sz)
-{
- nni_tls_ep *ep = arg;
- size_t len;
-
- len = nni_strnlen(data, sz);
- if (len >= sz) {
- return (NNG_EINVAL);
- }
-
- if (ep == NULL) {
- return (0);
- }
- return (nng_tls_config_pass(ep->cfg, data));
-}
-
-static int
-tls_getopt_auth_mode(void *arg, void *v, size_t *szp)
-{
- nni_tls_ep *ep = arg;
- return (nni_getopt_int(ep->authmode, v, szp));
-}
-
-static int
-tls_setopt_auth_mode(void *arg, const void *data, size_t sz)
-{
- nni_tls_ep *ep = arg;
- int mode;
- int rv;
-
- rv = nni_setopt_int(&mode, data, sz, -100, 100);
- if (rv == 0) {
- switch (mode) {
- case NNG_TLS_AUTH_MODE_NONE:
- case NNG_TLS_AUTH_MODE_OPTIONAL:
- case NNG_TLS_AUTH_MODE_REQUIRED:
- break;
- default:
- rv = NNG_EINVAL;
- break;
- }
- }
-
- if ((ep == NULL) || (rv != 0)) {
- return (rv);
- }
-
- if ((rv = nng_tls_config_auth_mode(ep->cfg, mode)) == 0) {
- ep->authmode = mode;
- }
- return (rv);
-}
-
-static int
tls_getopt_verified(void *arg, void *v, size_t *szp)
{
nni_tls_pipe *p = arg;
@@ -973,32 +886,6 @@ static nni_tran_ep_option nni_tls_ep_options[] = {
.eo_getopt = tls_getopt_config,
.eo_setopt = tls_setopt_config,
},
- {
- .eo_name = NNG_OPT_TLS_CA_CERT,
- .eo_getopt = NULL,
- .eo_setopt = tls_setopt_ca_cert,
- },
- {
- .eo_name = NNG_OPT_TLS_CERT,
- .eo_getopt = NULL,
- .eo_setopt = tls_setopt_cert,
- },
- {
- .eo_name = NNG_OPT_TLS_PRIVATE_KEY,
- .eo_getopt = NULL,
- .eo_setopt = tls_setopt_private_key,
- },
- {
- .eo_name = NNG_OPT_TLS_PRIVATE_KEY_PASSWORD,
- .eo_getopt = NULL,
- .eo_setopt = tls_setopt_pass,
- },
- {
- .eo_name = NNG_OPT_TLS_AUTH_MODE,
- .eo_getopt = tls_getopt_auth_mode,
- .eo_setopt = tls_setopt_auth_mode,
- },
-
// terminate list
{ NULL, NULL, NULL },
};