1 files changed, 299 insertions, 308 deletions

diff --git a/secure/lib/libcrypto/man/EVP_EncryptInit.3 b/secure/lib/libcrypto/man/EVP_EncryptInit.3
index a98c5b7d67716..34335291b1b02 100644
--- a/secure/lib/libcrypto/man/EVP_EncryptInit.3
+++ b/secure/lib/libcrypto/man/EVP_EncryptInit.3
@@ -128,111 +128,79 @@
 .rm #[ #] #H #V #F C
 .\" ========================================================================
 .\"
-.IX Title "EVP_EncryptInit 3"
-.TH EVP_EncryptInit 3 "2018-08-14" "1.0.2p" "OpenSSL"
+.IX Title "EVP_ENCRYPTINIT 3"
+.TH EVP_ENCRYPTINIT 3 "2018-09-11" "1.1.1" "OpenSSL"
 .\" For nroff, turn off justification.  Always turn off hyphenation; it makes
 .\" way too many mistakes in technical documents.
 .if n .ad l
 .nh
 .SH "NAME"
-EVP_CIPHER_CTX_init, EVP_EncryptInit_ex, EVP_EncryptUpdate,
-EVP_EncryptFinal_ex, EVP_DecryptInit_ex, EVP_DecryptUpdate,
-EVP_DecryptFinal_ex, EVP_CipherInit_ex, EVP_CipherUpdate,
-EVP_CipherFinal_ex, EVP_CIPHER_CTX_set_key_length,
-EVP_CIPHER_CTX_ctrl, EVP_CIPHER_CTX_cleanup, EVP_EncryptInit,
-EVP_EncryptFinal, EVP_DecryptInit, EVP_DecryptFinal,
-EVP_CipherInit, EVP_CipherFinal, EVP_get_cipherbyname,
-EVP_get_cipherbynid, EVP_get_cipherbyobj, EVP_CIPHER_nid,
-EVP_CIPHER_block_size, EVP_CIPHER_key_length, EVP_CIPHER_iv_length,
-EVP_CIPHER_flags, EVP_CIPHER_mode, EVP_CIPHER_type, EVP_CIPHER_CTX_cipher,
-EVP_CIPHER_CTX_nid, EVP_CIPHER_CTX_block_size, EVP_CIPHER_CTX_key_length,
-EVP_CIPHER_CTX_iv_length, EVP_CIPHER_CTX_get_app_data,
-EVP_CIPHER_CTX_set_app_data, EVP_CIPHER_CTX_type, EVP_CIPHER_CTX_flags,
-EVP_CIPHER_CTX_mode, EVP_CIPHER_param_to_asn1, EVP_CIPHER_asn1_to_param,
-EVP_CIPHER_CTX_set_padding,  EVP_enc_null, EVP_des_cbc, EVP_des_ecb,
-EVP_des_cfb, EVP_des_ofb, EVP_des_ede_cbc, EVP_des_ede, EVP_des_ede_ofb,
-EVP_des_ede_cfb, EVP_des_ede3_cbc, EVP_des_ede3, EVP_des_ede3_ofb,
-EVP_des_ede3_cfb, EVP_desx_cbc, EVP_rc4, EVP_rc4_40, EVP_rc4_hmac_md5,
-EVP_idea_cbc, EVP_idea_ecb, EVP_idea_cfb, EVP_idea_ofb, EVP_rc2_cbc,
-EVP_rc2_ecb, EVP_rc2_cfb, EVP_rc2_ofb, EVP_rc2_40_cbc, EVP_rc2_64_cbc,
-EVP_bf_cbc, EVP_bf_ecb, EVP_bf_cfb, EVP_bf_ofb, EVP_cast5_cbc,
-EVP_cast5_ecb, EVP_cast5_cfb, EVP_cast5_ofb, EVP_rc5_32_12_16_cbc,
-EVP_rc5_32_12_16_ecb, EVP_rc5_32_12_16_cfb, EVP_rc5_32_12_16_ofb, 
-EVP_aes_128_gcm, EVP_aes_192_gcm, EVP_aes_256_gcm, EVP_aes_128_ccm,
-EVP_aes_192_ccm, EVP_aes_256_ccm,
-EVP_aes_128_cbc_hmac_sha1, EVP_aes_256_cbc_hmac_sha1,
-EVP_aes_128_cbc_hmac_sha256, EVP_aes_256_cbc_hmac_sha256
-\&\- EVP cipher routines
+EVP_CIPHER_CTX_new, EVP_CIPHER_CTX_reset, EVP_CIPHER_CTX_free, EVP_EncryptInit_ex, EVP_EncryptUpdate, EVP_EncryptFinal_ex, EVP_DecryptInit_ex, EVP_DecryptUpdate, EVP_DecryptFinal_ex, EVP_CipherInit_ex, EVP_CipherUpdate, EVP_CipherFinal_ex, EVP_CIPHER_CTX_set_key_length, EVP_CIPHER_CTX_ctrl, EVP_EncryptInit, EVP_EncryptFinal, EVP_DecryptInit, EVP_DecryptFinal, EVP_CipherInit, EVP_CipherFinal, EVP_get_cipherbyname, EVP_get_cipherbynid, EVP_get_cipherbyobj, EVP_CIPHER_nid, EVP_CIPHER_block_size, EVP_CIPHER_key_length, EVP_CIPHER_iv_length, EVP_CIPHER_flags, EVP_CIPHER_mode, EVP_CIPHER_type, EVP_CIPHER_CTX_cipher, EVP_CIPHER_CTX_nid, EVP_CIPHER_CTX_block_size, EVP_CIPHER_CTX_key_length, EVP_CIPHER_CTX_iv_length, EVP_CIPHER_CTX_get_app_data, EVP_CIPHER_CTX_set_app_data, EVP_CIPHER_CTX_type, EVP_CIPHER_CTX_flags, EVP_CIPHER_CTX_mode, EVP_CIPHER_param_to_asn1, EVP_CIPHER_asn1_to_param, EVP_CIPHER_CTX_set_padding, EVP_enc_null \&\- EVP cipher routines
 .SH "SYNOPSIS"
 .IX Header "SYNOPSIS"
 .Vb 1
 \& #include <openssl/evp.h>
 \&
-\& void EVP_CIPHER_CTX_init(EVP_CIPHER_CTX *a);
+\& EVP_CIPHER_CTX *EVP_CIPHER_CTX_new(void);
+\& int EVP_CIPHER_CTX_reset(EVP_CIPHER_CTX *ctx);
+\& void EVP_CIPHER_CTX_free(EVP_CIPHER_CTX *ctx);
 \&
 \& int EVP_EncryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-\&         ENGINE *impl, const unsigned char *key, const unsigned char *iv);
