aboutsummaryrefslogtreecommitdiffstats
path: root/doc/crypto
diff options
context:
space:
mode:
authorMatt Caswell <matt@openssl.org>2015-02-20 09:18:29 +0000
committerMatt Caswell <matt@openssl.org>2015-02-25 17:13:34 +0000
commit12e0ea306a18daefecd7ce769b1cc8bf401aae4c (patch)
tree643843057d2cdf30a50b20c6da4db9f834db8a6b /doc/crypto
parent535bc8faf69dc4ff39e2ee99195b268cf99b9569 (diff)
downloadopenssl-12e0ea306a18daefecd7ce769b1cc8bf401aae4c.tar.gz
Fix some minor documentation issues
Reviewed-by: Emilia Käsper <emilia@openssl.org>
Diffstat (limited to 'doc/crypto')
-rw-r--r--doc/crypto/d2i_ECPrivateKey.pod4
-rw-r--r--doc/crypto/d2i_X509.pod6
2 files changed, 4 insertions, 6 deletions
diff --git a/doc/crypto/d2i_ECPrivateKey.pod b/doc/crypto/d2i_ECPrivateKey.pod
index 928c6fb78c..adeffe643c 100644
--- a/doc/crypto/d2i_ECPrivateKey.pod
+++ b/doc/crypto/d2i_ECPrivateKey.pod
@@ -31,8 +31,8 @@ for a description of point_conversion_form.
When reading a private key encoded without an associated public key (e.g. if
EC_PKEY_NO_PUBKEY has been used - see below), then d2i_ECPrivateKey generates
the missing public key automatically. Private keys encoded without parameters
-(e.g. if EC_PKEY_NO_PARAMETERS has been used - see below) then the key cannot be
-loaded using d2i_ECPrivateKey.
+(e.g. if EC_PKEY_NO_PARAMETERS has been used - see below) cannot be loaded using
+d2i_ECPrivateKey.
The functions EC_KEY_get_enc_flags and EC_KEY_set_enc_flags get and set the
value of the encoding flags for the B<key>. There are two encoding flags
diff --git a/doc/crypto/d2i_X509.pod b/doc/crypto/d2i_X509.pod
index 03236769a0..5b7c16fd03 100644
--- a/doc/crypto/d2i_X509.pod
+++ b/doc/crypto/d2i_X509.pod
@@ -90,8 +90,7 @@ can trap the unwary. See the B<WARNINGS> section for some common
errors.
The reason for the auto increment behaviour is to reflect a typical
-usage of ASN1 functions: after one structure is encoded or decoded if (a != NULL)
- (*a) = ret;
+usage of ASN1 functions: after one structure is encoded or decoded
another will processed after it.
=head1 EXAMPLES
@@ -213,8 +212,7 @@ of this "reuse" behaviour is strongly discouraged.
i2d_X509() will not return an error in many versions of OpenSSL,
if mandatory fields are not initialized due to a programming error
-then the encoded structure may contain invalid data or omit the if (a != NULL)
- (*a) = ret;
+then the encoded structure may contain invalid data or omit the
fields entirely and will not be parsed by d2i_X509(). This may be
fixed in future so code should not assume that i2d_X509() will
always succeed.