diff options
| author |   tobhe <tobhe@openbsd.org> | 2020-08-14 21:13:15 +0000 |
|---|---|---|
| committer | tobhe <tobhe@openbsd.org> | 2020-08-14 21:13:15 +0000 |
| commit | 53d22e8fd0545c2b59316a9ad81ebec06eccf33f (patch) | |
| tree | 0a47f4ab1cc134613e6d062c56f1f002f42e2ca0 | |
| parent | Remove local change to fix powerpc floating-point alignment (diff) | |
| download | wireguard-openbsd-53d22e8fd0545c2b59316a9ad81ebec06eccf33f.tar.xz wireguard-openbsd-53d22e8fd0545c2b59316a9ad81ebec06eccf33f.zip | |
Clean up unused variables.
| -rw-r--r-- | sbin/iked/ca.c | 5 | ||||
| -rw-r--r-- | sbin/iked/config.c | 8 |
2 files changed, 6 insertions, 7 deletions
diff --git a/sbin/iked/ca.c b/sbin/iked/ca.c index afb45a24d92..3fd31af6732 100644 --- a/sbin/iked/ca.c +++ b/sbin/iked/ca.c @@ -1,4 +1,4 @@ -/* $OpenBSD: ca.c,v 1.65 2020/07/27 14:22:53 tobhe Exp $ */ +/* $OpenBSD: ca.c,v 1.66 2020/08/14 21:13:15 tobhe Exp $ */ /* * Copyright (c) 2010-2013 Reyk Floeter <reyk@openbsd.org> @@ -1463,7 +1463,6 @@ ca_validate_cert(struct iked *env, struct iked_static_id *id, X509 *cert = NULL; EVP_PKEY *pkey; int ret = -1, result, error; - X509_NAME *subject; const char *errstr = "failed"; if (len == 0) { @@ -1478,7 +1477,7 @@ ca_validate_cert(struct iked *env, struct iked_static_id *id, } /* Certificate needs a valid subjectName */ - if ((subject = X509_get_subject_name(cert)) == NULL) { + if (X509_get_subject_name(cert) == NULL) { errstr = "invalid subject"; goto done; } diff --git a/sbin/iked/config.c b/sbin/iked/config.c index 539a7652dc3..577127adb46 100644 --- a/sbin/iked/config.c +++ b/sbin/iked/config.c @@ -1,4 +1,4 @@ -/* $OpenBSD: config.c,v 1.58 2020/07/23 22:01:08 tobhe Exp $ */ +/* $OpenBSD: config.c,v 1.59 2020/08/14 21:13:15 tobhe Exp $ */ /* * Copyright (c) 2019 Tobias Heider <tobias.heider@stusta.de> @@ -739,7 +739,7 @@ config_getpolicy(struct iked *env, struct imsg *imsg) { struct iked_policy *pol; struct iked_proposal pp, *prop; - struct iked_transform xf, *xform; + struct iked_transform xf; off_t offset = 0; unsigned int i, j; uint8_t *buf = (uint8_t *)imsg->data; @@ -771,9 +771,9 @@ config_getpolicy(struct iked *env, struct imsg *imsg) memcpy(&xf, buf + offset, sizeof(xf)); offset += sizeof(xf); - if ((xform = config_add_transform(prop, xf.xform_type, + if (config_add_transform(prop, xf.xform_type, xf.xform_id, xf.xform_length, - xf.xform_keylength)) == NULL) + xf.xform_keylength) == NULL) fatal("config_getpolicy: add transform"); } } |