+\&                        ENGINE *impl, const unsigned char *key, const unsigned char *iv);
 \& int EVP_EncryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-\&         int *outl, const unsigned char *in, int inl);
-\& int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out,
-\&         int *outl);
+\&                       int *outl, const unsigned char *in, int inl);
+\& int EVP_EncryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
 \&
 \& int EVP_DecryptInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-\&         ENGINE *impl, const unsigned char *key, const unsigned char *iv);
+\&                        ENGINE *impl, const unsigned char *key, const unsigned char *iv);
 \& int EVP_DecryptUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-\&         int *outl, const unsigned char *in, int inl);
-\& int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-\&         int *outl);
+\&                       int *outl, const unsigned char *in, int inl);
+\& int EVP_DecryptFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
 \&
 \& int EVP_CipherInit_ex(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-\&         ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
+\&                       ENGINE *impl, const unsigned char *key, const unsigned char *iv, int enc);
 \& int EVP_CipherUpdate(EVP_CIPHER_CTX *ctx, unsigned char *out,
-\&         int *outl, const unsigned char *in, int inl);
-\& int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-\&         int *outl);
+\&                      int *outl, const unsigned char *in, int inl);
+\& int EVP_CipherFinal_ex(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
 \&
 \& int EVP_EncryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-\&         const unsigned char *key, const unsigned char *iv);
-\& int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out,
-\&         int *outl);
+\&                     const unsigned char *key, const unsigned char *iv);
+\& int EVP_EncryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *out, int *outl);
 \&
 \& int EVP_DecryptInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-\&         const unsigned char *key, const unsigned char *iv);
-\& int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-\&         int *outl);
+\&                     const unsigned char *key, const unsigned char *iv);
+\& int EVP_DecryptFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
 \&
 \& int EVP_CipherInit(EVP_CIPHER_CTX *ctx, const EVP_CIPHER *type,
-\&         const unsigned char *key, const unsigned char *iv, int enc);
-\& int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm,
-\&         int *outl);
+\&                    const unsigned char *key, const unsigned char *iv, int enc);
+\& int EVP_CipherFinal(EVP_CIPHER_CTX *ctx, unsigned char *outm, int *outl);
 \&
 \& int EVP_CIPHER_CTX_set_padding(EVP_CIPHER_CTX *x, int padding);
 \& int EVP_CIPHER_CTX_set_key_length(EVP_CIPHER_CTX *x, int keylen);
 \& int EVP_CIPHER_CTX_ctrl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
-\& int EVP_CIPHER_CTX_cleanup(EVP_CIPHER_CTX *a);
+\& int EVP_CIPHER_CTX_rand_key(EVP_CIPHER_CTX *ctx, unsigned char *key);
 \&
 \& const EVP_CIPHER *EVP_get_cipherbyname(const char *name);
-\& #define EVP_get_cipherbynid(a) EVP_get_cipherbyname(OBJ_nid2sn(a))
-\& #define EVP_get_cipherbyobj(a) EVP_get_cipherbynid(OBJ_obj2nid(a))
+\& const EVP_CIPHER *EVP_get_cipherbynid(int nid);
+\& const EVP_CIPHER *EVP_get_cipherbyobj(const ASN1_OBJECT *a);
 \&
-\& #define EVP_CIPHER_nid(e)              ((e)\->nid)
-\& #define EVP_CIPHER_block_size(e)       ((e)\->block_size)
-\& #define EVP_CIPHER_key_length(e)       ((e)\->key_len)
-\& #define EVP_CIPHER_iv_length(e)                ((e)\->iv_len)
-\& #define EVP_CIPHER_flags(e)            ((e)\->flags)
-\& #define EVP_CIPHER_mode(e)             ((e)\->flags) & EVP_CIPH_MODE)
+\& int EVP_CIPHER_nid(const EVP_CIPHER *e);
+\& int EVP_CIPHER_block_size(const EVP_CIPHER *e);
+\& int EVP_CIPHER_key_length(const EVP_CIPHER *e);
+\& int EVP_CIPHER_iv_length(const EVP_CIPHER *e);
+\& unsigned long EVP_CIPHER_flags(const EVP_CIPHER *e);
+\& unsigned long EVP_CIPHER_mode(const EVP_CIPHER *e);
 \& int EVP_CIPHER_type(const EVP_CIPHER *ctx);
 \&
