diff options
author | schwarze <> | 2024-12-06 15:01:01 +0000 |
---|---|---|
committer | schwarze <> | 2024-12-06 15:01:01 +0000 |
commit | 9026f3119d0fb71e88abcced3e32e113044416c2 (patch) | |
tree | 0042e938291ae3ae765989543da67b3f6f0a597c /src | |
parent | eced54870588db8076b1f1d7056ec7ad5e00d939 (diff) | |
download | openbsd-9026f3119d0fb71e88abcced3e32e113044416c2.tar.gz openbsd-9026f3119d0fb71e88abcced3e32e113044416c2.tar.bz2 openbsd-9026f3119d0fb71e88abcced3e32e113044416c2.zip |
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.
Diffstat (limited to 'src')
-rw-r--r-- | src/lib/libcrypto/man/EVP_CIPHER_CTX_init.3 | 12 | ||||
-rw-r--r-- | src/lib/libcrypto/man/EVP_DigestInit.3 | 7 |
2 files changed, 12 insertions, 7 deletions
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 @@ | |||
1 | .\" $OpenBSD: EVP_CIPHER_CTX_init.3,v 1.3 2023/12/26 22:13:00 schwarze Exp $ | 1 | .\" $OpenBSD: EVP_CIPHER_CTX_init.3,v 1.4 2024/12/06 15:01:01 schwarze Exp $ |
2 | .\" full merge up to: | 2 | .\" full merge up to: |
3 | .\" OpenSSL EVP_EncryptInit.pod 0874d7f2 Oct 11 13:13:47 2022 +0100 | 3 | .\" OpenSSL EVP_EncryptInit.pod 0874d7f2 Oct 11 13:13:47 2022 +0100 |
4 | .\" | 4 | .\" |
@@ -68,7 +68,7 @@ | |||
68 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED | 68 | .\" ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED |
69 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. | 69 | .\" OF THE POSSIBILITY OF SUCH DAMAGE. |
70 | .\" | 70 | .\" |
71 | .Dd $Mdocdate: December 26 2023 $ | 71 | .Dd $Mdocdate: December 6 2024 $ |
72 | .Dt EVP_CIPHER_CTX_INIT 3 | 72 | .Dt EVP_CIPHER_CTX_INIT 3 |
73 | .Os | 73 | .Os |
74 | .Sh NAME | 74 | .Sh NAME |
@@ -78,7 +78,7 @@ | |||
78 | .Nd obsolete EVP cipher functions | 78 | .Nd obsolete EVP cipher functions |
79 | .Sh SYNOPSIS | 79 | .Sh SYNOPSIS |
80 | .In openssl/evp.h | 80 | .In openssl/evp.h |
81 | .Ft void | 81 | .Ft int |
82 | .Fo EVP_CIPHER_CTX_init | 82 | .Fo EVP_CIPHER_CTX_init |
83 | .Fa "EVP_CIPHER_CTX *ctx" | 83 | .Fa "EVP_CIPHER_CTX *ctx" |
84 | .Fc | 84 | .Fc |
@@ -102,7 +102,8 @@ was made opaque. | |||
102 | Calling it on a cipher context just returned from | 102 | Calling it on a cipher context just returned from |
103 | .Xr EVP_CIPHER_CTX_new 3 | 103 | .Xr EVP_CIPHER_CTX_new 3 |
104 | has no effect. | 104 | has no effect. |
105 | Calling it on a cipher context that was already used leaks memory. | 105 | Calling it on a cipher context that was already used may leak memory |
106 | with older versions of the library. | ||
106 | Instead, use | 107 | Instead, use |
107 | .Xr EVP_CIPHER_CTX_reset 3 | 108 | .Xr EVP_CIPHER_CTX_reset 3 |
108 | or | 109 | or |
@@ -173,6 +174,9 @@ the overhead incurred by using | |||
173 | .Xr EVP_CipherUpdate 3 | 174 | .Xr EVP_CipherUpdate 3 |
174 | is minimal. | 175 | is minimal. |
175 | .Sh RETURN VALUES | 176 | .Sh RETURN VALUES |
177 | .Fn EVP_CIPHER_CTX_init | ||
178 | always returns 1. | ||
179 | .Pp | ||
176 | .Fn EVP_CIPHER_CTX_cleanup | 180 | .Fn EVP_CIPHER_CTX_cleanup |
177 | returns 1 for success or 0 for failure. | 181 | returns 1 for success or 0 for failure. |
178 | .Pp | 182 | .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 @@ | |||
1 | .\" $OpenBSD: EVP_DigestInit.3,v 1.36 2024/12/06 14:27:49 schwarze Exp $ | 1 | .\" $OpenBSD: EVP_DigestInit.3,v 1.37 2024/12/06 15:01:01 schwarze Exp $ |
2 | .\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000 | 2 | .\" full merge up to: OpenSSL 7f572e95 Dec 2 13:57:04 2015 +0000 |
3 | .\" selective merge up to: OpenSSL 24a535ea Sep 22 13:14:20 2020 +0100 | 3 | .\" selective merge up to: OpenSSL 24a535ea Sep 22 13:14:20 2020 +0100 |
4 | .\" | 4 | .\" |
@@ -114,7 +114,7 @@ | |||
114 | .Fo EVP_MD_CTX_free | 114 | .Fo EVP_MD_CTX_free |
115 | .Fa "EVP_MD_CTX *ctx" | 115 | .Fa "EVP_MD_CTX *ctx" |
116 | .Fc | 116 | .Fc |
117 | .Ft void | 117 | .Ft int |
118 | .Fo EVP_MD_CTX_init | 118 | .Fo EVP_MD_CTX_init |
119 | .Fa "EVP_MD_CTX *ctx" | 119 | .Fa "EVP_MD_CTX *ctx" |
120 | .Fc | 120 | .Fc |
@@ -427,7 +427,8 @@ object or | |||
427 | .Dv NULL | 427 | .Dv NULL |
428 | for failure. | 428 | for failure. |
429 | .Pp | 429 | .Pp |
430 | .Fn EVP_MD_CTX_reset | 430 | .Fn EVP_MD_CTX_reset , |
431 | .Fn EVP_MD_CTX_init , | ||
431 | and | 432 | and |
432 | .Fn EVP_MD_CTX_cleanup | 433 | .Fn EVP_MD_CTX_cleanup |
433 | always return 1. | 434 | always return 1. |