diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:24:12 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:26:00 +0200 |
| commit | 04168ae281bfbd714ddf6b90d98eac892508dde8 (patch) | |
| tree | c2d7e42dede9c0b9930ce537eb7d804e45459e53 /openssl/doc/crypto/pem.pod | |
| parent | e21655632e3fd40b7f6a5cc3c7f3c379d54557c4 (diff) | |
| download | vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.gz vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.tar.bz2 vcxsrv-04168ae281bfbd714ddf6b90d98eac892508dde8.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)> |