import EVP_camellia_128_cbc(3) from OpenSSL 1.1.1,

still under a free license, tweaked by me

4 files changed, 156 insertions, 3 deletions

diff --git a/lib/libcrypto/man/EVP_EncryptInit.3 b/lib/libcrypto/man/EVP_EncryptInit.3
index ead07dbb2b4..5109e2e50ed 100644
--- a/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/lib/libcrypto/man/EVP_EncryptInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_EncryptInit.3,v 1.33 2019/03/21 13:37:25 schwarze Exp $
+.\" $OpenBSD: EVP_EncryptInit.3,v 1.34 2019/03/21 14:15:13 schwarze Exp $
 .\" full merge up to: OpenSSL 5211e094 Nov 11 14:39:11 2014 -0800
 .\"   EVP_bf_cbc.pod EVP_cast5_cbc.pod EVP_idea_cbc.pod EVP_rc2_cbc.pod
 .\"   7c6d372a Nov 20 13:20:01 2018 +0000
@@ -986,6 +986,7 @@ The key length is 256 bits, the IV is 96 bits long.
 .Pp
 See also
 .Xr EVP_aes_128_cbc 3 ,
+.Xr EVP_camellia_128_cbc 3 ,
 .Xr EVP_des_cbc 3 ,
 .Xr EVP_rc4 3 ,
 and
@@ -1194,6 +1195,7 @@ do_crypt(FILE *in, FILE *out, int do_encrypt)
 .Sh SEE ALSO
 .Xr evp 3 ,
 .Xr EVP_aes_128_cbc 3 ,
+.Xr EVP_camellia_128_cbc 3 ,
 .Xr EVP_des_cbc 3 ,
 .Xr EVP_rc4 3 ,
 .Xr EVP_sm4_cbc 3
