From b45497c3371e218867d7ad43da8f99c34a32f635 Mon Sep 17 00:00:00 2001 From: Pauli Date: Fri, 16 Feb 2018 11:24:51 +1000 Subject: [PATCH] Avoid mentioning uninitialised contexts. All contexts must be initialised because they can only be created using the _new() calls. Remove the outdated mentions of uninitialised and initialised contexts. Reviewed-by: Rich Salz Reviewed-by: Kurt Roeckx (Merged from https://github.com/openssl/openssl/pull/5388) --- doc/man3/EVP_DigestInit.pod | 14 ++++++-------- doc/man3/EVP_EncryptInit.pod | 3 +-- 2 files changed, 7 insertions(+), 10 deletions(-) diff --git a/doc/man3/EVP_DigestInit.pod b/doc/man3/EVP_DigestInit.pod index b2eec52384..ad5001e0d8 100644 --- a/doc/man3/EVP_DigestInit.pod +++ b/doc/man3/EVP_DigestInit.pod @@ -57,7 +57,7 @@ and should be used instead of the cipher-specific functions. =item EVP_MD_CTX_new() -Allocates, initializes and returns a digest context. +Allocates and returns a digest context. =item EVP_MD_CTX_reset() @@ -75,9 +75,8 @@ Performs digest-specific control actions on context B. =item EVP_DigestInit_ex() Sets up digest context B to use a digest B from ENGINE B. -B must be initialized before calling this function. B will typically -be supplied by a function such as EVP_sha1(). If B is NULL then the -default implementation of digest B is used. +B will typically be supplied by a function such as EVP_sha1(). If +B is NULL then the default implementation of digest B is used. =item EVP_DigestUpdate() @@ -105,13 +104,12 @@ made, but EVP_DigestInit_ex() can be called to initialize a new operation. Can be used to copy the message digest state from B to B. This is useful if large amounts of data are to be hashed which only differ in the last -few bytes. B must be initialized before calling this function. +few bytes. =item EVP_DigestInit() -Behaves in the same way as EVP_DigestInit_ex() except the passed context B -does not have to be initialized, and it always uses the default digest -implementation. +Behaves in the same way as EVP_DigestInit_ex() except it always uses the +default digest implementation. =item EVP_DigestFinal() diff --git a/doc/man3/EVP_EncryptInit.pod b/doc/man3/EVP_EncryptInit.pod index 29ebf74765..0dc4c13615 100644 --- a/doc/man3/EVP_EncryptInit.pod +++ b/doc/man3/EVP_EncryptInit.pod @@ -190,8 +190,7 @@ series of calls. EVP_EncryptInit(), EVP_DecryptInit() and EVP_CipherInit() behave in a similar way to EVP_EncryptInit_ex(), EVP_DecryptInit_ex() and -EVP_CipherInit_ex() except the B parameter does not need to be -initialized and they always use the default cipher implementation. +EVP_CipherInit_ex() except they always use the default cipher implementation. EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() are identical to EVP_EncryptFinal_ex(), EVP_DecryptFinal_ex() and -- 2.25.1