1 files changed, 44 insertions, 2 deletions
diff --git a/src/lib/libcrypto/man/EVP_EncryptInit.3 b/src/lib/libcrypto/man/EVP_EncryptInit.3
index 10d30c4cf0..bb2457d9e0 100644
--- a/src/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/src/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_EncryptInit.3,v 1.28 2019/03/18 11:38:16 schwarze Exp $
+.\" $OpenBSD: EVP_EncryptInit.3,v 1.29 2019/03/19 19:50:03 schwarze Exp $
 .\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
 .\" selective merge up to: OpenSSL 16cfc2c9 Mar 8 22:30:28 2018 +0100
 .\"
@@ -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 18 2019 $
+.Dd $Mdocdate: March 19 2019 $
 .Dt EVP_ENCRYPTINIT 3
 .Os
 .Sh NAME
@@ -75,6 +75,9 @@
 .Nm EVP_DecryptFinal ,
 .Nm EVP_CipherInit ,
 .Nm EVP_CipherFinal ,
+.Nm EVP_CIPHER_CTX_set_flags ,
+.Nm EVP_CIPHER_CTX_clear_flags ,
+.Nm EVP_CIPHER_CTX_test_flags ,
 .Nm EVP_CIPHER_CTX_set_padding ,
 .Nm EVP_CIPHER_CTX_set_key_length ,
 .Nm EVP_CIPHER_CTX_ctrl ,
@@ -267,6 +270,21 @@
 .Fa "unsigned char *outm"
 .Fa "int *outl"
 .Fc
+.Ft void
+.Fo EVP_CIPHER_CTX_set_flags
+.Fa "EVP_CIPHER_CTX *ctx"
+.Fa "int flags"
+.Fc
+.Ft void
+.Fo EVP_CIPHER_CTX_clear_flags
+.Fa "EVP_CIPHER_CTX *ctx"
+.Fa "int flags"
+.Fc
+.Ft int
+.Fo EVP_CIPHER_CTX_test_flags
+.Fa "EVP_CIPHER_CTX *ctx"
+.Fa "int flags"
+.Fc
 .Ft int
 .Fo EVP_CIPHER_CTX_set_padding
 .Fa "EVP_CIPHER_CTX *x"
@@ -595,6 +613,30 @@ structure.
 The actual NID value is an internal value which may not have a
 corresponding OBJECT IDENTIFIER.
 .Pp
+.Fn EVP_CIPHER_CTX_set_flags
+enables the given
+.Fa flags
+in
+.Fa ctx .
+.Fn EVP_CIPHER_CTX_clear_flags
+disables the given
+.Fa flags
+in
+.Fa ctx .
+.Fn EVP_CIPHER_CTX_test_flags
+checks whether any of the given
+.Fa flags
+are currently set in
+.Fa ctx ,
+returning the subset of the
+.Fa flags
+that are set, or 0 if none of them are set.
+Currently, the only supported cipher context flag is
+.Dv EVP_CIPHER_CTX_FLAG_WRAP_ALLOW ;
+see
+.Xr EVP_aes_128_wrap 3
+for details.
+.Pp
 .Fn EVP_CIPHER_CTX_set_padding
 enables or disables padding.
 This function should be called after the context is set up for

