The branch master has been updated
via 338ead0ff9b22aecbc3b28e37ea05d142e13ee13 (commit)
from fe4f66d262819b8af1c459dbdcab87f0fe76a551 (commit)
- Log -----------------------------------------------------------------
commit 338ead0ff9b22aecbc3b28e37ea05d142e13ee13
Author: Patrick Steuer <[email protected]>
Date: Mon Oct 9 12:16:34 2017 +0200
EVP_EncryptInit.pod: EVP_CIPHER_mode and EVP_CIPHER_CTX_mode update
Mention CTR, GCM, CCM, OCB, WRAP and XTS modes.
Signed-off-by: Patrick Steuer <[email protected]>
Reviewed-by: Paul Dale <[email protected]>
Reviewed-by: Rich Salz <[email protected]>
(Merged from https://github.com/openssl/openssl/pull/4498)
-----------------------------------------------------------------------
Summary of changes:
doc/man3/EVP_EncryptInit.pod | 5 +++--
1 file changed, 3 insertions(+), 2 deletions(-)
diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod
index 0aaba05..b3acb0c 100644
--- a/doc/man3/EVP_EncryptInit.pod
+++ b/doc/man3/EVP_EncryptInit.pod
@@ -234,8 +234,9 @@ EVP_CIPHER_CTX_cipher() returns the B<EVP_CIPHER> structure
when passed
an B<EVP_CIPHER_CTX> structure.
EVP_CIPHER_mode() and EVP_CIPHER_CTX_mode() return the block cipher mode:
-EVP_CIPH_ECB_MODE, EVP_CIPH_CBC_MODE, EVP_CIPH_CFB_MODE or
-EVP_CIPH_OFB_MODE. If the cipher is a stream cipher then
+EVP_CIPH_ECB_MODE, EVP_CIPH_CBC_MODE, EVP_CIPH_CFB_MODE, EVP_CIPH_OFB_MODE,
+EVP_CIPH_CTR_MODE, EVP_CIPH_GCM_MODE, EVP_CIPH_CCM_MODE, EVP_CIPH_XTS_MODE,
+EVP_CIPH_WRAP_MODE or EVP_CIPH_OCB_MODE. If the cipher is a stream cipher then
EVP_CIPH_STREAM_CIPHER is returned.
EVP_CIPHER_param_to_asn1() sets the AlgorithmIdentifier "parameter" based
_____
openssl-commits mailing list
To unsubscribe: https://mta.openssl.org/mailman/listinfo/openssl-commits