-\& #define EVP_CIPHER_CTX_cipher(e)       ((e)\->cipher)
-\& #define EVP_CIPHER_CTX_nid(e)          ((e)\->cipher\->nid)
-\& #define EVP_CIPHER_CTX_block_size(e)   ((e)\->cipher\->block_size)
-\& #define EVP_CIPHER_CTX_key_length(e)   ((e)\->key_len)
-\& #define EVP_CIPHER_CTX_iv_length(e)    ((e)\->cipher\->iv_len)
-\& #define EVP_CIPHER_CTX_get_app_data(e) ((e)\->app_data)
-\& #define EVP_CIPHER_CTX_set_app_data(e,d) ((e)\->app_data=(char *)(d))
-\& #define EVP_CIPHER_CTX_type(c)         EVP_CIPHER_type(EVP_CIPHER_CTX_cipher(c))
-\& #define EVP_CIPHER_CTX_flags(e)                ((e)\->cipher\->flags)
-\& #define EVP_CIPHER_CTX_mode(e)         ((e)\->cipher\->flags & EVP_CIPH_MODE)
+\& const EVP_CIPHER *EVP_CIPHER_CTX_cipher(const EVP_CIPHER_CTX *ctx);
+\& int EVP_CIPHER_CTX_nid(const EVP_CIPHER_CTX *ctx);
+\& int EVP_CIPHER_CTX_block_size(const EVP_CIPHER_CTX *ctx);
+\& int EVP_CIPHER_CTX_key_length(const EVP_CIPHER_CTX *ctx);
+\& int EVP_CIPHER_CTX_iv_length(const EVP_CIPHER_CTX *ctx);
+\& void *EVP_CIPHER_CTX_get_app_data(const EVP_CIPHER_CTX *ctx);
+\& void EVP_CIPHER_CTX_set_app_data(const EVP_CIPHER_CTX *ctx, void *data);
+\& int EVP_CIPHER_CTX_type(const EVP_CIPHER_CTX *ctx);
+\& int EVP_CIPHER_CTX_mode(const EVP_CIPHER_CTX *ctx);
 \&
 \& int EVP_CIPHER_param_to_asn1(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
 \& int EVP_CIPHER_asn1_to_param(EVP_CIPHER_CTX *c, ASN1_TYPE *type);
@@ -242,10 +210,16 @@ EVP_aes_128_cbc_hmac_sha256, EVP_aes_256_cbc_hmac_sha256
 The \s-1EVP\s0 cipher routines are a high level interface to certain
 symmetric ciphers.
 .PP
-\&\fIEVP_CIPHER_CTX_init()\fR initializes cipher contex \fBctx\fR.
+\&\fIEVP_CIPHER_CTX_new()\fR creates a cipher context.
+.PP
+\&\fIEVP_CIPHER_CTX_free()\fR clears all information from a cipher context
+and free up any allocated memory associate with it, including \fBctx\fR
+itself. This function should be called after all operations using a
+cipher are complete so sensitive information does not remain in
+memory.
 .PP
 \&\fIEVP_EncryptInit_ex()\fR sets up cipher context \fBctx\fR for encryption
-with cipher \fBtype\fR from \s-1ENGINE\s0 \fBimpl\fR. \fBctx\fR must be initialized
+with cipher \fBtype\fR from \s-1ENGINE\s0 \fBimpl\fR. \fBctx\fR must be created
 before calling this function. \fBtype\fR is normally supplied
 by a function such as \fIEVP_aes_256_cbc()\fR. If \fBimpl\fR is \s-1NULL\s0 then the
 default implementation is used. \fBkey\fR is the symmetric key to use
@@ -262,11 +236,14 @@ multiple times to encrypt successive blocks of data. The amount
 of data written depends on the block alignment of the encrypted data:
 as a result the amount of data written may be anything from zero bytes
 to (inl + cipher_block_size \- 1) so \fBout\fR should contain sufficient
-room. The actual number of bytes written is placed in \fBoutl\fR.
+room. The actual number of bytes written is placed in \fBoutl\fR. It also
+checks if \fBin\fR and \fBout\fR are partially overlapping, and if they are
+0 is returned to indicate failure.
 .PP
 If padding is enabled (the default) then \fIEVP_EncryptFinal_ex()\fR encrypts
 the \*(L"final\*(R" data, that is any data that remains in a partial block.
-It uses standard block padding (aka \s-1PKCS\s0 padding). The encrypted
+It uses standard block padding (aka \s-1PKCS\s0 padding) as described in
+the \s-1NOTES\s0 section, below. The encrypted
 final data is written to \fBout\fR which should have sufficient space for
 one cipher block. The number of bytes written is placed in \fBoutl\fR. After
 this function is called the encryption operation is finished and no further
@@ -291,15 +268,15 @@ performed depends on the value of the \fBenc\fR parameter. It should be set
 to 1 for encryption, 0 for decryption and \-1 to leave the value unchanged
 (the actual value of 'enc' being supplied in a previous call).
 .PP
-\&\fIEVP_CIPHER_CTX_cleanup()\fR clears all information from a cipher context
-and free up any allocated memory associate with it. It should be called
-after all operations using a cipher are complete so sensitive information
-does not remain in memory.
+\&\fIEVP_CIPHER_CTX_reset()\fR clears all information from a cipher context
+and free up any allocated memory associate with it, except the \fBctx\fR
+itself. This function should be called anytime \fBctx\fR is to be reused
+for another \fIEVP_CipherInit()\fR / \fIEVP_CipherUpdate()\fR / \fIEVP_CipherFinal()\fR
+series of calls.
 .PP
 \&\fIEVP_EncryptInit()\fR, \fIEVP_DecryptInit()\fR and \fIEVP_CipherInit()\fR behave in a
-similar way to \fIEVP_EncryptInit_ex()\fR, EVP_DecryptInit_ex and
-\&\fIEVP_CipherInit_ex()\fR except the \fBctx\fR parameter does not need to be
-initialized and they always use the default cipher implementation.
+similar way to \fIEVP_EncryptInit_ex()\fR, \fIEVP_DecryptInit_ex()\fR and
+\&\fIEVP_CipherInit_ex()\fR except they always use the default cipher implementation.
 .PP
 \&\fIEVP_EncryptFinal()\fR, \fIEVP_DecryptFinal()\fR and \fIEVP_CipherFinal()\fR are
 identical to \fIEVP_EncryptFinal_ex()\fR, \fIEVP_DecryptFinal_ex()\fR and
@@ -316,12 +293,14 @@ passed an \fB\s-1EVP_CIPHER\s0\fR or \fB\s-1EVP_CIPHER_CTX\s0\fR structure.  The
 value is an internal value which may not have a corresponding \s-1OBJECT
 IDENTIFIER.\s0
 .PP
-\&\fIEVP_CIPHER_CTX_set_padding()\fR 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 \fBpad\fR 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.
+\&\fIEVP_CIPHER_CTX_set_padding()\fR enables or disables padding. This
+function should be called after the context is set up for encryption
+or decryption with \fIEVP_EncryptInit_ex()\fR, \fIEVP_DecryptInit_ex()\fR or
+\&\fIEVP_CipherInit_ex()\fR. By default encryption operations are padded using
+standard block padding and the padding is checked and removed when
+decrypting. If the \fBpad\fR 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.
 .PP
 \&\fIEVP_CIPHER_key_length()\fR and \fIEVP_CIPHER_CTX_key_length()\fR return the key
 length of a cipher when passed an \fB\s-1EVP_CIPHER\s0\fR or \fB\s-1EVP_CIPHER_CTX\s0\fR
@@ -341,7 +320,7 @@ It will return zero if the cipher does not use an \s-1IV.\s0  The constant
 .PP
 \&\fIEVP_CIPHER_block_size()\fR and \fIEVP_CIPHER_CTX_block_size()\fR return the block
 size of a cipher when passed an \fB\s-1EVP_CIPHER\s0\fR or \fB\s-1EVP_CIPHER_CTX\s0\fR
-structure. The constant \fB\s-1EVP_MAX_IV_LENGTH\s0\fR is also the maximum block
+structure. The constant \fB\s-1EVP_MAX_BLOCK_LENGTH\s0\fR is also the maximum block
 length for all ciphers.
 .PP
 \&\fIEVP_CIPHER_type()\fR and \fIEVP_CIPHER_CTX_type()\fR return the type of the passed
@@ -355,8 +334,9 @@ identifier or does not have \s-1ASN1\s0 support this function will return
 an \fB\s-1EVP_CIPHER_CTX\s0\fR structure.
 .PP
 \&\fIEVP_CIPHER_mode()\fR and \fIEVP_CIPHER_CTX_mode()\fR return the block cipher mode:
-\&\s-1EVP_CIPH_ECB_MODE, EVP_CIPH_CBC_MODE, EVP_CIPH_CFB_MODE\s0 or
-\&\s-1EVP_CIPH_OFB_MODE.\s0 If the cipher is a stream cipher then
+\&\s-1EVP_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\s0 or \s-1EVP_CIPH_OCB_MODE.\s0 If the cipher is a stream cipher then
 \&\s-1EVP_CIPH_STREAM_CIPHER\s0 is returned.
 .PP
 \&\fIEVP_CIPHER_param_to_asn1()\fR sets the AlgorithmIdentifier \*(L"parameter\*(R" based
@@ -379,8 +359,16 @@ is not supported.
 .PP
 \&\fIEVP_CIPHER_CTX_ctrl()\fR allows various cipher specific parameters to be determined
 and set.
+.PP
+\&\fIEVP_CIPHER_CTX_rand_key()\fR generates a random key of the appropriate length
+based on the cipher context. The \s-1EVP_CIPHER\s0 can provide its own random key
+generation routine to support keys of a specific form. \fBKey\fR must point to a
+buffer at least as big as the value returned by \fIEVP_CIPHER_CTX_key_length()\fR.
 .SH "RETURN VALUES"
 .IX Header "RETURN VALUES"
+\&\fIEVP_CIPHER_CTX_new()\fR returns a pointer to a newly created
+\&\fB\s-1EVP_CIPHER_CTX\s0\fR for success and \fB\s-1NULL\s0\fR for failure.
+.PP
 \&\fIEVP_EncryptInit_ex()\fR, \fIEVP_EncryptUpdate()\fR and \fIEVP_EncryptFinal_ex()\fR
 return 1 for success and 0 for failure.
 .PP
@@ -390,7 +378,7 @@ return 1 for success and 0 for failure.
 \&\fIEVP_CipherInit_ex()\fR and \fIEVP_CipherUpdate()\fR return 1 for success and 0 for failure.
 \&\fIEVP_CipherFinal_ex()\fR returns 0 for a decryption failure or 1 for success.
 .PP
-\&\fIEVP_CIPHER_CTX_cleanup()\fR returns 1 for success and 0 for failure.
+\&\fIEVP_CIPHER_CTX_reset()\fR returns 1 for success and 0 for failure.
 .PP
 \&\fIEVP_get_cipherbyname()\fR, \fIEVP_get_cipherbynid()\fR and \fIEVP_get_cipherbyobj()\fR
 return an \fB\s-1EVP_CIPHER\s0\fR structure or \s-1NULL\s0 on error.
@@ -413,142 +401,115 @@ length or zero if the cipher does not use an \s-1IV.\s0
 .PP
 \&\fIEVP_CIPHER_CTX_cipher()\fR returns an \fB\s-1EVP_CIPHER\s0\fR structure.
 .PP
-\&\fIEVP_CIPHER_param_to_asn1()\fR and \fIEVP_CIPHER_asn1_to_param()\fR return 1 for 
-success or zero for failure.
+\&\fIEVP_CIPHER_param_to_asn1()\fR and \fIEVP_CIPHER_asn1_to_param()\fR return greater
+than zero for success and zero or a negative number on failure.
+.PP
+\&\fIEVP_CIPHER_CTX_rand_key()\fR returns 1 for success.
 .SH "CIPHER LISTING"
 .IX Header "CIPHER LISTING"
 All algorithms have a fixed key length unless otherwise stated.
+.PP
+Refer to \*(L"\s-1SEE ALSO\*(R"\s0 for the full list of ciphers available through the \s-1EVP\s0
+interface.
 .IP "\fIEVP_enc_null()\fR" 4
 .IX Item "EVP_enc_null()"
 Null cipher: does nothing.
-.IP "EVP_des_cbc(void), EVP_des_ecb(void), EVP_des_cfb(void), EVP_des_ofb(void)" 4
-.IX Item "EVP_des_cbc(void), EVP_des_ecb(void), EVP_des_cfb(void), EVP_des_ofb(void)"
-\&\s-1DES\s0 in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively.
-.IP "EVP_des_ede_cbc(void), \fIEVP_des_ede()\fR, EVP_des_ede_ofb(void),  EVP_des_ede_cfb(void)" 4
-.IX Item "EVP_des_ede_cbc(void), EVP_des_ede(), EVP_des_ede_ofb(void), EVP_des_ede_cfb(void)"
-Two key triple \s-1DES\s0 in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively.
-.IP "EVP_des_ede3_cbc(void), \fIEVP_des_ede3()\fR, EVP_des_ede3_ofb(void),  EVP_des_ede3_cfb(void)" 4
-.IX Item "EVP_des_ede3_cbc(void), EVP_des_ede3(), EVP_des_ede3_ofb(void), EVP_des_ede3_cfb(void)"
-Three key triple \s-1DES\s0 in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively.
-.IP "EVP_desx_cbc(void)" 4
-.IX Item "EVP_desx_cbc(void)"
-\&\s-1DESX\s0 algorithm in \s-1CBC\s0 mode.
-.IP "EVP_rc4(void)" 4
-.IX Item "EVP_rc4(void)"
-\&\s-1RC4\s0 stream cipher. This is a variable key length cipher with default key length 128 bits.
-.IP "EVP_rc4_40(void)" 4
-.IX Item "EVP_rc4_40(void)"
-\&\s-1RC4\s0 stream cipher with 40 bit key length. This is obsolete and new code should use \fIEVP_rc4()\fR
-and the \fIEVP_CIPHER_CTX_set_key_length()\fR function.
-.IP "\fIEVP_idea_cbc()\fR EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void)" 4
-.IX Item "EVP_idea_cbc() EVP_idea_ecb(void), EVP_idea_cfb(void), EVP_idea_ofb(void)"
-\&\s-1IDEA\s0 encryption algorithm in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively.
-.IP "EVP_rc2_cbc(void), EVP_rc2_ecb(void), EVP_rc2_cfb(void), EVP_rc2_ofb(void)" 4
-.IX Item "EVP_rc2_cbc(void), EVP_rc2_ecb(void), EVP_rc2_cfb(void), EVP_rc2_ofb(void)"
-\&\s-1RC2\s0 encryption algorithm in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively. This is a variable key
-length cipher with an additional parameter called \*(L"effective key bits\*(R" or \*(L"effective key length\*(R".
-By default both are set to 128 bits.
-.IP "EVP_rc2_40_cbc(void), EVP_rc2_64_cbc(void)" 4
-.IX Item "EVP_rc2_40_cbc(void), EVP_rc2_64_cbc(void)"
-\&\s-1RC2\s0 algorithm in \s-1CBC\s0 mode with a default key length and effective key length of 40 and 64 bits.
-These are obsolete and new code should use \fIEVP_rc2_cbc()\fR, \fIEVP_CIPHER_CTX_set_key_length()\fR and
-\&\fIEVP_CIPHER_CTX_ctrl()\fR to set the key length and effective key length.
-.IP "EVP_bf_cbc(void), EVP_bf_ecb(void), EVP_bf_cfb(void), EVP_bf_ofb(void);" 4
-.IX Item "EVP_bf_cbc(void), EVP_bf_ecb(void), EVP_bf_cfb(void), EVP_bf_ofb(void);"
-Blowfish encryption algorithm in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively. This is a variable key
-length cipher.
-.IP "EVP_cast5_cbc(void), EVP_cast5_ecb(void), EVP_cast5_cfb(void), EVP_cast5_ofb(void)" 4
-.IX Item "EVP_cast5_cbc(void), EVP_cast5_ecb(void), EVP_cast5_cfb(void), EVP_cast5_ofb(void)"
-\&\s-1CAST\s0 encryption algorithm in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively. This is a variable key
-length cipher.
-.IP "EVP_rc5_32_12_16_cbc(void), EVP_rc5_32_12_16_ecb(void), EVP_rc5_32_12_16_cfb(void), EVP_rc5_32_12_16_ofb(void)" 4
-.IX Item "EVP_rc5_32_12_16_cbc(void), EVP_rc5_32_12_16_ecb(void), EVP_rc5_32_12_16_cfb(void), EVP_rc5_32_12_16_ofb(void)"
-\&\s-1RC5\s0 encryption algorithm in \s-1CBC, ECB, CFB\s0 and \s-1OFB\s0 modes respectively. This is a variable key length
-cipher with an additional \*(L"number of rounds\*(R" parameter. By default the key length is set to 128
-bits and 12 rounds.
-.IP "EVP_aes_128_gcm(void), EVP_aes_192_gcm(void), EVP_aes_256_gcm(void)" 4
-.IX Item "EVP_aes_128_gcm(void), EVP_aes_192_gcm(void), EVP_aes_256_gcm(void)"
-\&\s-1AES\s0 Galois Counter Mode (\s-1GCM\s0) for 128, 192 and 256 bit keys respectively.
-These ciphers require additional control operations to function correctly: see
-\&\*(L"\s-1GCM\s0 mode\*(R" section below for details.
-.IP "EVP_aes_128_ccm(void), EVP_aes_192_ccm(void), EVP_aes_256_ccm(void)" 4
-.IX Item "EVP_aes_128_ccm(void), EVP_aes_192_ccm(void), EVP_aes_256_ccm(void)"
-\&\s-1AES\s0 Counter with CBC-MAC Mode (\s-1CCM\s0) for 128, 192 and 256 bit keys respectively.
-These ciphers require additional control operations to function correctly: see
-\&\s-1CCM\s0 mode section below for details.
-.SH "GCM Mode"
-.IX Header "GCM Mode"
-For \s-1GCM\s0 mode ciphers the behaviour of the \s-1EVP\s0 interface is subtly altered and
-several \s-1GCM\s0 specific ctrl operations are supported.
+.SH "AEAD Interface"
+.IX Header "AEAD Interface"
+The \s-1EVP\s0 interface for Authenticated Encryption with Associated Data (\s-1AEAD\s0)
+modes are subtly altered and several additional \fIctrl\fR operations are supported
+depending on the mode specified.
 .PP
-To specify any additional authenticated data (\s-1AAD\s0) a call to \fIEVP_CipherUpdate()\fR,
-\&\fIEVP_EncryptUpdate()\fR or \fIEVP_DecryptUpdate()\fR should be made with the output 
+To specify additional authenticated data (\s-1AAD\s0), a call to \fIEVP_CipherUpdate()\fR,
+\&\fIEVP_EncryptUpdate()\fR or \fIEVP_DecryptUpdate()\fR should be made with the output
 parameter \fBout\fR set to \fB\s-1NULL\s0\fR.
 .PP
-When decrypting the return value of \fIEVP_DecryptFinal()\fR or \fIEVP_CipherFinal()\fR
-indicates if the operation was successful. If it does not indicate success
-the authentication operation has failed and any output data \fB\s-1MUST NOT\s0\fR
-be used as it is corrupted.
-.PP
-The following ctrls are supported in \s-1GCM\s0 mode:
-.PP
-.Vb 1
-\& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_IVLEN, ivlen, NULL);
-.Ve
-.PP
-Sets the \s-1GCM IV\s0 length: this call can only be made before specifying an \s-1IV.\s0 If
-not called a default \s-1IV\s0 length is used (96 bits for \s-1AES\s0).
-.PP
-.Vb 1
-\& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_GET_TAG, taglen, tag);
-.Ve
-.PP
-Writes \fBtaglen\fR bytes of the tag value to the buffer indicated by \fBtag\fR.
+When decrypting, the return value of \fIEVP_DecryptFinal()\fR or \fIEVP_CipherFinal()\fR
+indicates whether the operation was successful. If it does not indicate success,
+the authentication operation has failed and any output data \fB\s-1MUST NOT\s0\fR be used
+as it is corrupted.
+.SS "\s-1GCM\s0 and \s-1OCB\s0 Modes"
+.IX Subsection "GCM and OCB Modes"
+The following \fIctrl\fRs are supported in \s-1GCM\s0 and \s-1OCB\s0 modes.
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_SET_IVLEN,\s0 ivlen, \s-1NULL\s0)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, ivlen, NULL)"
+Sets the \s-1IV\s0 length. This call can only be made before specifying an \s-1IV.\s0 If
+not called a default \s-1IV\s0 length is used.
+.Sp
+For \s-1GCM AES\s0 and \s-1OCB AES\s0 the default is 12 (i.e. 96 bits). For \s-1OCB\s0 mode the
+maximum is 15.
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_GET_TAG,\s0 taglen, tag)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen, tag)"
+Writes \f(CW\*(C`taglen\*(C'\fR bytes of the tag value to the buffer indicated by \f(CW\*(C`tag\*(C'\fR.
 This call can only be made when encrypting data and \fBafter\fR all data has been
 processed (e.g. after an \fIEVP_EncryptFinal()\fR call).
+.Sp
+For \s-1OCB,\s0 \f(CW\*(C`taglen\*(C'\fR must either be 16 or the value previously set via
+\&\fB\s-1EVP_CTRL_AEAD_SET_TAG\s0\fR.
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_SET_TAG,\s0 taglen, tag)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, taglen, tag)"
+Sets the expected tag to \f(CW\*(C`taglen\*(C'\fR bytes from \f(CW\*(C`tag\*(C'\fR.
+The tag length can only be set before specifying an \s-1IV.\s0
+\&\f(CW\*(C`taglen\*(C'\fR must be between 1 and 16 inclusive.
+.Sp
+For \s-1GCM,\s0 this call is only valid when decrypting data.
+.Sp
+For \s-1OCB,\s0 this call is valid when decrypting data to set the expected tag,
+and before encryption to set the desired tag length.
+.Sp
+In \s-1OCB\s0 mode, calling this before encryption with \f(CW\*(C`tag\*(C'\fR set to \f(CW\*(C`NULL\*(C'\fR sets the
+tag length.  If this is not called prior to encryption, a default tag length is
+used.
+.Sp
+For \s-1OCB AES,\s0 the default tag length is 16 (i.e. 128 bits).  It is also the
+maximum tag length for \s-1OCB.\s0
+.SS "\s-1CCM\s0 Mode"
+.IX Subsection "CCM Mode"
+The \s-1EVP\s0 interface for \s-1CCM\s0 mode is similar to that of the \s-1GCM\s0 mode but with a
+few additional requirements and different \fIctrl\fR values.
 .PP
-.Vb 1
-\& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_GCM_SET_TAG, taglen, tag);
-.Ve
-.PP
-Sets the expected tag to \fBtaglen\fR bytes from \fBtag\fR. This call is only legal
-when decrypting data.
-.SH "CCM Mode"
-.IX Header "CCM Mode"
-The behaviour of \s-1CCM\s0 mode ciphers is similar to \s-1CCM\s0 mode but with a few
-additional requirements and different ctrl values.
-.PP
-Like \s-1GCM\s0 mode any additional authenticated data (\s-1AAD\s0) is passed by calling
-\&\fIEVP_CipherUpdate()\fR, \fIEVP_EncryptUpdate()\fR or \fIEVP_DecryptUpdate()\fR with the output 
-parameter \fBout\fR set to \fB\s-1NULL\s0\fR. Additionally the total plaintext or ciphertext
-length \fB\s-1MUST\s0\fR be passed to \fIEVP_CipherUpdate()\fR, \fIEVP_EncryptUpdate()\fR or
-\&\fIEVP_DecryptUpdate()\fR with the output and input parameters (\fBin\fR and \fBout\fR) 
-set to \fB\s-1NULL\s0\fR and the length passed in the \fBinl\fR parameter.
-.PP
-The following ctrls are supported in \s-1CCM\s0 mode:
-.PP
-.Vb 1
-\& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_TAG, taglen, tag);
-.Ve
+For \s-1CCM\s0 mode, the total plaintext or ciphertext length \fB\s-1MUST\s0\fR be passed to
+\&\fIEVP_CipherUpdate()\fR, \fIEVP_EncryptUpdate()\fR or \fIEVP_DecryptUpdate()\fR with the output
+and input parameters (\fBin\fR and \fBout\fR) set to \fB\s-1NULL\s0\fR and the length passed in
+the \fBinl\fR parameter.
 .PP
+The following \fIctrl\fRs are supported in \s-1CCM\s0 mode.
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_SET_TAG,\s0 taglen, tag)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, taglen, tag)"
 This call is made to set the expected \fB\s-1CCM\s0\fR tag value when decrypting or
-the length of the tag (with the \fBtag\fR parameter set to \s-1NULL\s0) when encrypting.
+the length of the tag (with the \f(CW\*(C`tag\*(C'\fR parameter set to \s-1NULL\s0) when encrypting.
 The tag length is often referred to as \fBM\fR. If not set a default value is
 used (12 for \s-1AES\s0).
-.PP
-.Vb 1
-\& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_L, ivlen, NULL);
-.Ve
-.PP
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_CCM_SET_L,\s0 ivlen, \s-1NULL\s0)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_L, ivlen, NULL)"
 Sets the \s-1CCM\s0 \fBL\fR value. If not set a default is used (8 for \s-1AES\s0).
-.PP
-.Vb 1
-\& EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_CCM_SET_IVLEN, ivlen, NULL);
-.Ve
-.PP
-Sets the \s-1CCM\s0 nonce (\s-1IV\s0) length: this call can only be made before specifying
-an nonce value. The nonce length is given by \fB15 \- L\fR so it is 7 by default
-for \s-1AES.\s0
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_SET_IVLEN,\s0 ivlen, \s-1NULL\s0)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, ivlen, NULL)"
+Sets the \s-1CCM\s0 nonce (\s-1IV\s0) length. This call can only be made before specifying an
+nonce value. The nonce length is given by \fB15 \- L\fR so it is 7 by default for
+\&\s-1AES.\s0
+.SS "ChaCha20\-Poly1305"
+.IX Subsection "ChaCha20-Poly1305"
+The following \fIctrl\fRs are supported for the ChaCha20\-Poly1305 \s-1AEAD\s0 algorithm.
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_SET_IVLEN,\s0 ivlen, \s-1NULL\s0)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_IVLEN, ivlen, NULL)"
+Sets the nonce length. This call can only be made before specifying the nonce.
+If not called a default nonce length of 12 (i.e. 96 bits) is used. The maximum
+nonce length is 16 (\fB\s-1CHACHA_CTR_SIZE\s0\fR, i.e. 128\-bits).
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_GET_TAG,\s0 taglen, tag)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_GET_TAG, taglen, tag)"
+Writes \f(CW\*(C`taglen\*(C'\fR bytes of the tag value to the buffer indicated by \f(CW\*(C`tag\*(C'\fR.
+This call can only be made when encrypting data and \fBafter\fR all data has been
+processed (e.g. after an \fIEVP_EncryptFinal()\fR call).
+.Sp
+\&\f(CW\*(C`taglen\*(C'\fR specified here must be 16 (\fB\s-1POLY1305_BLOCK_SIZE\s0\fR, i.e. 128\-bits) or
+less.
+.IP "EVP_CIPHER_CTX_ctrl(ctx, \s-1EVP_CTRL_AEAD_SET_TAG,\s0 taglen, tag)" 4
+.IX Item "EVP_CIPHER_CTX_ctrl(ctx, EVP_CTRL_AEAD_SET_TAG, taglen, tag)"
+Sets the expected tag to \f(CW\*(C`taglen\*(C'\fR bytes from \f(CW\*(C`tag\*(C'\fR.
+The tag length can only be set before specifying an \s-1IV.\s0
+\&\f(CW\*(C`taglen\*(C'\fR must be between 1 and 16 (\fB\s-1POLY1305_BLOCK_SIZE\s0\fR) inclusive.
+This call is only valid when decrypting data.
 .SH "NOTES"
 .IX Header "NOTES"
 Where possible the \fB\s-1EVP\s0\fR interface to symmetric ciphers should be used in
@@ -558,7 +519,7 @@ transparent to the cipher used and much more flexible. Additionally, the
 acceleration such as AES-NI (the low level interfaces do not provide the
 guarantee).
 .PP
-\&\s-1PKCS\s0 padding works by adding \fBn\fR padding bytes of value \fBn\fR to make the total 
+\&\s-1PKCS\s0 padding works by adding \fBn\fR padding bytes of value \fBn\fR to make the total
 length of the encrypted data a multiple of the block size. Padding is always
 added so if the data is already a multiple of the block size \fBn\fR will equal
 the block size. For example if the block size is 8 and 11 bytes are to be
@@ -580,15 +541,15 @@ compatibility with existing code. New code should use \fIEVP_EncryptInit_ex()\fR
 \&\fIEVP_EncryptFinal_ex()\fR, \fIEVP_DecryptInit_ex()\fR, \fIEVP_DecryptFinal_ex()\fR,
 \&\fIEVP_CipherInit_ex()\fR and \fIEVP_CipherFinal_ex()\fR because they can reuse an
 existing context without allocating and freeing it up on each call.
+.PP
+\&\fIEVP_get_cipherbynid()\fR, and \fIEVP_get_cipherbyobj()\fR are implemented as macros.
 .SH "BUGS"
 .IX Header "BUGS"
-For \s-1RC5\s0 the number of rounds can currently only be set to 8, 12 or 16. This is
-a limitation of the current \s-1RC5\s0 code rather than the \s-1EVP\s0 interface.
-.PP
-\&\s-1EVP_MAX_KEY_LENGTH\s0 and \s-1EVP_MAX_IV_LENGTH\s0 only refer to the internal ciphers with
-default key lengths. If custom ciphers exceed these values the results are
-unpredictable. This is because it has become standard practice to define a 
-generic key as a fixed unsigned char array containing \s-1EVP_MAX_KEY_LENGTH\s0 bytes.
+\&\fB\s-1EVP_MAX_KEY_LENGTH\s0\fR and \fB\s-1EVP_MAX_IV_LENGTH\s0\fR only refer to the internal
+ciphers with default key lengths. If custom ciphers exceed these values the
+results are unpredictable. This is because it has become standard practice to
+define a generic key as a fixed unsigned char array containing
+\&\fB\s-1EVP_MAX_KEY_LENGTH\s0\fR bytes.
 .PP
 The \s-1ASN1\s0 code is incomplete (and sometimes inaccurate) it has only been tested
 for certain common S/MIME ciphers (\s-1RC2, DES,\s0 triple \s-1DES\s0) in \s-1CBC\s0 mode.
@@ -596,117 +557,147 @@ for certain common S/MIME ciphers (\s-1RC2, DES,\s0 triple \s-1DES\s0) in \s-1CB
 .IX Header "EXAMPLES"
 Encrypt a string using \s-1IDEA:\s0
 .PP
-.Vb 12
+.Vb 10
 \& int do_crypt(char *outfile)
-\&        {
-\&        unsigned char outbuf[1024];
-\&        int outlen, tmplen;
-\&        /* Bogus key and IV: we\*(Aqd normally set these from
-\&         * another source.
-\&         */
-\&        unsigned char key[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
-\&        unsigned char iv[] = {1,2,3,4,5,6,7,8};
-\&        char intext[] = "Some Crypto Text";
-\&        EVP_CIPHER_CTX ctx;
-\&        FILE *out;
+\& {
+\&     unsigned char outbuf[1024];
+\&     int outlen, tmplen;
+\&     /*
+\&      * Bogus key and IV: we\*(Aqd normally set these from
+\&      * another source.
+\&      */
+\&     unsigned char key[] = {0,1,2,3,4,5,6,7,8,9,10,11,12,13,14,15};
+\&     unsigned char iv[] = {1,2,3,4,5,6,7,8};
+\&     char intext[] = "Some Crypto Text";
+\&     EVP_CIPHER_CTX *ctx;
+\&     FILE *out;
 \&
-\&        EVP_CIPHER_CTX_init(&ctx);
-\&        EVP_EncryptInit_ex(&ctx, EVP_idea_cbc(), NULL, key, iv);
+\&     ctx = EVP_CIPHER_CTX_new();
+\&     EVP_EncryptInit_ex(ctx, EVP_idea_cbc(), NULL, key, iv);
 \&
-\&        if(!EVP_EncryptUpdate(&ctx, outbuf, &outlen, intext, strlen(intext)))
-\&                {
-\&                /* Error */
-\&                return 0;
-\&                }
-\&        /* Buffer passed to EVP_EncryptFinal() must be after data just
-\&         * encrypted to avoid overwriting it.
-\&         */
-\&        if(!EVP_EncryptFinal_ex(&ctx, outbuf + outlen, &tmplen))
-\&                {
-\&                /* Error */
-\&                return 0;
-\&                }
-\&        outlen += tmplen;
-\&        EVP_CIPHER_CTX_cleanup(&ctx);
-\&        /* Need binary mode for fopen because encrypted data is
-\&         * binary data. Also cannot use strlen() on it because
-\&         * it wont be null terminated and may contain embedded
-\&         * nulls.
-\&         */
-\&        out = fopen(outfile, "wb");
-\&        fwrite(outbuf, 1, outlen, out);
-\&        fclose(out);
-\&        return 1;
-\&        }
+\&     if (!EVP_EncryptUpdate(ctx, outbuf, &outlen, intext, strlen(intext))) {
+\&         /* Error */
+\&         EVP_CIPHER_CTX_free(ctx);
+\&         return 0;
+\&     }
+\&     /*
+\&      * Buffer passed to EVP_EncryptFinal() must be after data just
+\&      * encrypted to avoid overwriting it.
+\&      */
+\&     if (!EVP_EncryptFinal_ex(ctx, outbuf + outlen, &tmplen)) {
+\&         /* Error */
+\&         EVP_CIPHER_CTX_free(ctx);
+\&         return 0;
+\&     }
+\&     outlen += tmplen;
+\&     EVP_CIPHER_CTX_free(ctx);
+\&     /*
+\&      * Need binary mode for fopen because encrypted data is
+\&      * binary data. Also cannot use strlen() on it because
+\&      * it won\*(Aqt be NUL terminated and may contain embedded
+\&      * NULs.
+\&      */
+\&     out = fopen(outfile, "wb");
+\&     if (out == NULL) {
+\&         /* Error */
+\&         return 0;
+\&     }
+\&     fwrite(outbuf, 1, outlen, out);
+\&     fclose(out);
+\&     return 1;
+\& }
 .Ve
 .PP
 The ciphertext from the above example can be decrypted using the \fBopenssl\fR
 utility with the command line (shown on two lines for clarity):
 .PP
 .Vb 2
-\& openssl idea \-d <filename
-\&          \-K 000102030405060708090A0B0C0D0E0F \-iv 0102030405060708
+\& openssl idea \-d \e
+\&     \-K 000102030405060708090A0B0C0D0E0F \-iv 0102030405060708 <filename
 .Ve
 .PP
 General encryption and decryption function example using \s-1FILE I/O\s0 and \s-1AES128\s0
 with a 128\-bit key:
 .PP
-.Vb 11
+.Vb 12
 \& int do_crypt(FILE *in, FILE *out, int do_encrypt)
-\&        {
-\&        /* Allow enough space in output buffer for additional block */
-\&        unsigned char inbuf[1024], outbuf[1024 + EVP_MAX_BLOCK_LENGTH];
-\&        int inlen, outlen;
-\&        EVP_CIPHER_CTX ctx;
-\&        /* Bogus key and IV: we\*(Aqd normally set these from
-\&         * another source.
-\&         */
-\&        unsigned char key[] = "0123456789abcdeF";
-\&        unsigned char iv[] = "1234567887654321";
+\& {
+\&     /* Allow enough space in output buffer for additional block */
+\&     unsigned char inbuf[1024], outbuf[1024 + EVP_MAX_BLOCK_LENGTH];
+\&     int inlen, outlen;
+\&     EVP_CIPHER_CTX *ctx;
+\&     /*
+\&      * Bogus key and IV: we\*(Aqd normally set these from
+\&      * another source.
+\&      */
+\&     unsigned char key[] = "0123456789abcdeF";
+\&     unsigned char iv[] = "1234567887654321";
 \&
-\&        /* Don\*(Aqt set key or IV right away; we want to check lengths */
-\&        EVP_CIPHER_CTX_init(&ctx);
-\&        EVP_CipherInit_ex(&ctx, EVP_aes_128_cbc(), NULL, NULL, NULL,
-\&                do_encrypt);
-\&        OPENSSL_assert(EVP_CIPHER_CTX_key_length(&ctx) == 16);
-\&        OPENSSL_assert(EVP_CIPHER_CTX_iv_length(&ctx) == 16);
+\&     /* Don\*(Aqt set key or IV right away; we want to check lengths */
+\&     ctx = EVP_CIPHER_CTX_new();
+\&     EVP_CipherInit_ex(&ctx, EVP_aes_128_cbc(), NULL, NULL, NULL,
+\&                       do_encrypt);
+\&     OPENSSL_assert(EVP_CIPHER_CTX_key_length(ctx) == 16);
+\&     OPENSSL_assert(EVP_CIPHER_CTX_iv_length(ctx) == 16);
 \&
-\&        /* Now we can set key and IV */
-\&        EVP_CipherInit_ex(&ctx, NULL, NULL, key, iv, do_encrypt);
+\&     /* Now we can set key and IV */
+\&     EVP_CipherInit_ex(ctx, NULL, NULL, key, iv, do_encrypt);
 \&
-\&        for(;;) 
-\&                {
-\&                inlen = fread(inbuf, 1, 1024, in);
-\&                if(inlen <= 0) break;
-\&                if(!EVP_CipherUpdate(&ctx, outbuf, &outlen, inbuf, inlen))
-\&                        {
-\&                        /* Error */
-\&                        EVP_CIPHER_CTX_cleanup(&ctx);
-\&                        return 0;
-\&                        }
-\&                fwrite(outbuf, 1, outlen, out);
-\&                }
-\&        if(!EVP_CipherFinal_ex(&ctx, outbuf, &outlen))
-\&                {
-\&                /* Error */
-\&                EVP_CIPHER_CTX_cleanup(&ctx);
-\&                return 0;
-\&                }
-\&        fwrite(outbuf, 1, outlen, out);
+\&     for (;;) {
+\&         inlen = fread(inbuf, 1, 1024, in);
+\&         if (inlen <= 0)
+\&             break;
+\&         if (!EVP_CipherUpdate(ctx, outbuf, &outlen, inbuf, inlen)) {
+\&             /* Error */
+\&             EVP_CIPHER_CTX_free(ctx);
+\&             return 0;
+\&         }
+\&         fwrite(outbuf, 1, outlen, out);
+\&     }
+\&     if (!EVP_CipherFinal_ex(ctx, outbuf, &outlen)) {
+\&         /* Error */
+\&         EVP_CIPHER_CTX_free(ctx);
+\&         return 0;
+\&     }
+\&     fwrite(outbuf, 1, outlen, out);
 \&
-\&        EVP_CIPHER_CTX_cleanup(&ctx);
-\&        return 1;
-\&        }
+\&     EVP_CIPHER_CTX_free(ctx);
+\&     return 1;
+\& }
 .Ve
 .SH "SEE ALSO"
 .IX Header "SEE ALSO"
-\&\fIevp\fR\|(3)
+\&\fIevp\fR\|(7)
+.PP
+Supported ciphers are listed in:
+.PP
+\&\fIEVP_aes\fR\|(3),
+\&\fIEVP_aria\fR\|(3),
+\&\fIEVP_bf\fR\|(3),
+\&\fIEVP_camellia\fR\|(3),
+\&\fIEVP_cast5\fR\|(3),
+\&\fIEVP_chacha20\fR\|(3),
+\&\fIEVP_des\fR\|(3),
+\&\fIEVP_desx\fR\|(3),
+\&\fIEVP_idea\fR\|(3),
+\&\fIEVP_rc2\fR\|(3),
+\&\fIEVP_rc4\fR\|(3),
+\&\fIEVP_rc5\fR\|(3),
+\&\fIEVP_seed\fR\|(3),
+\&\fIEVP_sm4\fR\|(3)
 .SH "HISTORY"
 .IX Header "HISTORY"
-\&\fIEVP_CIPHER_CTX_init()\fR, \fIEVP_EncryptInit_ex()\fR, \fIEVP_EncryptFinal_ex()\fR,
-\&\fIEVP_DecryptInit_ex()\fR, \fIEVP_DecryptFinal_ex()\fR, \fIEVP_CipherInit_ex()\fR,
-\&\fIEVP_CipherFinal_ex()\fR and \fIEVP_CIPHER_CTX_set_padding()\fR appeared in
-OpenSSL 0.9.7.
+Support for \s-1OCB\s0 mode was added in OpenSSL 1.1.0
+.PP
+\&\fB\s-1EVP_CIPHER_CTX\s0\fR was made opaque in OpenSSL 1.1.0.  As a result,
+\&\fIEVP_CIPHER_CTX_reset()\fR appeared and \fIEVP_CIPHER_CTX_cleanup()\fR
+disappeared.  \fIEVP_CIPHER_CTX_init()\fR remains as an alias for
+\&\fIEVP_CIPHER_CTX_reset()\fR.
+.SH "COPYRIGHT"
+.IX Header "COPYRIGHT"
+Copyright 2000\-2018 The OpenSSL Project Authors. All Rights Reserved.
 .PP
-\&\s-1IDEA\s0 appeared in OpenSSL 0.9.7 but was often disabled due to
-patent concerns; the last patents expired in 2012.
+Licensed under the OpenSSL license (the \*(L"License\*(R").  You may not use
+this file except in compliance with the License.  You can obtain a copy
+in the file \s-1LICENSE\s0 in the source distribution or at
+<https://www.openssl.org/source/license.html>.