From: claudio <claudio@openbsd.org>
Date: Tue, 6 Apr 2021 18:35:46 +0000 (+0000)
Subject: Do not return when a hash check failed in rrdp_data_handler() instead
X-Git-Url: http://artulab.com/gitweb/?a=commitdiff_plain;h=ed3f6c396731836ee33ad1cd67842cd148d77e71;p=openbsd

Do not return when a hash check failed in rrdp_data_handler() instead
let the code progress to set the state to RRDP_STATE_PARSE_DONE and
call rrdp_finished() since this transfer is over.
Should fix a hang seen by deraadt@
OK tb@
---

diff --git a/usr.sbin/rpki-client/rrdp.c b/usr.sbin/rpki-client/rrdp.c
index c5f90c383d0..2f43f75f9e8 100644
--- a/usr.sbin/rpki-client/rrdp.c
+++ b/usr.sbin/rpki-client/rrdp.c
@@ -1,4 +1,4 @@
-/*      $OpenBSD: rrdp.c,v 1.1 2021/04/01 16:04:48 claudio Exp $ */
+/*      $OpenBSD: rrdp.c,v 1.2 2021/04/06 18:35:46 claudio Exp $ */
 /*
  * Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
  * Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@@ -485,7 +485,6 @@ rrdp_data_handler(struct rrdp *s)
 			if (memcmp(s->hash, h, sizeof(s->hash)) != 0) {
 				s->state |= RRDP_STATE_PARSE_ERROR;
 				warnx("%s: bad message digest", s->local);
-				return;
 			}
 		}