From 885a5e7be90f7ba54ff9b16f2f3dcaab45416484 Mon Sep 17 00:00:00 2001 From: tb Date: Fri, 10 Jun 2022 10:41:09 +0000 Subject: [PATCH] Unify error messages on d2i failure for econtent --- usr.sbin/rpki-client/mft.c | 6 +++--- usr.sbin/rpki-client/rsc.c | 5 +++-- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/usr.sbin/rpki-client/mft.c b/usr.sbin/rpki-client/mft.c index 4dfb08050ed..deca26d965e 100644 --- a/usr.sbin/rpki-client/mft.c +++ b/usr.sbin/rpki-client/mft.c @@ -1,4 +1,4 @@ -/* $OpenBSD: mft.c,v 1.71 2022/06/10 10:36:43 tb Exp $ */ +/* $OpenBSD: mft.c,v 1.72 2022/06/10 10:41:09 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2019 Kristaps Dzonsons @@ -273,8 +273,8 @@ mft_parse_econtent(const unsigned char *d, size_t dsz, struct parse *p) int i, rc = 0; if ((mft = d2i_Manifest(NULL, &d, dsz)) == NULL) { - cryptowarnx("%s: RFC 6486 section 4.2: Manifest: " - "failed ASN.1 sequence parse", p->fn); + cryptowarnx("%s: RFC 6486 section 4: failed to parse Manifest", + p->fn); goto out; } diff --git a/usr.sbin/rpki-client/rsc.c b/usr.sbin/rpki-client/rsc.c index 5009aae9864..586cd71f0ad 100644 --- a/usr.sbin/rpki-client/rsc.c +++ b/usr.sbin/rpki-client/rsc.c @@ -1,4 +1,4 @@ -/* $OpenBSD: rsc.c,v 1.11 2022/06/10 10:36:43 tb Exp $ */ +/* $OpenBSD: rsc.c,v 1.12 2022/06/10 10:41:09 tb Exp $ */ /* * Copyright (c) 2022 Theo Buehler * Copyright (c) 2022 Job Snijders @@ -334,7 +334,8 @@ rsc_parse_econtent(const unsigned char *d, size_t dsz, struct parse *p) */ if ((rsc = d2i_RpkiSignedChecklist(NULL, &d, dsz)) == NULL) { - cryptowarnx("%s: RSC: failed ASN.1 decode", p->fn); + cryptowarnx("%s: RSC: failed to parse RpkiSignedChecklist", + p->fn); goto out; } -- 2.20.1