diff options
| author |   florian <florian@openbsd.org> | 2019-06-14 19:55:08 +0000 |
|---|---|---|
| committer | florian <florian@openbsd.org> | 2019-06-14 19:55:08 +0000 |
| commit | 65a104fa3c32761ba99e1844f97bd476a44a3b35 (patch) | |
| tree | 1c2ca5b883335f67597a62862d4abfe9e2a8dd78 /usr.sbin/acme-client/main.c | |
| parent | new regress: clock_gettime(2); test if CLOCK_MONOTONIC is really monotonic (diff) | |
| download | wireguard-openbsd-65a104fa3c32761ba99e1844f97bd476a44a3b35.tar.xz wireguard-openbsd-65a104fa3c32761ba99e1844f97bd476a44a3b35.zip | |
Track key type (RSA or ECDSA) in an enum and clean up a bit while here.
Originaly from Renaud Allard following input from benno, tweaked by me.
OK benno
Diffstat (limited to 'usr.sbin/acme-client/main.c')
| -rw-r--r-- | usr.sbin/acme-client/main.c | 10 |
1 files changed, 3 insertions, 7 deletions
diff --git a/usr.sbin/acme-client/main.c b/usr.sbin/acme-client/main.c index ea8f7c5d348..1a2c1749e49 100644 --- a/usr.sbin/acme-client/main.c +++ b/usr.sbin/acme-client/main.c @@ -1,4 +1,4 @@ -/* $Id: main.c,v 1.48 2019/06/12 11:09:25 gilles Exp $ */ +/* $Id: main.c,v 1.49 2019/06/14 19:55:08 florian Exp $ */ /* * Copyright (c) 2016 Kristaps Dzonsons <kristaps@bsd.lv> * @@ -49,7 +49,6 @@ main(int argc, char *argv[]) int popts = 0; pid_t pids[COMP__MAX]; extern int verbose; - extern int ecdsa; extern enum comp proccomp; size_t i, altsz, ne; @@ -148,10 +147,6 @@ main(int argc, char *argv[]) errx(EXIT_FAILURE, "authority %s not found", auth); } - if (domain->keytype == 1) { - ecdsa = 1; - } - acctkey = authority->account; if ((chngdir = domain->challengedir) == NULL) @@ -258,7 +253,8 @@ main(int argc, char *argv[]) close(file_fds[0]); close(file_fds[1]); c = keyproc(key_fds[0], domain->key, - (const char **)alts, altsz); + (const char **)alts, altsz, + domain->keytype); exit(c ? EXIT_SUCCESS : EXIT_FAILURE); } |