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

sync with OpenBSD -current

Browse Source
This commit is contained in:
purplerain 2024-09-10 03:19:00 +00:00
parent bf24177229
commit 557639aa7f
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
4 changed files with 26 additions and 12 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
sbin/iked/radius.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: radius.c,v 1.10 2024/08/17 03:28:22 yasuoka Exp $ */ /* $OpenBSD: radius.c,v 1.11 2024/09/09 23:38:29 yasuoka Exp $ */
/* /*
* Copyright (c) 2024 Internet Initiative Japan Inc. * Copyright (c) 2024 Internet Initiative Japan Inc.
@ -748,8 +748,6 @@ iked_radius_acct_request(struct iked *env, struct iked_sa *sa, uint8_t stype)
switch (stype) { switch (stype) {
case RADIUS_ACCT_STATUS_TYPE_START: case RADIUS_ACCT_STATUS_TYPE_START:
radius_put_uint32_attr(pkt, RADIUS_TYPE_ACCT_STATUS_TYPE,
RADIUS_ACCT_STATUS_TYPE_START);
break; break;
case RADIUS_ACCT_STATUS_TYPE_INTERIM_UPDATE: case RADIUS_ACCT_STATUS_TYPE_INTERIM_UPDATE:
case RADIUS_ACCT_STATUS_TYPE_STOP: case RADIUS_ACCT_STATUS_TYPE_STOP:

5
usr.bin/ssh/ssh_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: ssh_config.5,v 1.401 2024/09/03 06:17:48 jmc Exp $ .\" $OpenBSD: ssh_config.5,v 1.402 2024/09/09 14:41:21 naddy Exp $
.Dd $Mdocdate: September 3 2024 $ .Dd $Mdocdate: September 9 2024 $
.Dt SSH_CONFIG 5 .Dt SSH_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1288,6 +1288,7 @@ default set.
The default is: The default is:
.Bd -literal -offset indent .Bd -literal -offset indent
sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com, sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
mlkem768x25519-sha256,
curve25519-sha256,curve25519-sha256@libssh.org, curve25519-sha256,curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256, diffie-hellman-group-exchange-sha256,

7
usr.bin/ssh/sshd_config.5
View File

@ -33,8 +33,8 @@
.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF .\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. .\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
.\" .\"
.\" $OpenBSD: sshd_config.5,v 1.369 2024/08/22 23:11:30 djm Exp $ .\" $OpenBSD: sshd_config.5,v 1.370 2024/09/09 14:41:21 naddy Exp $
.Dd $Mdocdate: August 22 2024 $ .Dd $Mdocdate: September 9 2024 $
.Dt SSHD_CONFIG 5 .Dt SSHD_CONFIG 5
.Os .Os
.Sh NAME .Sh NAME
@ -1051,6 +1051,8 @@ ecdh-sha2-nistp384
.It .It
ecdh-sha2-nistp521 ecdh-sha2-nistp521
.It .It
mlkem768x25519-sha256
.It
sntrup761x25519-sha512 sntrup761x25519-sha512
.It .It
sntrup761x25519-sha512@openssh.com sntrup761x25519-sha512@openssh.com
@ -1059,6 +1061,7 @@ sntrup761x25519-sha512@openssh.com
The default is: The default is:
.Bd -literal -offset indent .Bd -literal -offset indent
sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com, sntrup761x25519-sha512,sntrup761x25519-sha512@openssh.com,
mlkem768x25519-sha256,
curve25519-sha256,curve25519-sha256@libssh.org, curve25519-sha256,curve25519-sha256@libssh.org,
ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521, ecdh-sha2-nistp256,ecdh-sha2-nistp384,ecdh-sha2-nistp521,
diffie-hellman-group-exchange-sha256, diffie-hellman-group-exchange-sha256,

22
usr.sbin/bgpd/rde.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: rde.c,v 1.630 2024/09/09 12:59:49 claudio Exp $ */ /* $OpenBSD: rde.c,v 1.632 2024/09/09 15:00:45 claudio Exp $ */
/* /*
* Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org> * Copyright (c) 2003, 2004 Henning Brauer <henning@openbsd.org>
@ -1277,8 +1277,6 @@ rde_dispatch_imsg_rtr(struct imsgbuf *imsgbuf)
case IMSG_RECONF_ASPA_TAS: case IMSG_RECONF_ASPA_TAS:
if (aspa == NULL) if (aspa == NULL)
fatalx("unexpected IMSG_RECONF_ASPA_TAS"); fatalx("unexpected IMSG_RECONF_ASPA_TAS");
if (imsg_get_len(&imsg) != aspa->num * sizeof(uint32_t))
fatalx("IMSG_RECONF_ASPA_TAS bad len");
aspa->tas = reallocarray(NULL, aspa->num, aspa->tas = reallocarray(NULL, aspa->num,
sizeof(uint32_t)); sizeof(uint32_t));
if (aspa->tas == NULL) if (aspa->tas == NULL)
@ -2194,8 +2192,22 @@ rde_attr_parse(struct ibuf *buf, struct rde_peer *peer,
case ATTR_CLUSTER_LIST: case ATTR_CLUSTER_LIST:
if (!CHECK_FLAGS(flags, ATTR_OPTIONAL, 0)) if (!CHECK_FLAGS(flags, ATTR_OPTIONAL, 0))
goto bad_flags; goto bad_flags;
if (ibuf_size(&attrbuf) % 4 != 0) if (peer->conf.ebgp) {
goto bad_len; /* As per RFC7606 use "attribute discard" here. */
log_peer_warnx(&peer->conf, "bad CLUSTER_LIST, "
"received from external peer, attribute discarded");
break;
}
if (ibuf_size(&attrbuf) % 4 != 0 || ibuf_size(&attrbuf) == 0) {
/*
* mark update as bad and withdraw all routes as per
* RFC 7606
*/
a->flags |= F_ATTR_PARSE_ERR;
log_peer_warnx(&peer->conf, "bad CLUSTER_LIST, "
"path invalidated and prefix withdrawn");
break;
}
goto optattr; goto optattr;
case ATTR_MP_REACH_NLRI: case ATTR_MP_REACH_NLRI:
if (!CHECK_FLAGS(flags, ATTR_OPTIONAL, 0)) if (!CHECK_FLAGS(flags, ATTR_OPTIONAL, 0))