[openssl-commits] [openssl] master update

[Rich Salz]

The branch master has been updated
       via  83f68df32f0067ee7b092f70568fc33e526fd4fd (commit)
      from  f33d63c9d0e6751a2f440db10203c439d3d27107 (commit)


- Log -----------------------------------------------------------------
commit 83f68df32f0067ee7b092f70568fc33e526fd4fd
Author: Conrado Porto Lopes Gouvêa <conradoplg at gmail.com>
Date:   Tue Mar 15 13:32:38 2016 -0300

    Update EVP_CIPHER_CTX_set_padding documentation.
    
    Add note about when EVP_CIPHER_CTX_set_padding should be called.
    
    Reviewed-by: Dr. Stephen Henson <steve at openssl.org>

-----------------------------------------------------------------------

Summary of changes:
 doc/crypto/EVP_EncryptInit.pod | 14 ++++++++------
 1 file changed, 8 insertions(+), 6 deletions(-)

diff --git a/doc/crypto/EVP_EncryptInit.pod b/doc/crypto/EVP_EncryptInit.pod
index f064d67..1b39e83 100644
--- a/doc/crypto/EVP_EncryptInit.pod
+++ b/doc/crypto/EVP_EncryptInit.pod
@@ -194,12 +194,14 @@ passed an B<EVP_CIPHER> or B<EVP_CIPHER_CTX> structure.  The actual NID
 value is an internal value which may not have a corresponding OBJECT
 IDENTIFIER.
 
-EVP_CIPHER_CTX_set_padding() enables or disables padding. By default
-encryption operations are padded using standard block padding and the
-padding is checked and removed when decrypting. If the B<pad> parameter
-is zero then no padding is performed, the total amount of data encrypted
-or decrypted must then be a multiple of the block size or an error will
-occur.
+EVP_CIPHER_CTX_set_padding() enables or disables padding. This
+function should be called after the context is set up for encryption
+or decryption with EVP_EncryptInit_ex(), EVP_DecryptInit_ex() or
+EVP_CipherInit_ex(). By default encryption operations are padded using
+standard block padding and the padding is checked and removed when
+decrypting. If the B<pad> parameter is zero then no padding is
+performed, the total amount of data encrypted or decrypted must then
+be a multiple of the block size or an error will occur.
 
 EVP_CIPHER_key_length() and EVP_CIPHER_CTX_key_length() return the key
 length of a cipher when passed an B<EVP_CIPHER> or B<EVP_CIPHER_CTX>