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-02-07 21:22:30 +00:00
parent e8952ca2b8
commit 8a8a1e99b4
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
3 changed files with 19 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
lib/libkeynote/keynote-keygen.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: keynote-keygen.c,v 1.22 2015/11/19 02:35:24 mmcc Exp $ */ /* $OpenBSD: keynote-keygen.c,v 1.23 2024/02/07 17:22:01 tb Exp $ */
/* /*
* The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu) * The author of this code is Angelos D. Keromytis (angelos@dsl.cis.upenn.edu)
* *
@ -176,8 +176,7 @@ keynote_keygen(int argc, char *argv[])
{ {
RAND_bytes(seed, SEED_LEN); RAND_bytes(seed, SEED_LEN);
dsa = DSA_generate_parameters(len, seed, SEED_LEN, dsa = DSA_new();
&counter, &h, NULL, NULL);
if (dsa == NULL) if (dsa == NULL)
{ {
@ -185,6 +184,13 @@ keynote_keygen(int argc, char *argv[])
exit(1); exit(1);
} }
if (DSA_generate_parameters_ex(dsa, len, seed, SEED_LEN,
&counter, &h, NULL) != 1)
{
ERR_print_errors_fp(stderr);
exit(1);
}
if (DSA_generate_key(dsa) != 1) if (DSA_generate_key(dsa) != 1)
{ {
ERR_print_errors_fp(stderr); ERR_print_errors_fp(stderr);

8
regress/usr.sbin/ospf6d/Makefile
View File

@ -1,11 +1,15 @@
# $OpenBSD: Makefile,v 1.4 2021/10/07 15:20:35 anton Exp $ # $OpenBSD: Makefile,v 1.5 2024/02/07 19:26:58 anton Exp $
REGRESS_TARGETS= network_statement REGRESS_TARGETS= network_statement
REGRESS_ROOT_TARGETS= ${REGRESS_TARGETS} REGRESS_ROOT_TARGETS= ${REGRESS_TARGETS}
OSPF6D ?= /usr/sbin/ospf6d OSPF6D ?= /usr/sbin/ospf6d
N1?= 11
N2?= 12
network_statement: network_statement:
${SUDO} ksh ${.CURDIR}/$@.sh ${OSPF6D} ${.CURDIR} ${.OBJDIR} 11 12 pair11 pair12 ${SUDO} ksh ${.CURDIR}/$@.sh ${OSPF6D} ${.CURDIR} ${.OBJDIR} \
${N1} ${N2} pair${N1} pair${N2}
.include <bsd.regress.mk> .include <bsd.regress.mk>

5
usr.sbin/btrace/bt_parse.y
View File

@ -1,4 +1,4 @@
/* $OpenBSD: bt_parse.y,v 1.57 2024/01/16 14:35:56 claudio Exp $ */ /* $OpenBSD: bt_parse.y,v 1.58 2024/02/07 19:07:42 mpi Exp $ */
/* /*
* Copyright (c) 2019-2023 Martin Pieuchot <mpi@openbsd.org> * Copyright (c) 2019-2023 Martin Pieuchot <mpi@openbsd.org>
@ -611,6 +611,9 @@ bm_insert(const char *mname, struct bt_arg *mkey, struct bt_arg *mval)
{ {
struct bt_arg *ba; struct bt_arg *ba;
if (mkey->ba_type == B_AT_TUPLE)
yyerror("tuple cannot be used as map key");
ba = ba_new(bg_get(mname), B_AT_MAP); ba = ba_new(bg_get(mname), B_AT_MAP);
ba->ba_key = mkey; ba->ba_key = mkey;