The branch openssl-3.0 has been updated
via de26f8fad7948adc935ab0aae2fc9fa5d6c11411 (commit)
from c076f7b6d53454b5a3a1c837a5ea71b7c6fbebe9 (commit)
- Log -----------------------------------------------------------------
commit de26f8fad7948adc935ab0aae2fc9fa5d6c11411
Author: PW Hu <jlu....@foxmail.com>
Date: Wed Sep 8 09:13:20 2021 +0800
Fix some documentation errors
CLA: trivial
Reviewed-by: Paul Dale <pa...@openssl.org>
Reviewed-by: Tomas Mraz <to...@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/16553)
(cherry picked from commit 5ecf10a0d2fb1c858b25afd5e48eafe6ef76edd4)
-----------------------------------------------------------------------
Summary of changes:
doc/man3/ASN1_item_d2i_bio.pod | 8 ++++----
doc/man3/OSSL_CMP_MSG_get0_header.pod | 2 +-
doc/man3/OSSL_HTTP_REQ_CTX.pod | 3 +--
3 files changed, 6 insertions(+), 7 deletions(-)
diff --git a/doc/man3/ASN1_item_d2i_bio.pod b/doc/man3/ASN1_item_d2i_bio.pod
index 9083f85f69..bdf5c48096 100644
--- a/doc/man3/ASN1_item_d2i_bio.pod
+++ b/doc/man3/ASN1_item_d2i_bio.pod
@@ -10,15 +10,15 @@ ASN1_item_d2i_fp_ex, ASN1_item_d2i_fp, ASN1_item_i2d_mem_bio
#include <openssl/asn1.h>
- ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **val, const unsigned char **in,
+ ASN1_VALUE *ASN1_item_d2i_ex(ASN1_VALUE **pval, const unsigned char **in,
long len, const ASN1_ITEM *it,
OSSL_LIB_CTX *libctx, const char *propq);
- ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **val, const unsigned char **in,
+ ASN1_VALUE *ASN1_item_d2i(ASN1_VALUE **pval, const unsigned char **in,
long len, const ASN1_ITEM *it);
- void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *pval,
+ void *ASN1_item_d2i_bio_ex(const ASN1_ITEM *it, BIO *in, void *x,
OSSL_LIB_CTX *libctx, const char *propq);
- void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *pval);
+ void *ASN1_item_d2i_bio(const ASN1_ITEM *it, BIO *in, void *x);
void *ASN1_item_d2i_fp_ex(const ASN1_ITEM *it, FILE *in, void *x,
OSSL_LIB_CTX *libctx, const char *propq);
diff --git a/doc/man3/OSSL_CMP_MSG_get0_header.pod
b/doc/man3/OSSL_CMP_MSG_get0_header.pod
index 32cdf81187..741349cd6e 100644
--- a/doc/man3/OSSL_CMP_MSG_get0_header.pod
+++ b/doc/man3/OSSL_CMP_MSG_get0_header.pod
@@ -20,7 +20,7 @@ i2d_OSSL_CMP_MSG_bio
int OSSL_CMP_MSG_get_bodytype(const OSSL_CMP_MSG *msg);
int OSSL_CMP_MSG_update_transactionID(OSSL_CMP_CTX *ctx, OSSL_CMP_MSG *msg);
OSSL_CRMF_MSG *OSSL_CMP_CTX_setup_CRM(OSSL_CMP_CTX *ctx, int for_KUR, int
rid);
- OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file);
+ OSSL_CMP_MSG *OSSL_CMP_MSG_read(const char *file, OSSL_LIB_CTX *libctx,
const char *propq);
int OSSL_CMP_MSG_write(const char *file, const OSSL_CMP_MSG *msg);
OSSL_CMP_MSG *d2i_OSSL_CMP_MSG_bio(BIO *bio, OSSL_CMP_MSG **msg);
int i2d_OSSL_CMP_MSG_bio(BIO *bio, const OSSL_CMP_MSG *msg);
diff --git a/doc/man3/OSSL_HTTP_REQ_CTX.pod b/doc/man3/OSSL_HTTP_REQ_CTX.pod
index 38f57f5cd6..0c270780e1 100644
--- a/doc/man3/OSSL_HTTP_REQ_CTX.pod
+++ b/doc/man3/OSSL_HTTP_REQ_CTX.pod
@@ -70,8 +70,7 @@ The allocated context structure is also populated with an
internal allocated
memory B<BIO>, which collects the HTTP request and additional headers as text.
OSSL_HTTP_REQ_CTX_free() frees up the HTTP request context I<rctx>.
-The I<wbio> and I<rbio> are not free'd and it is up to the application
-to do so.
+The I<rbio> is not free'd, I<wbio> will be free'd if I<free_wbio> is set.
OSSL_HTTP_REQ_CTX_set_request_line() adds the HTTP request line to the context.
The HTTP method is determined by I<method_POST>,
