/*
- * Copyright (c) 2012 William Pitcock <nenolod@dereferenced.org>.
+ * Copyright (c) 2012 Ariadne Conill <ariadne@dereferenced.org>.
*
* Permission to use, copy, modify, and/or distribute this software for any
* purpose with or without fee is hereby granted, provided that the above
unsigned int CLICAP_TLS = 0;
-#ifdef HAVE_LIBCRYPTO
+static struct ClientCapability capdata_tls = {
+ .flags = CLICAP_FLAGS_PRIORITY,
+};
+
mapi_cap_list_av2 starttls_cap_list[] = {
- { MAPI_CAP_CLIENT, "tls", NULL, &CLICAP_TLS },
+ { MAPI_CAP_CLIENT, "tls", &capdata_tls, &CLICAP_TLS },
{ 0, NULL, NULL, NULL }
};
-#else /* HAVE_LIBCRYPTO */
-
-mapi_cap_list_av2 starttls_cap_list[] = { { 0, NULL, NULL, NULL } };
-
-#endif /* HAVE_LIBCRYPTO */
DECLARE_MODULE_AV2(starttls, NULL, NULL, starttls_clist, NULL, NULL, starttls_cap_list, NULL, starttls_desc);
static void
mr_starttls(struct MsgBuf *msgbuf_p, struct Client *client_p, struct Client *source_p, int parc, const char *parv[])
{
-#ifdef HAVE_LIBCRYPTO
ssl_ctl_t *ctl;
rb_fde_t *F[2];
sendto_one_numeric(client_p, RPL_STARTTLS, form_str(RPL_STARTTLS));
send_queued(client_p);
- ctl = start_ssld_accept(client_p->localClient->F, F[1], client_p->localClient->connid);
+ /* TODO: set localClient->ssl_callback and handle success/failure */
+
+ ctl = start_ssld_accept(client_p->localClient->F, F[1], connid_get(client_p));
if (ctl != NULL)
{
client_p->localClient->F = F[0];
client_p->localClient->ssl_ctl = ctl;
SetSSL(client_p);
+ SetSecure(client_p);
}
-#else /* HAVE_LIBCRYPTO */
- sendto_one_numeric(client_p, ERR_STARTTLS, form_str(ERR_STARTTLS), "TLS is not configured");
-#endif /* HAVE_LIBCRYPTO */
}