sync code with last improvements from OpenBSD
This commit is contained in:
parent
0c904fa153
commit
cac1167ac2
GPG key ID:
F42C07F07E2E35B7
64 changed files with 491 additions and 319 deletions
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: exec.c,v 1.24 2021/09/22 20:40:06 deraadt Exp $ */
|
||||
/* $OpenBSD: exec.c,v 1.25 2023/09/06 03:51:20 jsg Exp $ */
|
||||
/*-
|
||||
* Copyright (c) 1991, 1993
|
||||
* The Regents of the University of California. All rights reserved.
|
||||
|
|
@ -161,7 +161,7 @@ execvpe(const char *name, char *const *argv, char *const *envp)
|
|||
int eacces = 0;
|
||||
char *bp, *cur, *path, buf[PATH_MAX];
|
||||
size_t maplen;
|
||||
int save_errno, n;
|
||||
int save_errno;
|
||||
|
||||
/*
|
||||
* Do not allow null name
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: EVP_CIPHER_CTX_set_flags.3,v 1.1 2023/08/31 17:27:41 schwarze Exp $
|
||||
.\" $OpenBSD: EVP_CIPHER_CTX_set_flags.3,v 1.2 2023/09/06 16:26:49 schwarze Exp $
|
||||
.\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
|
||||
.\"
|
||||
.\" This file is a derived work.
|
||||
|
|
@ -67,7 +67,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd $Mdocdate: August 31 2023 $
|
||||
.Dd $Mdocdate: September 6 2023 $
|
||||
.Dt EVP_CIPHER_CTX_SET_FLAGS 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -77,6 +77,11 @@
|
|||
.Nm EVP_CIPHER_CTX_rand_key ,
|
||||
.Nm EVP_CIPHER_param_to_asn1 ,
|
||||
.Nm EVP_CIPHER_asn1_to_param ,
|
||||
.\" .Nm EVP_CIPHER_set_asn1_iv and
|
||||
.\" .Nm EVP_CIPHER_get_asn1_iv are intentionally undocumented
|
||||
.\" because they are unused according to codesearch.debian.net
|
||||
.\" and should probably not be public: they seem hardly useful
|
||||
.\" even for implementing custom EVP_CIPHER algorithms.
|
||||
.Nm EVP_CIPHER_CTX_get_app_data ,
|
||||
.Nm EVP_CIPHER_CTX_set_app_data
|
||||
.Nd unusual EVP cipher context configuration
|
||||
|
|
|
|||
|
|
@ -1,13 +1,13 @@
|
|||
.\" $OpenBSD: OBJ_create.3,v 1.7 2023/07/21 05:02:53 tb Exp $
|
||||
.\" $OpenBSD: OBJ_create.3,v 1.8 2023/09/06 12:26:59 schwarze Exp $
|
||||
.\" full merge up to:
|
||||
.\" OpenSSL OBJ_nid2obj.pod 9b86974e Aug 17 15:21:33 2015 -0400
|
||||
.\" selective merge up to:
|
||||
.\" OpenSSL OBJ_nid2obj.pod 35fd9953 May 28 14:49:38 2019 +0200
|
||||
.\" OpenSSL OBJ_nid2obj.pod 0c5bc96f Mar 15 13:57:22 2022 +0000
|
||||
.\"
|
||||
.\" This file is a derived work.
|
||||
.\" The changes are covered by the following Copyright and license:
|
||||
.\"
|
||||
.\" Copyright (c) 2017, 2021 Ingo Schwarze <schwarze@openbsd.org>
|
||||
.\" Copyright (c) 2017, 2021, 2023 Ingo Schwarze <schwarze@openbsd.org>
|
||||
.\"
|
||||
.\" Permission to use, copy, modify, and distribute this software for any
|
||||
.\" purpose with or without fee is hereby granted, provided that the above
|
||||
|
|
@ -69,7 +69,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd $Mdocdate: July 21 2023 $
|
||||
.Dd $Mdocdate: September 6 2023 $
|
||||
.Dt OBJ_CREATE 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -217,11 +217,15 @@ The opposite order will usually not work.
|
|||
returns the new NID.
|
||||
.Pp
|
||||
.Fn OBJ_add_object
|
||||
returns the NID associated with the
|
||||
returns the NID of the added
|
||||
.Fa object
|
||||
or
|
||||
.Dv NID_undef
|
||||
if memory allocation fails.
|
||||
if no object was added because the
|
||||
.Fa object
|
||||
argument was
|
||||
.Dv NULL ,
|
||||
did not contain an NID, or memory allocation failed.
|
||||
.Pp
|
||||
.Fn OBJ_create
|
||||
returns the new NID or
|
||||
|
|
@ -271,6 +275,29 @@ and
|
|||
.Fn check_defer
|
||||
first appeared in OpenSSL 1.0.0 and have been available since
|
||||
.Ox 4.9 .
|
||||
.Sh CAVEATS
|
||||
.Fn OBJ_add_object
|
||||
indicates success even after adding an incomplete object that was created with
|
||||
.Xr ASN1_OBJECT_create 3
|
||||
but lacks a short name, a long name, or an OID.
|
||||
.Pp
|
||||
Even
|
||||
.Fn OBJ_create
|
||||
tolerates
|
||||
.Dv NULL
|
||||
pointers being passed for the
|
||||
.Fa sn
|
||||
and/or
|
||||
.Fa ln
|
||||
arguments, in which case
|
||||
.Xr OBJ_nid2sn 3
|
||||
and
|
||||
.Xr OBJ_sn2nid 3
|
||||
or
|
||||
.Xr OBJ_nid2ln 3
|
||||
and
|
||||
.Xr OBJ_ln2nid 3
|
||||
will not work on the added object, respectively.
|
||||
.Sh BUGS
|
||||
.Fn OBJ_new_nid
|
||||
does not reserve any return value to indicate an error.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: x509_addr.c,v 1.86 2023/02/16 08:38:17 tb Exp $ */
|
||||
/* $OpenBSD: x509_addr.c,v 1.88 2023/09/06 15:53:07 job Exp $ */
|
||||
/*
|
||||
* Contributed to the OpenSSL Project by the American Registry for
|
||||
* Internet Numbers ("ARIN").
|
||||
|
|
@ -413,6 +413,13 @@ IPAddressFamily_afi_safi(const IPAddressFamily *af, uint16_t *out_afi,
|
|||
uint8_t safi = 0;
|
||||
int got_safi = 0;
|
||||
|
||||
if (out_afi != NULL)
|
||||
*out_afi = 0;
|
||||
if (out_safi != NULL) {
|
||||
*out_safi = 0;
|
||||
*safi_is_set = 0;
|
||||
}
|
||||
|
||||
CBS_init(&cbs, af->addressFamily->data, af->addressFamily->length);
|
||||
|
||||
if (!CBS_get_u16(&cbs, &afi))
|
||||
|
|
@ -669,9 +676,10 @@ i2r_IPAddrBlocks(const X509V3_EXT_METHOD *method, void *ext, BIO *out,
|
|||
{
|
||||
const IPAddrBlocks *addr = ext;
|
||||
IPAddressFamily *af;
|
||||
uint16_t afi;
|
||||
uint8_t safi;
|
||||
int i, safi_is_set;
|
||||
uint16_t afi = 0;
|
||||
uint8_t safi = 0;
|
||||
int safi_is_set = 0;
|
||||
int i;
|
||||
|
||||
for (i = 0; i < sk_IPAddressFamily_num(addr); i++) {
|
||||
af = sk_IPAddressFamily_value(addr, i);
|
||||
|
|
|
|||
Loading…
Add table
Add a link
Reference in a new issue