diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:24:12 +0200 |
|---|---|---|
| committer | Mike DePaulo <mikedep333@gmail.com> | 2015-02-28 07:15:53 -0500 |
| commit | 8fafe3481b134a4d368ba57e3698754a6a45c4c1 (patch) | |
| tree | b617e841e1b5c0b234f7698331e5fb1be1c2332a /openssl/doc/crypto/pem.pod | |
| parent | fe03d6aef6338e43593f164b09ae993bcd0ecbdd (diff) | |
| download | vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.gz vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.tar.bz2 vcxsrv-8fafe3481b134a4d368ba57e3698754a6a45c4c1.zip | |
Upgrade openssl to version openssl-1.0.1i
Diffstat (limited to 'openssl/doc/crypto/pem.pod')
| -rw-r--r-- | openssl/doc/crypto/pem.pod | 8 |
1 files changed, 6 insertions, 2 deletions
diff --git a/openssl/doc/crypto/pem.pod b/openssl/doc/crypto/pem.pod index 54414a3f6..21e9fe3b9 100644 --- a/openssl/doc/crypto/pem.pod +++ b/openssl/doc/crypto/pem.pod @@ -450,9 +450,9 @@ byte B<salt> encoded as a set of hexadecimal digits. After this is the base64 encoded encrypted data. -The encryption key is determined using EVP_bytestokey(), using B<salt> and an +The encryption key is determined using EVP_BytesToKey(), using B<salt> and an iteration count of 1. The IV used is the value of B<salt> and *not* the IV -returned by EVP_bytestokey(). +returned by EVP_BytesToKey(). =head1 BUGS @@ -474,3 +474,7 @@ The read routines return either a pointer to the structure read or NULL if an error occurred. The write routines return 1 for success or 0 for failure. + +=head1 SEE ALSO + +L<EVP_get_cipherbyname(3)|EVP_get_cipherbyname>, L<EVP_BytesToKey(3)|EVP_BytesToKey(3)> |