summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
Diffstat
-rw-r--r--usr.sbin/smtpd/lka.c30
-rw-r--r--usr.sbin/smtpd/mta.c6
-rw-r--r--usr.sbin/smtpd/mta_session.c14
-rw-r--r--usr.sbin/smtpd/pony.c10
-rw-r--r--usr.sbin/smtpd/smtp.c6
-rw-r--r--usr.sbin/smtpd/smtp_session.c16
-rw-r--r--usr.sbin/smtpd/smtpd.c18
-rw-r--r--usr.sbin/smtpd/smtpd.h18
8 files changed, 59 insertions, 59 deletions
diff --git a/usr.sbin/smtpd/lka.c b/usr.sbin/smtpd/lka.c
index a712e8fa4a5..9e70351e7fc 100644
--- a/usr.sbin/smtpd/lka.c
+++ b/usr.sbin/smtpd/lka.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: lka.c,v 1.178 2015/10/14 22:01:43 gilles Exp $ */
+/* $OpenBSD: lka.c,v 1.179 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -120,7 +120,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
m_close(p);
return;
- case IMSG_SMTP_SSL_INIT:
+ case IMSG_SMTP_TLS_INIT:
req_ca_cert = imsg->data;
resp_ca_cert.reqid = req_ca_cert->reqid;
@@ -129,7 +129,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
pki = dict_get(env->sc_pki_dict, buf);
if (pki == NULL) {
resp_ca_cert.status = CA_FAIL;
- m_compose(p, IMSG_SMTP_SSL_INIT, 0, 0, -1, &resp_ca_cert,
+ m_compose(p, IMSG_SMTP_TLS_INIT, 0, 0, -1, &resp_ca_cert,
sizeof(resp_ca_cert));
return;
}
@@ -139,10 +139,10 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
iov[0].iov_len = sizeof(resp_ca_cert);
iov[1].iov_base = pki->pki_cert;
iov[1].iov_len = pki->pki_cert_len;
- m_composev(p, IMSG_SMTP_SSL_INIT, 0, 0, -1, iov, nitems(iov));
+ m_composev(p, IMSG_SMTP_TLS_INIT, 0, 0, -1, iov, nitems(iov));
return;
- case IMSG_SMTP_SSL_VERIFY_CERT:
+ case IMSG_SMTP_TLS_VERIFY_CERT:
req_ca_vrfy_smtp = xmemdup(imsg->data, sizeof *req_ca_vrfy_smtp, "lka:ca_vrfy");
req_ca_vrfy_smtp->cert = xmemdup((char *)imsg->data +
sizeof *req_ca_vrfy_smtp, req_ca_vrfy_smtp->cert_len, "lka:ca_vrfy");
@@ -152,7 +152,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
sizeof (off_t), "lka:ca_vrfy");
return;
- case IMSG_SMTP_SSL_VERIFY_CHAIN:
+ case IMSG_SMTP_TLS_VERIFY_CHAIN:
if (req_ca_vrfy_smtp == NULL)
fatalx("lka:ca_vrfy: chain without a certificate");
req_ca_vrfy_chain = imsg->data;
@@ -162,7 +162,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
req_ca_vrfy_smtp->chain_offset++;
return;
- case IMSG_SMTP_SSL_VERIFY:
+ case IMSG_SMTP_TLS_VERIFY:
if (req_ca_vrfy_smtp == NULL)
fatalx("lka:ca_vrfy: verify without a certificate");
@@ -176,7 +176,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
else
resp_ca_vrfy.status = CA_OK;
- m_compose(p, IMSG_SMTP_SSL_VERIFY, 0, 0, -1, &resp_ca_vrfy,
+ m_compose(p, IMSG_SMTP_TLS_VERIFY, 0, 0, -1, &resp_ca_vrfy,
sizeof resp_ca_vrfy);
for (i = 0; i < req_ca_vrfy_smtp->n_chain; ++i)
@@ -240,7 +240,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
if (p->proc == PROC_PONY) {
switch (imsg->hdr.type) {
- case IMSG_MTA_SSL_INIT:
+ case IMSG_MTA_TLS_INIT:
req_ca_cert = imsg->data;
resp_ca_cert.reqid = req_ca_cert->reqid;
@@ -249,7 +249,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
pki = dict_get(env->sc_pki_dict, buf);
if (pki == NULL) {
resp_ca_cert.status = CA_FAIL;
- m_compose(p, IMSG_MTA_SSL_INIT, 0, 0, -1, &resp_ca_cert,
+ m_compose(p, IMSG_MTA_TLS_INIT, 0, 0, -1, &resp_ca_cert,
sizeof(resp_ca_cert));
return;
}
@@ -259,10 +259,10 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
iov[0].iov_len = sizeof(resp_ca_cert);
iov[1].iov_base = pki->pki_cert;
iov[1].iov_len = pki->pki_cert_len;
- m_composev(p, IMSG_MTA_SSL_INIT, 0, 0, -1, iov, nitems(iov));
+ m_composev(p, IMSG_MTA_TLS_INIT, 0, 0, -1, iov, nitems(iov));
return;
- case IMSG_MTA_SSL_VERIFY_CERT:
+ case IMSG_MTA_TLS_VERIFY_CERT:
req_ca_vrfy_mta = xmemdup(imsg->data, sizeof *req_ca_vrfy_mta, "lka:ca_vrfy");
req_ca_vrfy_mta->cert = xmemdup((char *)imsg->data +
sizeof *req_ca_vrfy_mta, req_ca_vrfy_mta->cert_len, "lka:ca_vrfy");
@@ -272,7 +272,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
sizeof (off_t), "lka:ca_vrfy");
return;
- case IMSG_MTA_SSL_VERIFY_CHAIN:
+ case IMSG_MTA_TLS_VERIFY_CHAIN:
if (req_ca_vrfy_mta == NULL)
fatalx("lka:ca_vrfy: verify without a certificate");
@@ -283,7 +283,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
req_ca_vrfy_mta->chain_offset++;
return;
- case IMSG_MTA_SSL_VERIFY:
+ case IMSG_MTA_TLS_VERIFY:
if (req_ca_vrfy_mta == NULL)
fatalx("lka:ca_vrfy: verify without a certificate");
@@ -298,7 +298,7 @@ lka_imsg(struct mproc *p, struct imsg *imsg)
else
resp_ca_vrfy.status = CA_OK;
- m_compose(p, IMSG_MTA_SSL_VERIFY, 0, 0, -1, &resp_ca_vrfy,
+ m_compose(p, IMSG_MTA_TLS_VERIFY, 0, 0, -1, &resp_ca_vrfy,
sizeof resp_ca_vrfy);
for (i = 0; i < req_ca_vrfy_mta->n_chain; ++i)
diff --git a/usr.sbin/smtpd/mta.c b/usr.sbin/smtpd/mta.c
index 538c8c63fb2..2bed1437527 100644
--- a/usr.sbin/smtpd/mta.c
+++ b/usr.sbin/smtpd/mta.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta.c,v 1.193 2015/11/26 08:51:22 tim Exp $ */
+/* $OpenBSD: mta.c,v 1.194 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -383,11 +383,11 @@ mta_imsg(struct mproc *p, struct imsg *imsg)
mta_session_imsg(p, imsg);
return;
- case IMSG_MTA_SSL_INIT:
+ case IMSG_MTA_TLS_INIT:
mta_session_imsg(p, imsg);
return;
- case IMSG_MTA_SSL_VERIFY:
+ case IMSG_MTA_TLS_VERIFY:
mta_session_imsg(p, imsg);
return;
}
diff --git a/usr.sbin/smtpd/mta_session.c b/usr.sbin/smtpd/mta_session.c
index 96210364d57..93f06197dd5 100644
--- a/usr.sbin/smtpd/mta_session.c
+++ b/usr.sbin/smtpd/mta_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: mta_session.c,v 1.74 2015/10/14 22:01:43 gilles Exp $ */
+/* $OpenBSD: mta_session.c,v 1.75 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2008 Pierre-Yves Ritschard <pyr@openbsd.org>
@@ -310,7 +310,7 @@ mta_session_imsg(struct mproc *p, struct imsg *imsg)
waitq_run(&h->ptrname, h->ptrname);
return;
- case IMSG_MTA_SSL_INIT:
+ case IMSG_MTA_TLS_INIT:
resp_ca_cert = imsg->data;
s = mta_tree_pop(&wait_ssl_init, resp_ca_cert->reqid);
if (s == NULL)
@@ -350,7 +350,7 @@ mta_session_imsg(struct mproc *p, struct imsg *imsg)
free(resp_ca_cert);
return;
- case IMSG_MTA_SSL_VERIFY:
+ case IMSG_MTA_TLS_VERIFY:
resp_ca_vrfy = imsg->data;
s = mta_tree_pop(&wait_ssl_verify, resp_ca_vrfy->reqid);
if (s == NULL)
@@ -1512,7 +1512,7 @@ mta_start_tls(struct mta_session *s)
req_ca_cert.reqid = s->id;
(void)strlcpy(req_ca_cert.name, certname, sizeof req_ca_cert.name);
- m_compose(p_lka, IMSG_MTA_SSL_INIT, 0, 0, -1,
+ m_compose(p_lka, IMSG_MTA_TLS_INIT, 0, 0, -1,
&req_ca_cert, sizeof(req_ca_cert));
tree_xset(&wait_ssl_init, s->id, s);
s->flags |= MTA_WAIT;
@@ -1607,7 +1607,7 @@ mta_verify_certificate(struct mta_session *s)
iov[0].iov_len = sizeof(req_ca_vrfy);
iov[1].iov_base = cert_der[0];
iov[1].iov_len = cert_len[0];
- m_composev(p_lka, IMSG_MTA_SSL_VERIFY_CERT, 0, 0, -1,
+ m_composev(p_lka, IMSG_MTA_TLS_VERIFY_CERT, 0, 0, -1,
iov, nitems(iov));
memset(&req_ca_vrfy, 0, sizeof req_ca_vrfy);
@@ -1618,14 +1618,14 @@ mta_verify_certificate(struct mta_session *s)
req_ca_vrfy.cert_len = cert_len[i+1];
iov[1].iov_base = cert_der[i+1];
iov[1].iov_len = cert_len[i+1];
- m_composev(p_lka, IMSG_MTA_SSL_VERIFY_CHAIN, 0, 0, -1,
+ m_composev(p_lka, IMSG_MTA_TLS_VERIFY_CHAIN, 0, 0, -1,
iov, nitems(iov));
}
/* Tell lookup process that it can start verifying, we're done */
memset(&req_ca_vrfy, 0, sizeof req_ca_vrfy);
req_ca_vrfy.reqid = s->id;
- m_compose(p_lka, IMSG_MTA_SSL_VERIFY, 0, 0, -1,
+ m_compose(p_lka, IMSG_MTA_TLS_VERIFY, 0, 0, -1,
&req_ca_vrfy, sizeof req_ca_vrfy);
res = 1;
diff --git a/usr.sbin/smtpd/pony.c b/usr.sbin/smtpd/pony.c
index ca12d0592b0..b25aed8d912 100644
--- a/usr.sbin/smtpd/pony.c
+++ b/usr.sbin/smtpd/pony.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: pony.c,v 1.8 2015/10/14 19:39:16 gilles Exp $ */
+/* $OpenBSD: pony.c,v 1.9 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2014 Gilles Chehade <gilles@poolp.org>
@@ -77,8 +77,8 @@ pony_imsg(struct mproc *p, struct imsg *imsg)
case IMSG_SMTP_EXPAND_RCPT:
case IMSG_SMTP_LOOKUP_HELO:
case IMSG_SMTP_AUTHENTICATE:
- case IMSG_SMTP_SSL_INIT:
- case IMSG_SMTP_SSL_VERIFY:
+ case IMSG_SMTP_TLS_INIT:
+ case IMSG_SMTP_TLS_VERIFY:
case IMSG_SMTP_MESSAGE_COMMIT:
case IMSG_SMTP_MESSAGE_CREATE:
case IMSG_SMTP_MESSAGE_OPEN:
@@ -101,8 +101,8 @@ pony_imsg(struct mproc *p, struct imsg *imsg)
case IMSG_MTA_DNS_HOST_END:
case IMSG_MTA_DNS_MX_PREFERENCE:
case IMSG_MTA_DNS_PTR:
- case IMSG_MTA_SSL_INIT:
- case IMSG_MTA_SSL_VERIFY:
+ case IMSG_MTA_TLS_INIT:
+ case IMSG_MTA_TLS_VERIFY:
case IMSG_CTL_RESUME_ROUTE:
case IMSG_CTL_MTA_SHOW_HOSTS:
case IMSG_CTL_MTA_SHOW_RELAYS:
diff --git a/usr.sbin/smtpd/smtp.c b/usr.sbin/smtpd/smtp.c
index 93659ac1ea2..3eaa68e59c8 100644
--- a/usr.sbin/smtpd/smtp.c
+++ b/usr.sbin/smtpd/smtp.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp.c,v 1.143 2015/01/20 17:37:54 deraadt Exp $ */
+/* $OpenBSD: smtp.c,v 1.144 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -62,8 +62,8 @@ smtp_imsg(struct mproc *p, struct imsg *imsg)
case IMSG_SMTP_EXPAND_RCPT:
case IMSG_SMTP_LOOKUP_HELO:
case IMSG_SMTP_AUTHENTICATE:
- case IMSG_SMTP_SSL_INIT:
- case IMSG_SMTP_SSL_VERIFY:
+ case IMSG_SMTP_TLS_INIT:
+ case IMSG_SMTP_TLS_VERIFY:
smtp_session_imsg(p, imsg);
return;
}
diff --git a/usr.sbin/smtpd/smtp_session.c b/usr.sbin/smtpd/smtp_session.c
index 48278eb2995..015c1931171 100644
--- a/usr.sbin/smtpd/smtp_session.c
+++ b/usr.sbin/smtpd/smtp_session.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtp_session.c,v 1.239 2015/11/05 08:55:09 gilles Exp $ */
+/* $OpenBSD: smtp_session.c,v 1.240 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -806,7 +806,7 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
io_reload(&s->io);
return;
- case IMSG_SMTP_SSL_INIT:
+ case IMSG_SMTP_TLS_INIT:
resp_ca_cert = imsg->data;
s = tree_xpop(&wait_ssl_init, resp_ca_cert->reqid);
@@ -838,7 +838,7 @@ smtp_session_imsg(struct mproc *p, struct imsg *imsg)
free(resp_ca_cert);
return;
- case IMSG_SMTP_SSL_VERIFY:
+ case IMSG_SMTP_TLS_VERIFY:
resp_ca_vrfy = imsg->data;
s = tree_xpop(&wait_ssl_verify, resp_ca_vrfy->reqid);
@@ -893,7 +893,7 @@ smtp_mfa_response(struct smtp_session *s, int msg, int status, uint32_t code,
else
(void)strlcpy(req_ca_cert.name, s->smtpname,
sizeof req_ca_cert.name);
- m_compose(p_lka, IMSG_SMTP_SSL_INIT, 0, 0, -1,
+ m_compose(p_lka, IMSG_SMTP_TLS_INIT, 0, 0, -1,
&req_ca_cert, sizeof(req_ca_cert));
tree_xset(&wait_ssl_init, s->id, s);
return;
@@ -1136,7 +1136,7 @@ smtp_io(struct io *io, int evt)
else
(void)strlcpy(req_ca_cert.name, s->smtpname,
sizeof req_ca_cert.name);
- m_compose(p_lka, IMSG_SMTP_SSL_INIT, 0, 0, -1,
+ m_compose(p_lka, IMSG_SMTP_TLS_INIT, 0, 0, -1,
&req_ca_cert, sizeof(req_ca_cert));
tree_xset(&wait_ssl_init, s->id, s);
break;
@@ -2131,7 +2131,7 @@ smtp_verify_certificate(struct smtp_session *s)
iov[0].iov_len = sizeof(req_ca_vrfy);
iov[1].iov_base = cert_der[0];
iov[1].iov_len = cert_len[0];
- m_composev(p_lka, IMSG_SMTP_SSL_VERIFY_CERT, 0, 0, -1,
+ m_composev(p_lka, IMSG_SMTP_TLS_VERIFY_CERT, 0, 0, -1,
iov, nitems(iov));
memset(&req_ca_vrfy, 0, sizeof req_ca_vrfy);
@@ -2142,14 +2142,14 @@ smtp_verify_certificate(struct smtp_session *s)
req_ca_vrfy.cert_len = cert_len[i+1];
iov[1].iov_base = cert_der[i+1];
iov[1].iov_len = cert_len[i+1];
- m_composev(p_lka, IMSG_SMTP_SSL_VERIFY_CHAIN, 0, 0, -1,
+ m_composev(p_lka, IMSG_SMTP_TLS_VERIFY_CHAIN, 0, 0, -1,
iov, nitems(iov));
}
/* Tell lookup process that it can start verifying, we're done */
memset(&req_ca_vrfy, 0, sizeof req_ca_vrfy);
req_ca_vrfy.reqid = s->id;
- m_compose(p_lka, IMSG_SMTP_SSL_VERIFY, 0, 0, -1,
+ m_compose(p_lka, IMSG_SMTP_TLS_VERIFY, 0, 0, -1,
&req_ca_vrfy, sizeof req_ca_vrfy);
res = 1;
diff --git a/usr.sbin/smtpd/smtpd.c b/usr.sbin/smtpd/smtpd.c
index f8f47e19969..fa0f37c50e7 100644
--- a/usr.sbin/smtpd/smtpd.c
+++ b/usr.sbin/smtpd/smtpd.c
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.c,v 1.254 2015/11/05 09:14:31 sunil Exp $ */
+/* $OpenBSD: smtpd.c,v 1.255 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -1488,10 +1488,10 @@ imsg_to_str(int type)
CASE(IMSG_MTA_LOOKUP_HELO);
CASE(IMSG_MTA_OPEN_MESSAGE);
CASE(IMSG_MTA_SCHEDULE);
- CASE(IMSG_MTA_SSL_INIT);
- CASE(IMSG_MTA_SSL_VERIFY_CERT);
- CASE(IMSG_MTA_SSL_VERIFY_CHAIN);
- CASE(IMSG_MTA_SSL_VERIFY);
+ CASE(IMSG_MTA_TLS_INIT);
+ CASE(IMSG_MTA_TLS_VERIFY_CERT);
+ CASE(IMSG_MTA_TLS_VERIFY_CHAIN);
+ CASE(IMSG_MTA_TLS_VERIFY);
CASE(IMSG_SCHED_ENVELOPE_BOUNCE);
CASE(IMSG_SCHED_ENVELOPE_DELIVER);
@@ -1508,10 +1508,10 @@ imsg_to_str(int type)
CASE(IMSG_SMTP_MESSAGE_OPEN);
CASE(IMSG_SMTP_EXPAND_RCPT);
CASE(IMSG_SMTP_LOOKUP_HELO);
- CASE(IMSG_SMTP_SSL_INIT);
- CASE(IMSG_SMTP_SSL_VERIFY_CERT);
- CASE(IMSG_SMTP_SSL_VERIFY_CHAIN);
- CASE(IMSG_SMTP_SSL_VERIFY);
+ CASE(IMSG_SMTP_TLS_INIT);
+ CASE(IMSG_SMTP_TLS_VERIFY_CERT);
+ CASE(IMSG_SMTP_TLS_VERIFY_CHAIN);
+ CASE(IMSG_SMTP_TLS_VERIFY);
CASE(IMSG_SMTP_REQ_CONNECT);
CASE(IMSG_SMTP_REQ_HELO);
diff --git a/usr.sbin/smtpd/smtpd.h b/usr.sbin/smtpd/smtpd.h
index e96df108deb..7a1c85d5f7c 100644
--- a/usr.sbin/smtpd/smtpd.h
+++ b/usr.sbin/smtpd/smtpd.h
@@ -1,4 +1,4 @@
-/* $OpenBSD: smtpd.h,v 1.486 2015/11/30 12:26:55 sunil Exp $ */
+/* $OpenBSD: smtpd.h,v 1.487 2015/11/30 12:49:35 gilles Exp $ */
/*
* Copyright (c) 2008 Gilles Chehade <gilles@poolp.org>
@@ -259,10 +259,10 @@ enum imsg_type {
IMSG_MTA_LOOKUP_HELO,
IMSG_MTA_OPEN_MESSAGE,
IMSG_MTA_SCHEDULE,
- IMSG_MTA_SSL_INIT,
- IMSG_MTA_SSL_VERIFY_CERT,
- IMSG_MTA_SSL_VERIFY_CHAIN,
- IMSG_MTA_SSL_VERIFY,
+ IMSG_MTA_TLS_INIT,
+ IMSG_MTA_TLS_VERIFY_CERT,
+ IMSG_MTA_TLS_VERIFY_CHAIN,
+ IMSG_MTA_TLS_VERIFY,
IMSG_SCHED_ENVELOPE_BOUNCE,
IMSG_SCHED_ENVELOPE_DELIVER,
@@ -279,10 +279,10 @@ enum imsg_type {
IMSG_SMTP_MESSAGE_OPEN,
IMSG_SMTP_EXPAND_RCPT,
IMSG_SMTP_LOOKUP_HELO,
- IMSG_SMTP_SSL_INIT,
- IMSG_SMTP_SSL_VERIFY_CERT,
- IMSG_SMTP_SSL_VERIFY_CHAIN,
- IMSG_SMTP_SSL_VERIFY,
+ IMSG_SMTP_TLS_INIT,
+ IMSG_SMTP_TLS_VERIFY_CERT,
+ IMSG_SMTP_TLS_VERIFY_CHAIN,
+ IMSG_SMTP_TLS_VERIFY,
IMSG_SMTP_REQ_CONNECT,
IMSG_SMTP_REQ_HELO,
generated by cgit v1.2.3 (git 2.25.1) at 2024-11-30 01:41:50 +0000