SecBSD/src
2
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

sync with OpenBSD -current

Browse source
This commit is contained in:
purplerain 2024-05-31 15:25:42 +00:00
parent 2d58860211
commit e0194c3e7d
Signed by: purplerain
GPG key ID: F42C07F07E2E35B7
15 changed files with 121 additions and 147 deletions
Download patch file Download diff file Expand all files Collapse all files

4
usr.sbin/bgpd/rde_update.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: rde_update.c,v 1.167 2024/05/29 10:41:12 claudio Exp $ */
/* $OpenBSD: rde_update.c,v 1.168 2024/05/30 08:29:30 claudio Exp $ */
/*
* Copyright (c) 2004 Claudio Jeker <claudio@openbsd.org>
@ -464,7 +464,7 @@ up_get_nexthop(struct rde_peer *peer, struct filterstate *state, uint8_t aid)
break;
case AID_INET6:
case AID_VPN_IPv6:
if (peer->local_v4_addr.aid == AID_INET6)
if (peer->local_v6_addr.aid == AID_INET6)
peer_local = &peer->local_v6_addr;
break;
case AID_FLOWSPECv4:

16
usr.sbin/rpki-client/repo.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: repo.c,v 1.58 2024/05/20 15:51:43 claudio Exp $ */
/* $OpenBSD: repo.c,v 1.59 2024/05/30 12:33:15 claudio Exp $ */
/*
* Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
* Copyright (c) 2019 Kristaps Dzonsons <kristaps@bsd.lv>
@ -1787,17 +1787,19 @@ repo_cleanup_entry(FTSENT *e, struct filepath_tree *tree, int cachefd)
}
break;
case FTS_D:
if (e->fts_level == FTS_ROOTLEVEL)
if (e->fts_level == FTS_ROOTLEVEL) {
fts_state.type = BASE_DIR;
fts_state.rp = NULL;
}
if (e->fts_level == 1) {
/* rpki.example.org or .rrdp / .rsync */
if (strcmp(".rsync", e->fts_name) == 0) {
if (strcmp(".rsync", e->fts_name) == 0)
fts_state.type = RSYNC_DIR;
fts_state.rp = NULL;
} else if (strcmp(".rrdp", e->fts_name) == 0) {
else if (strcmp(".rrdp", e->fts_name) == 0)
fts_state.type = RRDP_DIR;
fts_state.rp = NULL;
}
else
fts_state.type = BASE_DIR;
fts_state.rp = NULL;
}
if (e->fts_level == 2) {
/* rpki.example.org/repository or .rrdp/hashdir */

5
usr.sbin/rpki-client/rrdp_delta.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: rrdp_delta.c,v 1.13 2024/03/22 03:38:12 job Exp $ */
/* $OpenBSD: rrdp_delta.c,v 1.14 2024/05/30 09:54:59 job Exp $ */
/*
* Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
* Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@ -220,7 +220,8 @@ delta_content_handler(void *data, const char *content, int length)
if (dxml->scope == DELTA_SCOPE_PUBLISH)
if (publish_add_content(dxml->pxml, content, length) == -1)
PARSE_FAIL(p, "parse failed - content too big");
PARSE_FAIL(p, "parse failed, delta element for %s too "
"big", dxml->pxml->uri);
}
static void

5
usr.sbin/rpki-client/rrdp_snapshot.c
View file

@ -1,4 +1,4 @@
/* $OpenBSD: rrdp_snapshot.c,v 1.9 2024/03/22 03:38:12 job Exp $ */
/* $OpenBSD: rrdp_snapshot.c,v 1.10 2024/05/30 09:54:59 job Exp $ */
/*
* Copyright (c) 2020 Nils Fisher <nils_fisher@hotmail.com>
* Copyright (c) 2021 Claudio Jeker <claudio@openbsd.org>
@ -200,7 +200,8 @@ snapshot_content_handler(void *data, const char *content, int length)
if (sxml->scope == SNAPSHOT_SCOPE_PUBLISH)
if (publish_add_content(sxml->pxml, content, length) == -1)
PARSE_FAIL(p, "parse failed - content too big");
PARSE_FAIL(p, "parse failed, snapshot element for %s "
"too big", sxml->pxml->uri);
}
static void