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-10-15 00:49:29 +00:00
parent 6f79ebd4c9
commit 74987653ce
Signed by: purplerain
GPG Key ID: F42C07F07E2E35B7
2 changed files with 12 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
lib/libcrypto/ec/ec_asn1.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: ec_asn1.c,v 1.71 2024/10/14 12:50:18 tb Exp $ */ /* $OpenBSD: ec_asn1.c,v 1.72 2024/10/14 18:17:11 tb Exp $ */
/* /*
* Written by Nils Larsch for the OpenSSL project. * Written by Nils Larsch for the OpenSSL project.
*/ */
@ -637,8 +637,10 @@ ec_asn1_group2curve(const EC_GROUP *group, X9_62_CURVE *curve)
BIGNUM *a = NULL, *b = NULL; BIGNUM *a = NULL, *b = NULL;
int ret = 0; int ret = 0;
if (!group || !curve || !curve->a || !curve->b) if (group == NULL)
return 0; goto err;
if (curve == NULL || curve->a == NULL || curve->b == NULL)
goto err;
if ((a = BN_new()) == NULL || (b = BN_new()) == NULL) { if ((a = BN_new()) == NULL || (b = BN_new()) == NULL) {
ECerror(ERR_R_MALLOC_FAILURE); ECerror(ERR_R_MALLOC_FAILURE);

10
usr.bin/tmux/input.c
View File

@ -1,4 +1,4 @@
/* $OpenBSD: input.c,v 1.229 2024/09/16 20:38:48 nicm Exp $ */ /* $OpenBSD: input.c,v 1.230 2024/10/14 20:26:45 nicm Exp $ */
/* /*
* Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com> * Copyright (c) 2007 Nicholas Marriott <nicholas.marriott@gmail.com>
@ -1145,7 +1145,6 @@ input_print(struct input_ctx *ictx)
ictx->cell.cell.attr |= GRID_ATTR_CHARSET; ictx->cell.cell.attr |= GRID_ATTR_CHARSET;
else else
ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET; ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
utf8_set(&ictx->cell.cell.data, ictx->ch); utf8_set(&ictx->cell.cell.data, ictx->ch);
screen_write_collect_add(sctx, &ictx->cell.cell); screen_write_collect_add(sctx, &ictx->cell.cell);
@ -1349,7 +1348,7 @@ input_csi_dispatch(struct input_ctx *ictx)
struct screen_write_ctx *sctx = &ictx->ctx; struct screen_write_ctx *sctx = &ictx->ctx;
struct screen *s = sctx->s; struct screen *s = sctx->s;
struct input_table_entry *entry; struct input_table_entry *entry;
int i, n, m, ek; int i, n, m, ek, set;
u_int cx, bg = ictx->cell.cell.bg; u_int cx, bg = ictx->cell.cell.bg;
if (ictx->flags & INPUT_DISCARD) if (ictx->flags & INPUT_DISCARD)
@ -1592,6 +1591,11 @@ input_csi_dispatch(struct input_ctx *ictx)
if (~ictx->flags & INPUT_LAST) if (~ictx->flags & INPUT_LAST)
break; break;
set = ictx->cell.set == 0 ? ictx->cell.g0set : ictx->cell.g1set;
if (set == 1)
ictx->cell.cell.attr |= GRID_ATTR_CHARSET;
else
ictx->cell.cell.attr &= ~GRID_ATTR_CHARSET;
utf8_copy(&ictx->cell.cell.data, &ictx->last); utf8_copy(&ictx->cell.cell.data, &ictx->last);
for (i = 0; i < n; i++) for (i = 0; i < n; i++)
screen_write_collect_add(sctx, &ictx->cell.cell); screen_write_collect_add(sctx, &ictx->cell.cell);