diff options
Diffstat (limited to 'openssl/doc/crypto')
| -rw-r--r-- | openssl/doc/crypto/BN_BLINDING_new.pod | 2 | ||||
| -rw-r--r-- | openssl/doc/crypto/ERR_get_error.pod | 7 | ||||
| -rw-r--r-- | openssl/doc/crypto/EVP_BytesToKey.pod | 2 | ||||
| -rw-r--r-- | openssl/doc/crypto/EVP_EncryptInit.pod | 2 | ||||
| -rw-r--r-- | openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod | 2 | ||||
| -rw-r--r-- | openssl/doc/crypto/pem.pod | 2 |
6 files changed, 10 insertions, 7 deletions
diff --git a/openssl/doc/crypto/BN_BLINDING_new.pod b/openssl/doc/crypto/BN_BLINDING_new.pod index 5f51fdb47..da06e4446 100644 --- a/openssl/doc/crypto/BN_BLINDING_new.pod +++ b/openssl/doc/crypto/BN_BLINDING_new.pod @@ -48,7 +48,7 @@ necessary parameters are set, by re-creating the blinding parameters. BN_BLINDING_convert_ex() multiplies B<n> with the blinding factor B<A>. If B<r> is not NULL a copy the inverse blinding factor B<Ai> will be -returned in B<r> (this is useful if a B<RSA> object is shared amoung +returned in B<r> (this is useful if a B<RSA> object is shared among several threads). BN_BLINDING_invert_ex() multiplies B<n> with the inverse blinding factor B<Ai>. If B<r> is not NULL it will be used as the inverse blinding. diff --git a/openssl/doc/crypto/ERR_get_error.pod b/openssl/doc/crypto/ERR_get_error.pod index 34443045f..828ecf529 100644 --- a/openssl/doc/crypto/ERR_get_error.pod +++ b/openssl/doc/crypto/ERR_get_error.pod @@ -52,8 +52,11 @@ ERR_get_error_line_data(), ERR_peek_error_line_data() and ERR_get_last_error_line_data() store additional data and flags associated with the error code in *B<data> and *B<flags>, unless these are B<NULL>. *B<data> contains a string -if *B<flags>&B<ERR_TXT_STRING>. If it has been allocated by OPENSSL_malloc(), -*B<flags>&B<ERR_TXT_MALLOCED> is true. +if *B<flags>&B<ERR_TXT_STRING> is true. + +An application B<MUST NOT> free the *B<data> pointer (or any other pointers +returned by these functions) with OPENSSL_free() as freeing is handled +automatically by the error library. =head1 RETURN VALUES diff --git a/openssl/doc/crypto/EVP_BytesToKey.pod b/openssl/doc/crypto/EVP_BytesToKey.pod index d375c46e0..0ea7d55c0 100644 --- a/openssl/doc/crypto/EVP_BytesToKey.pod +++ b/openssl/doc/crypto/EVP_BytesToKey.pod @@ -17,7 +17,7 @@ EVP_BytesToKey - password based encryption routine EVP_BytesToKey() derives a key and IV from various parameters. B<type> is the cipher to derive the key and IV for. B<md> is the message digest to use. -The B<salt> paramter is used as a salt in the derivation: it should point to +The B<salt> parameter is used as a salt in the derivation: it should point to an 8 byte buffer or NULL if no salt is used. B<data> is a buffer containing B<datal> bytes which is used to derive the keying data. B<count> is the iteration count to use. The derived key and IV will be written to B<key> diff --git a/openssl/doc/crypto/EVP_EncryptInit.pod b/openssl/doc/crypto/EVP_EncryptInit.pod index 8271d3dfc..1c4bf184a 100644 --- a/openssl/doc/crypto/EVP_EncryptInit.pod +++ b/openssl/doc/crypto/EVP_EncryptInit.pod @@ -152,7 +152,7 @@ does not remain in memory. 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<ctx> paramter does not need to be +EVP_CipherInit_ex() except the B<ctx> parameter does not need to be initialized and they always use the default cipher implementation. EVP_EncryptFinal(), EVP_DecryptFinal() and EVP_CipherFinal() behave in a diff --git a/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod b/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod index b68eece03..46cac2bea 100644 --- a/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod +++ b/openssl/doc/crypto/X509_VERIFY_PARAM_set_flags.pod @@ -113,7 +113,7 @@ a special status code is set to the verification callback. This permits it to examine the valid policy tree and perform additional checks or simply log it for debugging purposes. -By default some addtional features such as indirect CRLs and CRLs signed by +By default some additional features such as indirect CRLs and CRLs signed by different keys are disabled. If B<X509_V_FLAG_EXTENDED_CRL_SUPPORT> is set they are enabled. diff --git a/openssl/doc/crypto/pem.pod b/openssl/doc/crypto/pem.pod index d5b189611..54414a3f6 100644 --- a/openssl/doc/crypto/pem.pod +++ b/openssl/doc/crypto/pem.pod @@ -201,7 +201,7 @@ handle PKCS#8 format encrypted and unencrypted keys too. PEM_write_bio_PKCS8PrivateKey() and PEM_write_PKCS8PrivateKey() write a private key in an EVP_PKEY structure in PKCS#8 EncryptedPrivateKeyInfo format using PKCS#5 v2.0 password based encryption -algorithms. The B<cipher> argument specifies the encryption algoritm to +algorithms. The B<cipher> argument specifies the encryption algorithm to use: unlike all other PEM routines the encryption is applied at the PKCS#8 level and not in the PEM headers. If B<cipher> is NULL then no encryption is used and a PKCS#8 PrivateKeyInfo structure is used instead. |