sync with OpenBSD -current
This commit is contained in:
parent
fe7a6999d9
commit
f21e607a91
19 changed files with 138 additions and 64 deletions
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: CMS_add1_signer.3,v 1.9 2024/03/29 06:43:12 tb Exp $
|
||||
.\" $OpenBSD: CMS_add1_signer.3,v 1.10 2024/04/18 16:50:22 tb Exp $
|
||||
.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
|
||||
.\"
|
||||
.\" This file is a derived work.
|
||||
|
@ -65,7 +65,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd $Mdocdate: March 29 2024 $
|
||||
.Dd $Mdocdate: April 18 2024 $
|
||||
.Dt CMS_ADD1_SIGNER 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -196,8 +196,8 @@ By default, issuer name and serial number are used instead.
|
|||
If present, the
|
||||
.Vt SMIMECapabilities
|
||||
attribute indicates support for the
|
||||
following algorithms in preference order: 256-bit AES, Gost R3411-94,
|
||||
Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
|
||||
following algorithms in preference order: 256-bit AES,
|
||||
192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
|
||||
RC2, DES and 40-bit RC2.
|
||||
If any of these algorithms is not available then it will not be
|
||||
included.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: CMS_sign.3,v 1.10 2024/03/29 06:43:12 tb Exp $
|
||||
.\" $OpenBSD: CMS_sign.3,v 1.11 2024/04/18 16:50:22 tb Exp $
|
||||
.\" full merge up to: OpenSSL e9b77246 Jan 20 19:58:49 2017 +0100
|
||||
.\"
|
||||
.\" This file was written by Dr. Stephen Henson <steve@openssl.org>.
|
||||
|
@ -48,7 +48,7 @@
|
|||
.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
|
||||
.\" OF THE POSSIBILITY OF SUCH DAMAGE.
|
||||
.\"
|
||||
.Dd $Mdocdate: March 29 2024 $
|
||||
.Dd $Mdocdate: April 18 2024 $
|
||||
.Dt CMS_SIGN 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -127,8 +127,8 @@ attribute.
|
|||
Omit just the
|
||||
.Vt SMIMECapabilities .
|
||||
If present, the SMIMECapabilities attribute indicates support for the
|
||||
following algorithms in preference order: 256-bit AES, Gost R3411-94,
|
||||
Gost 28147-89, 192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
|
||||
following algorithms in preference order: 256-bit AES,
|
||||
192-bit AES, 128-bit AES, triple DES, 128-bit RC2, 64-bit
|
||||
RC2, DES and 40-bit RC2.
|
||||
If any of these algorithms is not available, then it will not be
|
||||
included.
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: EVP_PKEY_get_default_digest_nid.3,v 1.8 2024/03/05 19:21:31 tb Exp $
|
||||
.\" $OpenBSD: EVP_PKEY_get_default_digest_nid.3,v 1.9 2024/04/18 16:33:33 tb Exp $
|
||||
.\" full merge up to: OpenSSL df75c2bf Dec 9 01:02:36 2018 +0100
|
||||
.\"
|
||||
.\" 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: March 5 2024 $
|
||||
.Dd $Mdocdate: April 18 2024 $
|
||||
.Dt EVP_PKEY_GET_DEFAULT_DIGEST_NID 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -98,7 +98,7 @@ is set to
|
|||
.Pp
|
||||
Support for the following public key algorithms is built into the library:
|
||||
.Pp
|
||||
.Bl -column -compact EVP_PKEY_base_id(3) NID_id_Gost28147_89_MAC mandatory
|
||||
.Bl -column -compact EVP_PKEY_base_id(3) NID_sha256 mandatory
|
||||
.It Xr EVP_PKEY_base_id 3 Ta Pf * Fa pnid Ta return value
|
||||
.It Dv EVP_PKEY_DSA Ta Dv NID_sha1 Ta mandatory
|
||||
.It Dv EVP_PKEY_EC Ta Dv NID_sha1 Ta mandatory
|
||||
|
|
|
@ -1,4 +1,4 @@
|
|||
.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.22 2024/03/05 19:21:31 tb Exp $
|
||||
.\" $OpenBSD: EVP_PKEY_set1_RSA.3,v 1.23 2024/04/18 16:32:22 tb Exp $
|
||||
.\" full merge up to: OpenSSL 99d63d46 Oct 26 13:56:48 2016 -0400
|
||||
.\"
|
||||
.\" This file is a derived work.
|
||||
|
@ -65,7 +65,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: April 18 2024 $
|
||||
.Dt EVP_PKEY_SET1_RSA 3
|
||||
.Os
|
||||
.Sh NAME
|
||||
|
@ -293,7 +293,7 @@ returns the type of
|
|||
.Fa pkey
|
||||
according to the following table:
|
||||
.Pp
|
||||
.Bl -column -compact -offset 2n EVP_PKEY_GOSTR NID_X9_62_id_ecPublicKey
|
||||
.Bl -column -compact -offset 2n EVP_PKEY_RSA_PSS NID_X9_62_id_ecPublicKey
|
||||
.It Sy return value Ta Ta Sy PEM type string
|
||||
.It Dv EVP_PKEY_CMAC Ta = Dv NID_cmac Ta CMAC
|
||||
.It Dv EVP_PKEY_DH Ta = Dv NID_dhKeyAgreement Ta DH
|
||||
|
@ -310,7 +310,7 @@ returns the actual OID associated with
|
|||
Historically keys using the same algorithm could use different OIDs.
|
||||
The following deprecated aliases are still supported:
|
||||
.Pp
|
||||
.Bl -column -compact -offset 2n EVP_PKEY_GOSTR12_ NID_id_tc26_gost3410_2012_512
|
||||
.Bl -column -compact -offset 2n EVP_PKEY_DSA4 NID_dsaWithSHA1_2
|
||||
.It Sy return value Ta Ta Sy alias for
|
||||
.It Dv EVP_PKEY_DSA1 Ta = Dv NID_dsa_2 Ta DSA
|
||||
.It Dv EVP_PKEY_DSA2 Ta = Dv NID_dsaWithSHA Ta DSA
|
||||
|
|
Loading…
Add table
Add a link
Reference in a new issue