sync with OpenBSD -current
This commit is contained in:
parent
c8468dd63a
commit
caadbe0d20
GPG key ID:
F42C07F07E2E35B7
15 changed files with 44 additions and 96 deletions
|
|
@ -1,4 +1,4 @@
|
|||
# $OpenBSD: Makefile,v 1.174 2024/03/02 13:39:28 tb Exp $
|
||||
# $OpenBSD: Makefile,v 1.175 2024/03/19 19:27:33 tb Exp $
|
||||
|
||||
LIB= crypto
|
||||
LIBREBUILD=y
|
||||
|
|
@ -69,7 +69,6 @@ SRCS+= malloc-wrapper.c
|
|||
SRCS+= mem_clr.c
|
||||
SRCS+= mem_dbg.c
|
||||
SRCS+= o_fips.c
|
||||
SRCS+= o_init.c
|
||||
SRCS+= o_str.c
|
||||
|
||||
# aes/
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
/* $OpenBSD: crypto_init.c,v 1.18 2024/01/25 12:22:31 tb Exp $ */
|
||||
/* $OpenBSD: crypto_init.c,v 1.19 2024/03/19 19:27:33 tb Exp $ */
|
||||
/*
|
||||
* Copyright (c) 2018 Bob Beck <beck@openbsd.org>
|
||||
*
|
||||
|
|
@ -37,6 +37,11 @@ static pthread_once_t crypto_init_once = PTHREAD_ONCE_INIT;
|
|||
static pthread_t crypto_init_thread;
|
||||
static int crypto_init_cleaned_up;
|
||||
|
||||
void
|
||||
OPENSSL_init(void)
|
||||
{
|
||||
}
|
||||
|
||||
static void
|
||||
OPENSSL_init_crypto_internal(void)
|
||||
{
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: EVP_DigestInit.3,v 1.32 2024/03/05 17:21:40 tb Exp $
|
||||
.\" $OpenBSD: EVP_DigestInit.3,v 1.33 2024/03/19 17:34:05 tb Exp $
|
||||
.\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000
|
||||
.\" selective merge up to: OpenSSL 24a535ea Sep 22 13:14:20 2020 +0100
|
||||
.\"
|
||||
|
|
@ -70,7 +70,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd $Mdocdate: March 5 2024 $
|
||||
.Dd $Mdocdate: March 19 2024 $
|
||||
.Dt EVP_DIGESTINIT 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -547,7 +547,7 @@ main(int argc, char *argv[])
|
|||
.Xr OCSP_request_sign 3 ,
|
||||
.Xr PKCS5_PBKDF2_HMAC 3 ,
|
||||
.Xr PKCS7_sign_add_signer 3 ,
|
||||
.Xr X509_ALGOR_set_md 3 ,
|
||||
.Xr X509_ALGOR_set0 3 ,
|
||||
.Xr X509_digest 3 ,
|
||||
.Xr X509_sign 3
|
||||
.Sh HISTORY
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: OPENSSL_malloc.3,v 1.11 2023/11/16 20:27:43 schwarze Exp $
|
||||
.\" $OpenBSD: OPENSSL_malloc.3,v 1.12 2024/03/19 17:48:57 tb Exp $
|
||||
.\"
|
||||
.\" Copyright (c) 2016 Ingo Schwarze <schwarze@openbsd.org>
|
||||
.\"
|
||||
|
|
@ -14,16 +14,14 @@
|
|||
.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
|
||||
.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
|
||||
.\"
|
||||
.Dd $Mdocdate: November 16 2023 $
|
||||
.Dd $Mdocdate: March 19 2024 $
|
||||
.Dt OPENSSL_MALLOC 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
.Nm OPENSSL_malloc ,
|
||||
.Nm OPENSSL_realloc ,
|
||||
.Nm OPENSSL_free ,
|
||||
.Nm OPENSSL_strdup ,
|
||||
.Nm CRYPTO_malloc ,
|
||||
.Nm CRYPTO_realloc ,
|
||||
.Nm CRYPTO_free ,
|
||||
.Nm CRYPTO_strdup
|
||||
.Nd legacy OpenSSL memory allocation wrappers
|
||||
|
|
@ -33,11 +31,6 @@
|
|||
.Fo OPENSSL_malloc
|
||||
.Fa "size_t num"
|
||||
.Fc
|
||||
.Ft void *
|
||||
.Fo OPENSSL_realloc
|
||||
.Fa "void *addr"
|
||||
.Fa "size_t num"
|
||||
.Fc
|
||||
.Ft void
|
||||
.Fo OPENSSL_free
|
||||
.Fa "void *addr"
|
||||
|
|
@ -52,13 +45,6 @@
|
|||
.Fa "const char *file"
|
||||
.Fa "int line"
|
||||
.Fc
|
||||
.Ft void *
|
||||
.Fo CRYPTO_realloc
|
||||
.Fa "void *p"
|
||||
.Fa "size_t num"
|
||||
.Fa "const char *file"
|
||||
.Fa "int line"
|
||||
.Fc
|
||||
.Ft void
|
||||
.Fo CRYPTO_free
|
||||
.Fa "void *str"
|
||||
|
|
@ -78,7 +64,6 @@ They are provided purely for compatibility with legacy application code.
|
|||
All 8 of these functions are wrappers around the corresponding
|
||||
standard
|
||||
.Xr malloc 3 ,
|
||||
.Xr realloc 3 ,
|
||||
.Xr free 3 ,
|
||||
and
|
||||
.Xr strdup 3
|
||||
|
|
@ -93,15 +78,13 @@ standard functions.
|
|||
.Sh SEE ALSO
|
||||
.Xr crypto 3
|
||||
.Sh HISTORY
|
||||
.Fn CRYPTO_malloc ,
|
||||
.Fn CRYPTO_realloc ,
|
||||
.Fn CRYPTO_malloc
|
||||
and
|
||||
.Fn CRYPTO_free
|
||||
first appeared in SSLeay 0.6.4 and have been available since
|
||||
.Ox 2.4 .
|
||||
.Pp
|
||||
.Fn OPENSSL_malloc ,
|
||||
.Fn OPENSSL_realloc ,
|
||||
.Fn OPENSSL_malloc
|
||||
and
|
||||
.Fn OPENSSL_free
|
||||
first appeared in OpenSSL 0.9.6 and have been available since
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: X509_ALGOR_dup.3,v 1.22 2023/10/13 05:49:34 tb Exp $
|
||||
.\" $OpenBSD: X509_ALGOR_dup.3,v 1.23 2024/03/19 17:34:05 tb Exp $
|
||||
.\" OpenSSL 4692340e Jun 7 15:49:08 2016 -0400
|
||||
.\"
|
||||
.\" This file is a derived work.
|
||||
|
|
@ -66,7 +66,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd $Mdocdate: October 13 2023 $
|
||||
.Dd $Mdocdate: March 19 2024 $
|
||||
.Dt X509_ALGOR_DUP 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -75,7 +75,6 @@
|
|||
.Nm X509_ALGOR_dup ,
|
||||
.Nm X509_ALGOR_set0 ,
|
||||
.Nm X509_ALGOR_get0 ,
|
||||
.Nm X509_ALGOR_set_md ,
|
||||
.Nm X509_ALGOR_cmp
|
||||
.Nd create, change, and inspect algorithm identifiers
|
||||
.Sh SYNOPSIS
|
||||
|
|
@ -102,11 +101,6 @@
|
|||
.Fa "const void **ppval"
|
||||
.Fa "const X509_ALGOR *alg"
|
||||
.Fc
|
||||
.Ft void
|
||||
.Fo X509_ALGOR_set_md
|
||||
.Fa "X509_ALGOR *alg"
|
||||
.Fa "const EVP_MD *md"
|
||||
.Fc
|
||||
.Ft int
|
||||
.Fo X509_ALGOR_cmp
|
||||
.Fa "const X509_ALGOR *a"
|
||||
|
|
@ -240,22 +234,6 @@ then
|
|||
.Pf * Fa ppval Ns 's
|
||||
value is undefined.
|
||||
.Pp
|
||||
.Fn X509_ALGOR_set_md
|
||||
sets
|
||||
.Fa alg
|
||||
to appropriate values for the message digest
|
||||
.Fa md .
|
||||
If the
|
||||
.Dv EVP_MD_FLAG_DIGALGID_ABSENT
|
||||
flag is not set on
|
||||
.Fa md ,
|
||||
.Fn X509_ALGOR_set_md
|
||||
can leave
|
||||
.Fa alg
|
||||
in a corrupted state due to memory allocation failure.
|
||||
This problem can be avoided by preallocating with an error-checked call to
|
||||
.Fn X509_ALGOR_set0 alg NULL 0 NULL .
|
||||
.Pp
|
||||
.Fn X509_ALGOR_cmp
|
||||
compares
|
||||
.Fa a
|
||||
|
|
@ -317,10 +295,3 @@ first appeared in OpenSSL 0.9.8h and have been available since
|
|||
first appeared in OpenSSL 0.9.8zd, 1.0.0p, and 1.0.1k
|
||||
and has been available since
|
||||
.Ox 4.9 .
|
||||
.Pp
|
||||
.Fn X509_ALGOR_set_md
|
||||
first appeared in OpenSSL 1.0.1 and has been available since
|
||||
.Ox 5.3 .
|
||||
.Sh BUGS
|
||||
.Fn X509_ALGOR_set_md
|
||||
can fail but cannot communicate failure to the caller.
|
||||
|
|
|
|||
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: evp.3,v 1.29 2024/03/06 02:34:14 tb Exp $
|
||||
.\" $OpenBSD: evp.3,v 1.30 2024/03/19 17:34:05 tb Exp $
|
||||
.\" full merge up to: OpenSSL man7/evp 24a535ea Sep 22 13:14:20 2020 +0100
|
||||
.\"
|
||||
.\" This file was written by Ulf Moeller <ulf@openssl.org>,
|
||||
|
|
@ -51,7 +51,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd $Mdocdate: March 6 2024 $
|
||||
.Dd $Mdocdate: March 19 2024 $
|
||||
.Dt EVP 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
|
@ -232,7 +232,7 @@ family of functions provides base64 encoding and decoding.
|
|||
.Xr PKCS7_sign 3 ,
|
||||
.Xr RSA_pkey_ctx_ctrl 3 ,
|
||||
.Xr SSL_CTX_set_tlsext_ticket_key_cb 3 ,
|
||||
.Xr X509_ALGOR_set_md 3 ,
|
||||
.Xr X509_ALGOR_set0 3 ,
|
||||
.Xr X509_check_private_key 3 ,
|
||||
.Xr X509_digest 3 ,
|
||||
.Xr X509_get_pubkey 3 ,
|
||||
|
|
|
|||
|
|
@ -1,10 +0,0 @@
|
|||
/* $OpenBSD: o_init.c,v 1.8 2014/06/12 15:49:27 deraadt Exp $ */
|
||||
/* Ted Unangst places this file in the public domain. */
|
||||
|
||||
#include <openssl/crypto.h>
|
||||
|
||||
void
|
||||
OPENSSL_init(void)
|
||||
{
|
||||
|
||||
}
|
||||
Loading…
Add table
Add a link
Reference in a new issue