summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorRich Salz <rsalz@openssl.org>2016-05-30 15:01:09 -0400
committerRich Salz <rsalz@openssl.org>2016-06-14 15:04:33 -0400
commit95fb422aceea9f48e3f5f04c745801fcbf953012 (patch)
tree19231c70da535e01b2146610754b9ca2f88012d4
parentc4210673313482edacede58d92e92c213d7a181a (diff)
RT4546: Backport doc fix
Reviewed-by: Matt Caswell <matt@openssl.org> Manual cherry-pick of 538860a3ce0b9fd142a7f1a62e597cccb74475d3.
-rw-r--r--doc/crypto/EVP_EncryptInit.pod9
1 files changed, 5 insertions, 4 deletions
diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod
index c69e6a6d70..d9513338d8 100644
--- a/doc/crypto/EVP_EncryptInit.pod
+++ b/doc/crypto/EVP_EncryptInit.pod
@@ -165,10 +165,11 @@ similar way to EVP_EncryptInit_ex(), EVP_DecryptInit_ex and
EVP_CipherInit_ex() except the B<ctx> parameter does not need to be
initialized and they always use the default cipher implementation.
-EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a
-similar way to EVP_EncryptFinal_ex(), EVP_DecryptFinal_ex() and
-EVP_CipherFinal_ex() except B<ctx> is automatically cleaned up
-after the call.
+EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() are
+identical to EVP_EncryptFinal_ex(), EVP_DecryptFinal_ex() and
+EVP_CipherFinal_ex(). In previous releases they also cleaned up
+the B<ctx>, but this is no longer done and EVP_CIPHER_CTX_clean()
+must be called to free any context resources.
EVP_get_cipherbyname(), EVP_get_cipherbynid() and EVP_get_cipherbyobj()
return an EVP_CIPHER structure when passed a cipher name, a NID or an