diff --git a/src/lib/libcrypto/man/EVP_EncryptInit.3 b/src/lib/libcrypto/man/EVP_EncryptInit.3 index 10d30c4cf0..bb2457d9e0 100644 --- a/src/lib/libcrypto/man/EVP_EncryptInit.3 +++ b/src/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
1	.\" $OpenBSD: EVP_EncryptInit.3,v 1.28 2019/03/18 11:38:16 schwarze Exp $	1	.\" $OpenBSD: EVP_EncryptInit.3,v 1.29 2019/03/19 19:50:03 schwarze Exp $
2	.\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800	2	.\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
3	.\" selective merge up to: OpenSSL 16cfc2c9 Mar 8 22:30:28 2018 +0100	3	.\" selective merge up to: OpenSSL 16cfc2c9 Mar 8 22:30:28 2018 +0100
4	.\"	4	.\"
@@ -51,7 +51,7 @@
51	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED	51	.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
52	.\" OF THE POSSIBILITY OF SUCH DAMAGE.	52	.\" OF THE POSSIBILITY OF SUCH DAMAGE.
53	.\"	53	.\"
54	.Dd $Mdocdate: March 18 2019 $	54	.Dd $Mdocdate: March 19 2019 $
55	.Dt EVP_ENCRYPTINIT 3	55	.Dt EVP_ENCRYPTINIT 3
56	.Os	56	.Os
57	.Sh NAME	57	.Sh NAME
@@ -75,6 +75,9 @@
75	.Nm EVP_DecryptFinal ,	75	.Nm EVP_DecryptFinal ,
76	.Nm EVP_CipherInit ,	76	.Nm EVP_CipherInit ,
77	.Nm EVP_CipherFinal ,	77	.Nm EVP_CipherFinal ,
		78	.Nm EVP_CIPHER_CTX_set_flags ,
		79	.Nm EVP_CIPHER_CTX_clear_flags ,
		80	.Nm EVP_CIPHER_CTX_test_flags ,
78	.Nm EVP_CIPHER_CTX_set_padding ,	81	.Nm EVP_CIPHER_CTX_set_padding ,
79	.Nm EVP_CIPHER_CTX_set_key_length ,	82	.Nm EVP_CIPHER_CTX_set_key_length ,
80	.Nm EVP_CIPHER_CTX_ctrl ,	83	.Nm EVP_CIPHER_CTX_ctrl ,
@@ -267,6 +270,21 @@
267	.Fa "unsigned char *outm"	270	.Fa "unsigned char *outm"
268	.Fa "int *outl"	271	.Fa "int *outl"
269	.Fc	272	.Fc
		273	.Ft void
		274	.Fo EVP_CIPHER_CTX_set_flags
		275	.Fa "EVP_CIPHER_CTX *ctx"
		276	.Fa "int flags"
		277	.Fc
		278	.Ft void
		279	.Fo EVP_CIPHER_CTX_clear_flags
		280	.Fa "EVP_CIPHER_CTX *ctx"
		281	.Fa "int flags"
		282	.Fc
		283	.Ft int
		284	.Fo EVP_CIPHER_CTX_test_flags
		285	.Fa "EVP_CIPHER_CTX *ctx"
		286	.Fa "int flags"
		287	.Fc
270	.Ft int	288	.Ft int
271	.Fo EVP_CIPHER_CTX_set_padding	289	.Fo EVP_CIPHER_CTX_set_padding
272	.Fa "EVP_CIPHER_CTX *x"	290	.Fa "EVP_CIPHER_CTX *x"
@@ -595,6 +613,30 @@ structure.
595	The actual NID value is an internal value which may not have a	613	The actual NID value is an internal value which may not have a
596	corresponding OBJECT IDENTIFIER.	614	corresponding OBJECT IDENTIFIER.
597	.Pp	615	.Pp
		616	.Fn EVP_CIPHER_CTX_set_flags
		617	enables the given
		618	.Fa flags
		619	in
		620	.Fa ctx .
		621	.Fn EVP_CIPHER_CTX_clear_flags
		622	disables the given
		623	.Fa flags
		624	in
		625	.Fa ctx .
		626	.Fn EVP_CIPHER_CTX_test_flags
		627	checks whether any of the given
		628	.Fa flags
		629	are currently set in
		630	.Fa ctx ,
		631	returning the subset of the
		632	.Fa flags
		633	that are set, or 0 if none of them are set.
		634	Currently, the only supported cipher context flag is
		635	.Dv EVP_CIPHER_CTX_FLAG_WRAP_ALLOW ;
		636	see
		637	.Xr EVP_aes_128_wrap 3
		638	for details.
		639	.Pp
598	.Fn EVP_CIPHER_CTX_set_padding	640	.Fn EVP_CIPHER_CTX_set_padding
599	enables or disables padding.	641	enables or disables padding.
600	This function should be called after the context is set up for	642	This function should be called after the context is set up for