diff options
author | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-03-24 09:11:13 +0100 |
---|---|---|
committer | Dr. David von Oheimb <David.von.Oheimb@siemens.com> | 2021-05-08 14:32:43 +0200 |
commit | bea31afef013aaf5638e96e9bed1b633c510d50d (patch) | |
tree | 98d3f1926f0ae32e537ca12d4bb18456037530a5 /doc | |
parent | 0f4fb64785dbdb074b6a0e7f415697ad74596c0c (diff) |
DOC: Fix all wrong occurrences of '<propq>' to 'I<propq>'
Reviewed-by: Paul Dale <pauli@openssl.org>
(Merged from https://github.com/openssl/openssl/pull/14664)
Diffstat (limited to 'doc')
-rw-r--r-- | doc/man3/PEM_X509_INFO_read_bio_ex.pod | 3 | ||||
-rw-r--r-- | doc/man3/SSL_load_client_CA_file.pod | 4 | ||||
-rw-r--r-- | doc/man3/X509_LOOKUP.pod | 16 | ||||
-rw-r--r-- | doc/man3/X509_STORE_add_cert.pod | 14 | ||||
-rw-r--r-- | doc/man3/X509_new.pod | 2 |
5 files changed, 19 insertions, 20 deletions
diff --git a/doc/man3/PEM_X509_INFO_read_bio_ex.pod b/doc/man3/PEM_X509_INFO_read_bio_ex.pod index bd79829d2b..0c9b0ab6df 100644 --- a/doc/man3/PEM_X509_INFO_read_bio_ex.pod +++ b/doc/man3/PEM_X509_INFO_read_bio_ex.pod @@ -24,11 +24,10 @@ PEM_X509_INFO_read_bio_ex, PEM_X509_INFO_read_ex PEM_X509_INFO_read_ex() loads the B<X509_INFO> objects from a file I<fp>. -PEM_X509_INFO_read_bio_ex loads the B<X509_INFO> objects using a bio I<bp>. +PEM_X509_INFO_read_bio_ex() loads the B<X509_INFO> objects using a bio I<bp>. Each of the loaded B<X509_INFO> objects can contain a CRL, a certificate, and/or a private key. - The elements are read sequentially, and as far as they are of different type than the elements read before, they are combined into the same B<X509_INFO> object. The idea behind this is that if, for instance, a certificate is followed by diff --git a/doc/man3/SSL_load_client_CA_file.pod b/doc/man3/SSL_load_client_CA_file.pod index 9fc385a18a..a02cc016ad 100644 --- a/doc/man3/SSL_load_client_CA_file.pod +++ b/doc/man3/SSL_load_client_CA_file.pod @@ -28,10 +28,10 @@ SSL_add_store_cert_subjects_to_stack SSL_load_client_CA_file_ex() reads certificates from I<file> and returns a STACK_OF(X509_NAME) with the subject names found. The library context I<libctx> -and property query <propq> are used when fetching algorithms from providers. +and property query I<propq> are used when fetching algorithms from providers. SSL_load_client_CA_file() is similar to SSL_load_client_CA_file_ex() -but uses NULL for the library context I<libctx> and property query <propq>. +but uses NULL for the library context I<libctx> and property query I<propq>. SSL_add_file_cert_subjects_to_stack() reads certificates from I<file>, and adds their subject name to the already existing I<stack>. diff --git a/doc/man3/X509_LOOKUP.pod b/doc/man3/X509_LOOKUP.pod index 89dbb6a201..615c2070b9 100644 --- a/doc/man3/X509_LOOKUP.pod +++ b/doc/man3/X509_LOOKUP.pod @@ -94,7 +94,7 @@ X509_LOOKUP_ctrl_ex() is used to set or get additional data to or from a B<X509_LOOKUP> structure or its associated L<X509_LOOKUP_METHOD(3)>. The arguments of the control command are passed via I<argc> and I<argl>, its return value via I<*ret>. The library context I<libctx> and property -query <propq> are used when fetching algorithms from providers. +query I<propq> are used when fetching algorithms from providers. The meaning of the arguments depends on the I<cmd> number of the control command. In general, this function is not called directly, but wrapped by a macro call, see below. @@ -102,17 +102,17 @@ The control I<cmd>s known to OpenSSL are discussed in more depth in L</Control Commands>. X509_LOOKUP_ctrl() is similar to X509_LOOKUP_ctrl_ex() but -uses NULL for the library context I<libctx> and property query <propq>. +uses NULL for the library context I<libctx> and property query I<propq>. X509_LOOKUP_load_file_ex() passes a filename to be loaded immediately into the associated B<X509_STORE>. The library context I<libctx> and property -query <propq> are used when fetching algorithms from providers. +query I<propq> are used when fetching algorithms from providers. I<type> indicates what type of object is expected. This can only be used with a lookup using the implementation L<X509_LOOKUP_file(3)>. X509_LOOKUP_load_file() is similar to X509_LOOKUP_load_file_ex() but -uses NULL for the library context I<libctx> and property query <propq>. +uses NULL for the library context I<libctx> and property query I<propq>. X509_LOOKUP_add_dir() passes a directory specification from which certificates and CRLs are loaded on demand into the associated @@ -124,20 +124,20 @@ L<X509_LOOKUP_hash_dir(3)>. X509_LOOKUP_add_store_ex() passes a URI for a directory-like structure from which containers with certificates and CRLs are loaded on demand into the associated B<X509_STORE>. The library context I<libctx> and property -query <propq> are used when fetching algorithms from providers. +query I<propq> are used when fetching algorithms from providers. X509_LOOKUP_add_store() is similar to X509_LOOKUP_add_store_ex() but -uses NULL for the library context I<libctx> and property query <propq>. +uses NULL for the library context I<libctx> and property query I<propq>. X509_LOOKUP_load_store_ex() passes a URI for a single container from which certificates and CRLs are immediately loaded into the associated -B<X509_STORE>. The library context I<libctx> and property query <propq> are used +B<X509_STORE>. The library context I<libctx> and property query I<propq> are used when fetching algorithms from providers. These functions can only be used with a lookup using the implementation L<X509_LOOKUP_store(3)>. X509_LOOKUP_load_store() is similar to X509_LOOKUP_load_store_ex() but -uses NULL for the library context I<libctx> and property query <propq>. +uses NULL for the library context I<libctx> and property query I<propq>. X509_LOOKUP_load_file_ex(), X509_LOOKUP_load_file(), X509_LOOKUP_add_dir(), diff --git a/doc/man3/X509_STORE_add_cert.pod b/doc/man3/X509_STORE_add_cert.pod index db7f0cfd8c..07e8654acb 100644 --- a/doc/man3/X509_STORE_add_cert.pod +++ b/doc/man3/X509_STORE_add_cert.pod @@ -93,10 +93,10 @@ B<X509_LOOKUP> functions can look up objects in that store. X509_STORE_load_file_ex() loads trusted certificate(s) into an B<X509_STORE> from a given file. The library context I<libctx> and property -query <propq> are used when fetching algorithms from providers. +query I<propq> are used when fetching algorithms from providers. X509_STORE_load_file() is similar to X509_STORE_load_file_ex() but -uses NULL for the library context I<libctx> and property query <propq>. +uses NULL for the library context I<libctx> and property query I<propq>. X509_STORE_load_path() loads trusted certificate(s) into an B<X509_STORE> from a given directory path. @@ -105,10 +105,10 @@ documented in L<X509_LOOKUP_hash_dir(3)>. X509_STORE_load_store_ex() loads trusted certificate(s) into an B<X509_STORE> from a store at a given URI. The library context I<libctx> and -property query <propq> are used when fetching algorithms from providers. +property query I<propq> are used when fetching algorithms from providers. X509_STORE_load_store() is similar to X509_STORE_load_store_ex() but -uses NULL for the library context I<libctx> and property query <propq>. +uses NULL for the library context I<libctx> and property query I<propq>. X509_STORE_load_locations_ex() combines X509_STORE_load_file_ex() and X509_STORE_load_dir() for a given file @@ -117,17 +117,17 @@ It is permitted to specify just a file, just a directory, or both paths. X509_STORE_load_locations() is similar to X509_STORE_load_locations_ex() -but uses NULL for the library context I<libctx> and property query <propq>. +but uses NULL for the library context I<libctx> and property query I<propq>. X509_STORE_set_default_paths_ex() is somewhat misnamed, in that it does not set what default paths should be used for loading certificates. Instead, it loads certificates into the B<X509_STORE> from the hardcoded default -paths. The library context I<libctx> and property query <propq> are used when +paths. The library context I<libctx> and property query I<propq> are used when fetching algorithms from providers. X509_STORE_set_default_paths() is similar to X509_STORE_set_default_paths_ex() but uses NULL for the library -context I<libctx> and property query <propq>. +context I<libctx> and property query I<propq>. =head1 RETURN VALUES diff --git a/doc/man3/X509_new.pod b/doc/man3/X509_new.pod index 2514ae34ce..ea2b3a2cc9 100644 --- a/doc/man3/X509_new.pod +++ b/doc/man3/X509_new.pod @@ -22,7 +22,7 @@ The X509 ASN1 allocation routines, allocate and free an X509 structure, which represents an X509 certificate. X509_new_ex() allocates and initializes a X509 structure with a -library context of I<libctx>, property query of <propq> and a reference +library context of I<libctx>, property query of I<propq> and a reference count of B<1>. Many X509 functions such as X509_check_purpose(), and X509_verify() use this library context to select which providers supply the fetched algorithms (SHA1 is used internally). This created X509 object can then |