From 67ac434702b99807fdc07839d305fcec4173f887 Mon Sep 17 00:00:00 2001 From: job Date: Sat, 27 Mar 2021 18:12:15 +0000 Subject: [PATCH] Send arguments in alphabetical order OK tb@ --- usr.sbin/rpki-client/gbr.c | 6 +++--- usr.sbin/rpki-client/mft.c | 6 +++--- usr.sbin/rpki-client/roa.c | 6 +++--- 3 files changed, 9 insertions(+), 9 deletions(-) diff --git a/usr.sbin/rpki-client/gbr.c b/usr.sbin/rpki-client/gbr.c index bd753bd7969..b80f5441acb 100644 --- a/usr.sbin/rpki-client/gbr.c +++ b/usr.sbin/rpki-client/gbr.c @@ -1,4 +1,4 @@ -/* $OpenBSD: gbr.c,v 1.6 2021/03/04 15:43:18 tb Exp $ */ +/* $OpenBSD: gbr.c,v 1.7 2021/03/27 18:12:15 job Exp $ */ /* * Copyright (c) 2020 Claudio Jeker * @@ -62,8 +62,8 @@ gbr_parse(X509 **x509, const char *fn) err(1, NULL); if ((p.res->vcard = strndup(cms, cmsz)) == NULL) err(1, NULL); - if (!x509_get_extensions(*x509, fn, &p.res->ski, &p.res->aki, - &p.res->aia)) { + if (!x509_get_extensions(*x509, fn, &p.res->aia, &p.res->aki, + &p.res->ski)) { gbr_free(p.res); X509_free(*x509); *x509 = NULL; diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c index 992adf02fa6..214f857cf1c 100644 --- a/usr.sbin/rpki-client/mft.c +++ b/usr.sbin/rpki-client/mft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mft.c,v 1.29 2021/03/05 16:00:00 claudio Exp $ */ +/* $OpenBSD: mft.c,v 1.30 2021/03/27 18:12:15 job Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -394,8 +394,8 @@ mft_parse(X509 **x509, const char *fn) err(1, NULL); if ((p.res->file = strdup(fn)) == NULL) err(1, NULL); - if (!x509_get_extensions(*x509, fn, &p.res->ski, &p.res->aki, - &p.res->aia)) + if (!x509_get_extensions(*x509, fn, &p.res->aia, &p.res->aki, + &p.res->ski)) goto out; /* diff --git a/usr.sbin/rpki-client/roa.c b/usr.sbin/rpki-client/roa.c index 9cf8f22aafc..953a7da38cf 100644 --- a/usr.sbin/rpki-client/roa.c +++ b/usr.sbin/rpki-client/roa.c @@ -1,4 +1,4 @@ -/* $OpenBSD: roa.c,v 1.15 2021/02/19 12:18:23 tb Exp $ */ +/* $OpenBSD: roa.c,v 1.16 2021/03/27 18:12:15 job Exp $ */ /* * Copyright (c) 2019 Kristaps Dzonsons * @@ -348,8 +348,8 @@ roa_parse(X509 **x509, const char *fn) if ((p.res = calloc(1, sizeof(struct roa))) == NULL) err(1, NULL); - if (!x509_get_extensions(*x509, fn, &p.res->ski, &p.res->aki, - &p.res->aia)) + if (!x509_get_extensions(*x509, fn, &p.res->aia, &p.res->aki, + &p.res->ski)) goto out; if (!roa_parse_econtent(cms, cmsz, &p)) goto out; -- 2.20.1