commit - 63e6b0bd0ced8b14ffb84efb31cf66346a4d68d3
commit + aa2cb5c274a14b6623c30cbf380000afcb04ff1a
blob - cff2722270346f7dce4c45d55016a37077e7e034
blob + 02a6b6b0159196389ab42842b7b31bbfd56d13e8
--- crypto.c
+++ crypto.c
struct imsgev *iev;
struct privsep_proc *p;
struct privsep *ps = conf->ps;
- struct imsgbuf *ibuf;
+ struct imsgbuf *imsgbuf;
struct imsg imsg;
int ret = 0;
int n, done = 0;
iev = ps->ps_ievs[PROC_CRYPTO];
p = iev->proc;
- ibuf = &iev->ibuf;
+ imsgbuf = &iev->ibuf;
while (!done) {
- if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
+ if ((n = imsg_read(imsgbuf)) == -1 && errno != EAGAIN)
fatalx("imsg_read");
if (n == 0)
fatalx("pipe closed");
while (!done) {
- if ((n = imsg_get(ibuf, &imsg)) == -1)
+ if ((n = imsg_get(imsgbuf, &imsg)) == -1)
fatalx("imsg_get error");
if (n == 0)
break;
imsg.hdr.peerid, "crypto", imsg.hdr.pid);
#endif
- if ((p->p_cb)(ibuf->fd, p, &imsg) == 0) {
+ if ((p->p_cb)(imsgbuf->fd, p, &imsg) == 0) {
/* Message was handled by the callback */
imsg_free(&imsg);
continue;
struct imsgev *iev;
struct privsep_proc *p;
struct privsep *ps = conf->ps;
- struct imsgbuf *ibuf;
+ struct imsgbuf *imsgbuf;
struct imsg imsg;
int n, done = 0;
const void *toptr;
iev = ps->ps_ievs[PROC_CRYPTO];
p = iev->proc;
- ibuf = &iev->ibuf;
+ imsgbuf = &iev->ibuf;
while (!done) {
- if ((n = imsg_read(ibuf)) == -1 && errno != EAGAIN)
+ if ((n = imsg_read(imsgbuf)) == -1 && errno != EAGAIN)
fatalx("imsg_read");
if (n == 0)
fatalx("pipe closed");
while (!done) {
- if ((n = imsg_get(ibuf, &imsg)) == -1)
+ if ((n = imsg_get(imsgbuf, &imsg)) == -1)
fatalx("imsg_get error");
if (n == 0)
break;
#endif
if (imsg.hdr.type != IMSG_CRYPTO_ECDSA_SIGN &&
- crypto_dispatch_server(ibuf->fd, p, &imsg) == 0) {
+ crypto_dispatch_server(imsgbuf->fd, p, &imsg)
+ == 0) {
/* Message was handled by the callback */
imsg_free(&imsg);
continue;