sync
This commit is contained in:
parent
0f55503fed
commit
ab90ba3a7c
GPG key ID:
F42C07F07E2E35B7
92 changed files with 264 additions and 259 deletions
|
|
@ -2823,6 +2823,7 @@
|
|||
./usr/share/btrace
|
||||
./usr/share/btrace/kprofile.bt
|
||||
./usr/share/btrace/runqlat.bt
|
||||
./usr/share/btrace/uprofile.bt
|
||||
./usr/share/calendar
|
||||
./usr/share/calendar/calendar.all
|
||||
./usr/share/calendar/calendar.birthday
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_vfy.c,v 1.122 2023/05/08 14:51:00 tb Exp $ */
|
||||
/* $OpenBSD: x509_vfy.c,v 1.123 2023/05/14 20:20:40 tb Exp $ */
|
||||
/* Copyright (C) 1995-1998 Eric Young (eay@cryptsoft.com)
|
||||
* All rights reserved.
|
||||
*
|
||||
|
|
@ -2308,8 +2308,8 @@ X509_STORE_CTX_free(X509_STORE_CTX *ctx)
|
|||
LCRYPTO_ALIAS(X509_STORE_CTX_free);
|
||||
|
||||
int
|
||||
X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
|
||||
STACK_OF(X509) *chain)
|
||||
X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *leaf,
|
||||
STACK_OF(X509) *untrusted)
|
||||
{
|
||||
int param_ret = 1;
|
||||
|
||||
|
|
@ -2337,8 +2337,8 @@ X509_STORE_CTX_init(X509_STORE_CTX *ctx, X509_STORE *store, X509 *x509,
|
|||
* possible even on early exits.
|
||||
*/
|
||||
ctx->store = store;
|
||||
ctx->cert = x509;
|
||||
ctx->untrusted = chain;
|
||||
ctx->cert = leaf;
|
||||
ctx->untrusted = untrusted;
|
||||
|
||||
if (store && store->verify)
|
||||
ctx->verify = store->verify;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: vnconfig.c,v 1.12 2022/10/04 06:52:52 kn Exp $ */
|
||||
/* $OpenBSD: vnconfig.c,v 1.13 2023/05/14 18:34:02 krw Exp $ */
|
||||
/*
|
||||
* Copyright (c) 1993 University of Utah.
|
||||
* Copyright (c) 1990, 1993
|
||||
|
|
@ -300,6 +300,7 @@ config(char *file, char *dev, struct disklabel *dp, char *key, size_t keylen)
|
|||
|
||||
memset(&vndio, 0, sizeof vndio);
|
||||
vndio.vnd_file = file;
|
||||
vndio.vnd_type = (dp && dp->d_type) ? dp->d_type : DTYPE_VND;
|
||||
vndio.vnd_secsize = (dp && dp->d_secsize) ? dp->d_secsize : DEV_BSIZE;
|
||||
vndio.vnd_nsectors = (dp && dp->d_nsectors) ? dp->d_nsectors : 100;
|
||||
vndio.vnd_ntracks = (dp && dp->d_ntracks) ? dp->d_ntracks : 1;
|
||||
|
|
|
|||
|
|
@ -176,7 +176,7 @@ gpt_chk_mbr(struct dos_partition *dp, u_int64_t dsize)
|
|||
}
|
||||
|
||||
/*
|
||||
* Try to find the disk address of the first MBR OpenBSD partition.
|
||||
* Try to find the disk address of the first MBR SecBSD partition.
|
||||
*
|
||||
* N.B.: must boot from a partition within first 2^32-1 sectors!
|
||||
*
|
||||
|
|
@ -210,7 +210,7 @@ again:
|
|||
return (-1);
|
||||
}
|
||||
|
||||
/* Search for OpenBSD partition */
|
||||
/* Search for SecBSD partition */
|
||||
nextebr = 0;
|
||||
for (i = 0; i < NDOSPART; i++) {
|
||||
dp = &mbr.dmbr_parts[i];
|
||||
|
|
@ -253,7 +253,7 @@ again:
|
|||
}
|
||||
|
||||
/*
|
||||
* Try to find the disk address of the first GPT OpenBSD partition.
|
||||
* Try to find the disk address of the first GPT SecBSD partition.
|
||||
*
|
||||
* N.B.: must boot from a partition within first 2^32-1 sectors!
|
||||
*
|
||||
|
|
@ -275,7 +275,7 @@ findopenbsd_gpt(efi_diskinfo_t ed, const char **err)
|
|||
static struct uuid *openbsd_uuid = NULL, openbsd_uuid_space;
|
||||
static u_char buf[4096];
|
||||
|
||||
/* Prepare OpenBSD UUID */
|
||||
/* Prepare SecBSD UUID */
|
||||
if (openbsd_uuid == NULL) {
|
||||
/* XXX: should be replaced by uuid_dec_be() */
|
||||
memcpy(&openbsd_uuid_space, openbsd_uuid_code,
|
||||
|
|
@ -368,7 +368,7 @@ findopenbsd_gpt(efi_diskinfo_t ed, const char **err)
|
|||
lba = letoh64(gp.gp_lba_start);
|
||||
/* Bootloaders do not current handle addresses > UINT_MAX! */
|
||||
if (lba > UINT_MAX || EFI_SECTOBLK(ed, lba) > UINT_MAX) {
|
||||
*err = "OpenBSD Partition LBA > 2**32 - 1";
|
||||
*err = "SecBSD Partition LBA > 2**32 - 1";
|
||||
return (-1);
|
||||
}
|
||||
return (u_int)lba;
|
||||
|
|
@ -414,14 +414,14 @@ efi_getdisklabel(efi_diskinfo_t ed, struct disklabel *label)
|
|||
if (start == (u_int)-1) {
|
||||
if (err != NULL)
|
||||
return (err);
|
||||
return ("no OpenBSD GPT partition");
|
||||
return ("no SecBSD GPT partition");
|
||||
}
|
||||
} else {
|
||||
start = findopenbsd(ed, &err);
|
||||
if (start == (u_int)-1) {
|
||||
if (err != NULL)
|
||||
return (err);
|
||||
return "no OpenBSD MBR partition\n";
|
||||
return "no SecBSD MBR partition\n";
|
||||
}
|
||||
}
|
||||
|
||||
|
|
|
|||
|
|
@ -548,11 +548,11 @@ sr_getdisklabel(struct sr_boot_volume *bv, struct disklabel *label)
|
|||
if (start == (u_int)-1) {
|
||||
if (err != NULL)
|
||||
return (err);
|
||||
return "no OpenBSD partition\n";
|
||||
return "no SecBSD partition\n";
|
||||
}
|
||||
} else if (mbr.dmbr_sign == DOSMBR_SIGNATURE) {
|
||||
|
||||
/* Search for OpenBSD partition */
|
||||
/* Search for SecBSD partition */
|
||||
for (i = 0; i < NDOSPART; i++) {
|
||||
dp = &mbr.dmbr_parts[i];
|
||||
if (!dp->dp_size)
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: vnd.c,v 1.180 2023/03/08 04:43:08 guenther Exp $ */
|
||||
/* $OpenBSD: vnd.c,v 1.181 2023/05/14 18:34:02 krw Exp $ */
|
||||
/* $NetBSD: vnd.c,v 1.26 1996/03/30 23:06:11 christos Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -85,6 +85,7 @@ struct vnd_softc {
|
|||
|
||||
char sc_file[VNDNLEN]; /* file we're covering */
|
||||
int sc_flags; /* flags */
|
||||
uint16_t sc_type; /* d_type we are emulating */
|
||||
size_t sc_size; /* size of vnd in sectors */
|
||||
size_t sc_secsize; /* sector size in bytes */
|
||||
size_t sc_nsectors; /* # of sectors per track */
|
||||
|
|
@ -224,7 +225,7 @@ vndgetdisklabel(dev_t dev, struct vnd_softc *sc, struct disklabel *lp,
|
|||
lp->d_ncylinders = sc->sc_size / lp->d_secpercyl;
|
||||
|
||||
strncpy(lp->d_typename, "vnd device", sizeof(lp->d_typename));
|
||||
lp->d_type = DTYPE_VND;
|
||||
lp->d_type = sc->sc_type;
|
||||
strncpy(lp->d_packname, "fictitious", sizeof(lp->d_packname));
|
||||
DL_SETDSIZE(lp, sc->sc_size);
|
||||
lp->d_version = 1;
|
||||
|
|
@ -502,6 +503,7 @@ fail:
|
|||
}
|
||||
|
||||
/* Set geometry for device. */
|
||||
sc->sc_type = vio->vnd_type;
|
||||
sc->sc_secsize = vio->vnd_secsize;
|
||||
sc->sc_ntracks = vio->vnd_ntracks;
|
||||
sc->sc_nsectors = vio->vnd_nsectors;
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: vndioctl.h,v 1.11 2019/11/18 22:32:45 jca Exp $ */
|
||||
/* $OpenBSD: vndioctl.h,v 1.12 2023/05/14 18:34:02 krw Exp $ */
|
||||
/* $NetBSD: vndioctl.h,v 1.5 1995/01/25 04:46:30 cgd Exp $ */
|
||||
|
||||
/*
|
||||
|
|
@ -51,10 +51,11 @@ struct vnd_ioctl {
|
|||
char *vnd_file; /* pathname of file to mount */
|
||||
size_t vnd_secsize; /* sector size in bytes */
|
||||
size_t vnd_nsectors; /* number of sectors in a track */
|
||||
size_t vnd_ntracks; /* number of tracks per cylinder (i.e. heads) */
|
||||
size_t vnd_ntracks; /* number of tracks per cylinder */
|
||||
off_t vnd_size; /* (returned) size of disk */
|
||||
u_char *vnd_key;
|
||||
int vnd_keylen;
|
||||
uint16_t vnd_type; /* DTYPE being emulated */
|
||||
};
|
||||
|
||||
/*
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue