new manual page AES_encrypt(3)

4 files changed, 181 insertions, 5 deletions

diff --git a/src/lib/libcrypto/man/AES_encrypt.3 b/src/lib/libcrypto/man/AES_encrypt.3
new file mode 100644
index 0000000000..f022848a61
--- /dev/null
+++ b/src/lib/libcrypto/man/AES_encrypt.3
@@ -0,0 +1,173 @@
+.\" $OpenBSD: AES_encrypt.3,v 1.1 2019/08/28 10:37:42 schwarze Exp $
+.\"
+.\" Copyright (c) 2019 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
+.\" copyright notice and this permission notice appear in all copies.
+.\"
+.\" THE SOFTWARE IS PROVIDED "AS IS" AND THE AUTHOR DISCLAIMS ALL WARRANTIES
+.\" WITH REGARD TO THIS SOFTWARE INCLUDING ALL IMPLIED WARRANTIES OF
+.\" MERCHANTABILITY AND FITNESS. IN NO EVENT SHALL THE AUTHOR BE LIABLE FOR
+.\" ANY SPECIAL, DIRECT, INDIRECT, OR CONSEQUENTIAL DAMAGES OR ANY DAMAGES
+.\" WHATSOEVER RESULTING FROM LOSS OF USE, DATA OR PROFITS, WHETHER IN AN
+.\" ACTION OF CONTRACT, NEGLIGENCE OR OTHER TORTIOUS ACTION, ARISING OUT OF
+.\" OR IN CONNECTION WITH THE USE OR PERFORMANCE OF THIS SOFTWARE.
+.\"
+.Dd $Mdocdate: August 28 2019 $
+.Dt AES_ENCRYPT 3
+.Os
+.Sh NAME
+.Nm AES_set_encrypt_key ,
+.Nm AES_set_decrypt_key ,
+.Nm AES_encrypt ,
+.Nm AES_decrypt ,
+.Nm AES_cbc_encrypt
+.Nd low-level interface to the AES symmetric cipher
+.Sh SYNOPSIS
+.In openssl/aes.h
+.Ft int
+.Fo AES_set_encrypt_key
+.Fa "const unsigned char *userKey"
+.Fa "const int bits"
+.Fa "AES_KEY *key"
+.Fc
+.Ft int
+.Fo AES_set_decrypt_key
+.Fa "const unsigned char *userKey"
+.Fa "const int bits"
+.Fa "AES_KEY *key"
+.Fc
+.Ft void
+.Fo AES_encrypt
+.Fa "const unsigned char *in"
+.Fa "unsigned char *out"
+.Fa "const AES_KEY *key"
+.Fc
+.Ft void
+.Fo AES_decrypt
+.Fa "const unsigned char *in"
+.Fa "unsigned char *out"
+.Fa "const AES_KEY *key"
+.Fc
+.Ft void
+.Fo AES_cbc_encrypt
+.Fa "const unsigned char *in"
+.Fa "unsigned char *out"
+.Fa "size_t length"
+.Fa "const AES_KEY *key"
+.Fa "unsigned char *ivec"
+.Fa "const int enc"
+.Fc
+.Sh DESCRIPTION
+These function provide a low-level interface to the AES symmetric
+cipher algorithm, also called Rijndael.
+For reasons of flexibility, it is recommended that application
+programs use the high-level interface described in
+.Xr EVP_EncryptInit 3
+and
+.Xr EVP_aes_128_cbc 3
+instead whenever possible.
+.Pp
+.Vt AES_KEY
+is a structure that can hold up to 60
+.Vt int
+values and a number of rounds.
+.Pp
+.Fn AES_set_encrypt_key
+expands the
+.Fa userKey ,
+which is
+.Fa bits
+long, into the
+.Fa key
+structure to prepare for encryption.
+The number of bits and bytes read from
+.Fa userKey ,
+the number of
+.Vt int
+values stored into
+.Fa key ,
+and the number of rounds are as follows:
+.Pp
+.Bl -column bits bytes ints rounds -offset indent -compact
+.It bits Ta bytes Ta ints Ta rounds
+.It 128  Ta 16    Ta 44   Ta 10
+.It 192  Ta 24    Ta 52   Ta 12
+.It 256  Ta 32    Ta 60   Ta 14
+.El
+.Pp
+.Fn AES_set_decrypt_key
+does the same, but in preparation for decryption.
+.Pp
+.Fn AES_encrypt
+reads a single 16 byte block from
+.Pf * Fa in ,
+encrypts it with the
+.Fa key ,
+and writes the 16 resulting bytes to
+.Pf * Fa out .
+The 16 byte buffers starting at
+.Fa in
+and
+.Fa out
+can overlap, and
+.Fa in
+and
+.Fa out
+can even point to the same memory location.
+.Pp
+.Fn AES_decrypt
+decrypts a single block and is otherwise identical to
+.Fn AES_encrypt .
+.Pp
+If
+.Fa enc
+is non-zero,
+.Fn AES_cbc_encrypt
+encrypts
+.Fa len
+bytes at
+.Fa in
+to
+.Fa out
+using the 128 bit
+.Fa key
+and the 128 bit
+initialization vector
+.Fa ivec
+in CBC mode.
+If
+.Fa enc
+is 0,
+.Fn AES_cbc_encrypt
+performs the corresponding decryption.
+.Sh RETURN VALUES
+.Fn AES_set_encrypt_key
+and
+.Fn AES_set_decrypt_key
+return 0 for success, -1 if
+.Fa userKey
+or
+.Fa key
+is
+.Dv NULL ,
+or -2 if the number of
+.Fa bits
+is unsupported.
+.Sh SEE ALSO
+.Xr crypto 3 ,
+.Xr EVP_aes_128_cbc 3 ,
+.Xr EVP_EncryptInit 3
+.Sh STANDARDS
+ISO/IEC 18033-3:2010
+Information technology \(em Security techniques \(em
+Encryption algorithms \(em Part 3: Block ciphers
+.Sh HISTORY
+These functions first appeared in OpenSSL 0.9.7
+and have been available since
+.Ox 3.2 .
+.Sh AUTHORS
+.An Vincent Rijmen
+.An Antoon Bosselaers
+.An Paulo Barreto
diff --git a/src/lib/libcrypto/man/EVP_aes_128_cbc.3 b/src/lib/libcrypto/man/EVP_aes_128_cbc.3
index be8e5ff75b..f25df8c7eb 100644
--- a/src/lib/libcrypto/man/EVP_aes_128_cbc.3
+++ b/src/lib/libcrypto/man/EVP_aes_128_cbc.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_aes_128_cbc.3,v 1.2 2019/03/19 19:50:03 schwarze Exp $
+.\" $OpenBSD: EVP_aes_128_cbc.3,v 1.3 2019/08/28 10:37:42 schwarze Exp $
 .\" selective merge up to: OpenSSL 7c6d372a Nov 20 13:20:01 2018 +0000
 .\"
 .\" This file was written by Ronald Tse <ronald.tse@ribose.com>
@@ -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 19 2019 $
+.Dd $Mdocdate: August 28 2019 $
 .Dt EVP_AES_128_CBC 3
 .Os
 .Sh NAME
@@ -279,6 +279,7 @@ These functions return an
 .Vt EVP_CIPHER
 structure that provides the implementation of the symmetric cipher.
 .Sh SEE ALSO
+.Xr AES_encrypt 3 ,
 .Xr evp 3 ,
 .Xr EVP_EncryptInit 3
 .Sh HISTORY
diff --git a/src/lib/libcrypto/man/Makefile b/src/lib/libcrypto/man/Makefile
index 2938a65cda..840be62d72 100644
--- a/src/lib/libcrypto/man/Makefile
+++ b/src/lib/libcrypto/man/Makefile
@@ -1,9 +1,10 @@
-# $OpenBSD: Makefile,v 1.157 2019/08/26 11:41:31 schwarze Exp $
+# $OpenBSD: Makefile,v 1.158 2019/08/28 10:37:42 schwarze Exp $
 
 .include <bsd.own.mk>
 
 MAN=    \
         ACCESS_DESCRIPTION_new.3 \
+        AES_encrypt.3 \
         ASN1_INTEGER_get.3 \
         ASN1_OBJECT_new.3 \
         ASN1_STRING_length.3 \
diff --git a/src/lib/libcrypto/man/crypto.3 b/src/lib/libcrypto/man/crypto.3
index bd244ebf4b..f589c6bb0c 100644
--- a/src/lib/libcrypto/man/crypto.3
+++ b/src/lib/libcrypto/man/crypto.3
@@ -1,4 +1,4 @@
-.\"     $OpenBSD: crypto.3,v 1.21 2019/08/19 13:08:26 schwarze Exp $
+.\"     $OpenBSD: crypto.3,v 1.22 2019/08/28 10:37:42 schwarze Exp $
 .\"     OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org> and
@@ -49,7 +49,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: August 19 2019 $
+.Dd $Mdocdate: August 28 2019 $
 .Dt CRYPTO 3
 .Os
 .Sh NAME
@@ -67,6 +67,7 @@ including AES, Blowfish, CAST, Chacha20, IDEA, DES, RC2, and RC4
 are provided by the generic interface
 .Xr EVP_EncryptInit 3 .
 Low-level stand-alone interfaces include
+.Xr AES_encrypt 3 ,
 .Xr BF_set_key 3 ,
 .Xr DES_set_key 3 ,
 and