From 9026f3119d0fb71e88abcced3e32e113044416c2 Mon Sep 17 00:00:00 2001
From: schwarze <>
Date: Fri, 6 Dec 2024 15:01:01 +0000
Subject: Adjust the return type and value of EVP_MD_CTX_init(3) and
 EVP_CIPHER_CTX_init(3) after tb@ changed these to OpenSSL 1.1 semantics in
 evp.h rev. 1.124 on March 2 this year.

---
 src/lib/libcrypto/man/EVP_CIPHER_CTX_init.3 | 12 ++++++++----
 src/lib/libcrypto/man/EVP_DigestInit.3      |  7 ++++---
 2 files changed, 12 insertions(+), 7 deletions(-)

(limited to 'src')

diff --git a/src/lib/libcrypto/man/EVP_CIPHER_CTX_init.3 b/src/lib/libcrypto/man/EVP_CIPHER_CTX_init.3
index f328fc05b2..79a8e540af 100644
--- a/src/lib/libcrypto/man/EVP_CIPHER_CTX_init.3
+++ b/src/lib/libcrypto/man/EVP_CIPHER_CTX_init.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_CIPHER_CTX_init.3,v 1.3 2023/12/26 22:13:00 schwarze Exp $
+.\" $OpenBSD: EVP_CIPHER_CTX_init.3,v 1.4 2024/12/06 15:01:01 schwarze Exp $
 .\" full merge up to:
 .\" OpenSSL EVP_EncryptInit.pod 0874d7f2 Oct 11 13:13:47 2022 +0100
 .\"
@@ -68,7 +68,7 @@
 .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED
 .\" OF THE POSSIBILITY OF SUCH DAMAGE.
 .\"
-.Dd $Mdocdate: December 26 2023 $
+.Dd $Mdocdate: December 6 2024 $
 .Dt EVP_CIPHER_CTX_INIT 3
 .Os
 .Sh NAME
@@ -78,7 +78,7 @@
 .Nd obsolete EVP cipher functions
 .Sh SYNOPSIS
 .In openssl/evp.h
-.Ft void
+.Ft int
 .Fo EVP_CIPHER_CTX_init
 .Fa "EVP_CIPHER_CTX *ctx"
 .Fc
@@ -102,7 +102,8 @@ was made opaque.
 Calling it on a cipher context just returned from
 .Xr EVP_CIPHER_CTX_new 3
 has no effect.
-Calling it on a cipher context that was already used leaks memory.
+Calling it on a cipher context that was already used may leak memory
+with older versions of the library.
 Instead, use
 .Xr EVP_CIPHER_CTX_reset 3
 or
@@ -173,6 +174,9 @@ the overhead incurred by using
 .Xr EVP_CipherUpdate 3
 is minimal.
 .Sh RETURN VALUES
+.Fn EVP_CIPHER_CTX_init
+always returns 1.
+.Pp
 .Fn EVP_CIPHER_CTX_cleanup
 returns 1 for success or 0 for failure.
 .Pp
diff --git a/src/lib/libcrypto/man/EVP_DigestInit.3 b/src/lib/libcrypto/man/EVP_DigestInit.3
index 2b93f7fcb2..668c189bc1 100644
--- a/src/lib/libcrypto/man/EVP_DigestInit.3
+++ b/src/lib/libcrypto/man/EVP_DigestInit.3
@@ -1,4 +1,4 @@
-.\" $OpenBSD: EVP_DigestInit.3,v 1.36 2024/12/06 14:27:49 schwarze Exp $
+.\" $OpenBSD: EVP_DigestInit.3,v 1.37 2024/12/06 15:01:01 schwarze 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
 .\"
@@ -114,7 +114,7 @@
 .Fo EVP_MD_CTX_free
 .Fa "EVP_MD_CTX *ctx"
 .Fc
-.Ft void
+.Ft int
 .Fo EVP_MD_CTX_init
 .Fa "EVP_MD_CTX *ctx"
 .Fc
@@ -427,7 +427,8 @@ object or
 .Dv NULL
 for failure.
 .Pp
-.Fn EVP_MD_CTX_reset
+.Fn EVP_MD_CTX_reset ,
+.Fn EVP_MD_CTX_init ,
 and
 .Fn EVP_MD_CTX_cleanup
 always return 1.
-- 
cgit v1.2.3-55-g6feb