diff options
| author | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-12-07 12:46:38 +0000 |
|---|---|---|
| committer | Reyk Floeter <reyk@cvs.openbsd.org> | 2015-12-07 12:46:38 +0000 |
| commit | 970d2fcc9bb0f23ed4b330ca072618cb9eddce1f (patch) | |
| tree | dc4b8e3344617b6febf80f083c9dd3102fe815d6 /sbin/iked/ocsp.c | |
| parent | 3b9a00405deae9c53af3c0fcc4d318aac491e97f (diff) | |
Sync proc.c, use shorter proc_compose[v]()
Diffstat (limited to 'sbin/iked/ocsp.c')
| -rw-r--r-- | sbin/iked/ocsp.c | 12 |
1 files changed, 5 insertions, 7 deletions
diff --git a/sbin/iked/ocsp.c b/sbin/iked/ocsp.c index 11f9349520e..827a501c0f0 100644 --- a/sbin/iked/ocsp.c +++ b/sbin/iked/ocsp.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ocsp.c,v 1.7 2015/11/23 19:28:34 reyk Exp $ */ +/* $OpenBSD: ocsp.c,v 1.8 2015/12/07 12:46:37 reyk Exp $ */ /* * Copyright (c) 2014 Markus Friedl @@ -186,10 +186,10 @@ ocsp_connect_finish(struct iked *env, int fd, struct ocsp_connect *oc) iov[0].iov_base = oc->oc_path; iov[0].iov_len = strlen(oc->oc_path); ret = proc_composev_imsg(&env->sc_ps, PROC_CERT, -1, - IMSG_OCSP_FD, fd, iov, iovcnt); + IMSG_OCSP_FD, -1, fd, iov, iovcnt); } else { ret = proc_compose_imsg(&env->sc_ps, PROC_CERT, -1, - IMSG_OCSP_FD, -1, NULL, 0); + IMSG_OCSP_FD, -1, -1, NULL, 0); if (fd >= 0) close(fd); } @@ -243,8 +243,7 @@ ocsp_validate_cert(struct iked *env, struct iked_static_id *id, TAILQ_INSERT_TAIL(&env->sc_ocsp, ioe, ioe_entry); /* request connection to ocsp-responder */ - proc_compose_imsg(&env->sc_ps, PROC_PARENT, -1, - IMSG_OCSP_FD, -1, NULL, 0); + proc_compose(&env->sc_ps, PROC_PARENT, IMSG_OCSP_FD, NULL, 0); return (0); err: @@ -505,8 +504,7 @@ ocsp_validate_finish(struct iked_ocsp *ocsp, int valid) iov[1].iov_len = sizeof(ocsp->ocsp_type); cmd = valid ? IMSG_CERTVALID : IMSG_CERTINVALID; - ret = proc_composev_imsg(&env->sc_ps, PROC_IKEV2, -1, - cmd, -1, iov, iovcnt); + ret = proc_composev(&env->sc_ps, PROC_IKEV2, cmd, iov, iovcnt); ocsp_free(ocsp); return (ret); |