diff --git a/lib/libcrypto/man/EVP_camellia_128_cbc.3 b/lib/libcrypto/man/EVP_camellia_128_cbc.3
new file mode 100644
index 00000000000..dd7f15d86c5
--- /dev/null
+++ b/lib/libcrypto/man/EVP_camellia_128_cbc.3
@@ -0,0 +1,149 @@
+.\" $OpenBSD: EVP_camellia_128_cbc.3,v 1.1 2019/03/21 14:15:13 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>
+.\" Copyright (c) 2017 The OpenSSL Project.  All rights reserved.
+.\"
+.\" Redistribution and use in source and binary forms, with or without
+.\" modification, are permitted provided that the following conditions
+.\" are met:
+.\"
+.\" 1. Redistributions of source code must retain the above copyright
+.\"    notice, this list of conditions and the following disclaimer.
+.\"
+.\" 2. Redistributions in binary form must reproduce the above copyright
+.\"    notice, this list of conditions and the following disclaimer in
+.\"    the documentation and/or other materials provided with the
+.\"    distribution.
+.\"
+.\" 3. All advertising materials mentioning features or use of this
+.\"    software must display the following acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"
+.\"
+.\" 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to
+.\"    endorse or promote products derived from this software without
+.\"    prior written permission. For written permission, please contact
+.\"    openssl-core@openssl.org.
+.\"
+.\" 5. Products derived from this software may not be called "OpenSSL"
+.\"    nor may "OpenSSL" appear in their names without prior written
+.\"    permission of the OpenSSL Project.
+.\"
+.\" 6. Redistributions of any form whatsoever must retain the following
+.\"    acknowledgment:
+.\"    "This product includes software developed by the OpenSSL Project
+.\"    for use in the OpenSSL Toolkit (http://www.openssl.org/)"
+.\"
+.\" THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY
+.\" EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE
+.\" IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR
+.\" PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR
+.\" ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,
+.\" SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT
+.\" NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;
+.\" LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)
+.\" HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,
+.\" STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)
+.\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
+.\" OF THE POSSIBILITY OF SUCH DAMAGE.
+.\"
+.Dd $Mdocdate: March 21 2019 $
+.Dt EVP_CAMELLIA_128_CBC 3
+.Os
+.Sh NAME
+.Nm EVP_camellia_128_cbc ,
+.Nm EVP_camellia_192_cbc ,
+.Nm EVP_camellia_256_cbc ,
+.Nm EVP_camellia_128_cfb ,
+.Nm EVP_camellia_192_cfb ,
+.Nm EVP_camellia_256_cfb ,
+.Nm EVP_camellia_128_cfb1 ,
+.Nm EVP_camellia_192_cfb1 ,
+.Nm EVP_camellia_256_cfb1 ,
+.Nm EVP_camellia_128_cfb8 ,
+.Nm EVP_camellia_192_cfb8 ,
+.Nm EVP_camellia_256_cfb8 ,
+.Nm EVP_camellia_128_cfb128 ,
+.Nm EVP_camellia_192_cfb128 ,
+.Nm EVP_camellia_256_cfb128 ,
+.Nm EVP_camellia_128_ecb ,
+.Nm EVP_camellia_192_ecb ,
+.Nm EVP_camellia_256_ecb ,
+.Nm EVP_camellia_128_ofb ,
+.Nm EVP_camellia_192_ofb ,
+.Nm EVP_camellia_256_ofb
+.Nd EVP Camellia cipher
+.Sh SYNOPSIS
+.In openssl/evp.h
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_128_cbc void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_192_cbc void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_256_cbc void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_128_cfb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_192_cfb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_256_cfb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_128_cfb1 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_192_cfb1 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_256_cfb1 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_128_cfb8 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_192_cfb8 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_256_cfb8 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_128_cfb128 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_192_cfb128 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_256_cfb128 void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_128_ecb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_192_ecb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_256_ecb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_128_ofb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_192_ofb void
+.Ft const EVP_CIPHER *
+.Fn EVP_camellia_256_ofb void
+.Sh DESCRIPTION
+These functions provide the Camellia encryption algorithm in the
+.Xr evp 3
+framework.
+They use 128, 192, and 256 bit keys in the following modes, respectively:
+CBC, CFB with 1-bit shift, CFB with 8-bit shift, CFB with 128-bit shift,
+ECB, and OFB.
+.Pp
+.Fn EVP_camellia_128_cfb ,
+.Fn EVP_camellia_192_cfb ,
+and
+.Fn EVP_camellia_256_cfb
+are aliases for
+.Fn EVP_camellia_128_cfb128 ,
+.Fn EVP_camellia_192_cfb128 ,
+and
+.Fn EVP_camellia_256_cfb128 ,
+implemented as macros.
+.Sh RETURN VALUES
+These functions return an
+.Vt EVP_CIPHER
+structure that provides the implementation of the symmetric cipher.
+.Sh SEE ALSO
+.Xr evp 3 ,
+.Xr EVP_EncryptInit 3
+.Sh HISTORY
+These functions first appeared in OpenSSL 0.9.8c
+and have been available since
+.Ox 4.5 .
diff --git a/lib/libcrypto/man/Makefile b/lib/libcrypto/man/Makefile
index 08888f9fefc..a9adb07f27d 100644
--- a/lib/libcrypto/man/Makefile
+++ b/lib/libcrypto/man/Makefile
@@ -1,4 +1,4 @@
-# $OpenBSD: Makefile,v 1.147 2019/03/21 13:37:25 schwarze Exp $
+# $OpenBSD: Makefile,v 1.148 2019/03/21 14:15:13 schwarze Exp $
 
 .include <bsd.own.mk>
 
@@ -152,6 +152,7 @@ MAN=	\
 	EVP_SignInit.3 \
 	EVP_VerifyInit.3 \
 	EVP_aes_128_cbc.3 \
+	EVP_camellia_128_cbc.3 \
 	EVP_des_cbc.3 \
 	EVP_rc4.3 \
 	EVP_sm4_cbc.3 \
diff --git a/lib/libcrypto/man/evp.3 b/lib/libcrypto/man/evp.3
index 27ecaced4ef..8ea9c78de03 100644
--- a/lib/libcrypto/man/evp.3
+++ b/lib/libcrypto/man/evp.3
@@ -1,4 +1,4 @@
-.\"	$OpenBSD: evp.3,v 1.9 2019/03/21 13:37:25 schwarze Exp $
+.\"	$OpenBSD: evp.3,v 1.10 2019/03/21 14:15:13 schwarze Exp $
 .\"	OpenSSL a9c85cea Nov 11 09:33:55 2016 +0100
 .\"
 .\" This file was written by Ulf Moeller <ulf@openssl.org>,
@@ -184,6 +184,7 @@ operations are more efficient using the high level interfaces.
 .Xr EVP_AEAD_CTX_init 3 ,
 .Xr EVP_aes_128_cbc 3 ,
 .Xr EVP_BytesToKey 3 ,
+.Xr EVP_camellia_128_cbc 3 ,
 .Xr EVP_des_cbc 3 ,
 .Xr EVP_DigestInit 3 ,
 .Xr EVP_DigestSignInit 3 ,