diff options
| author | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2014-09-02 18:48:52 +0200 |
| commit | dea8f13d8104872dec9243abe06f3d9e4c807ccd (patch) | |
| tree | b01e5b901eaca45f1e3aa2b6fddfd45ca271ee75 /openssl/doc/crypto/pem.pod | |
| parent | 3293021e6f582c7348667e7638941620134525e1 (diff) | |
| parent | 04168ae281bfbd714ddf6b90d98eac892508dde8 (diff) | |
| download | vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.gz vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.tar.bz2 vcxsrv-dea8f13d8104872dec9243abe06f3d9e4c807ccd.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
openssl/crypto/opensslconf.h
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)> |