diff options
author | jkim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
---|---|---|
committer | jkim <jkim@FreeBSD.org> | 2014-08-07 18:56:10 +0000 |
commit | 3299c3be1ad20ab974be3dd97789e20b68dfa949 (patch) | |
tree | 466b55a31fe1a87db4dfcbef9e5d2f3e8aec65e1 /secure/lib/libcrypto/man/pem.3 | |
parent | c934f5fd2852ea5ed2fcbb043e6cf7316daa7e7e (diff) | |
parent | 8bd1d6691f94efdce2338dffd823889f6c6b8ed2 (diff) | |
download | FreeBSD-src-3299c3be1ad20ab974be3dd97789e20b68dfa949.zip FreeBSD-src-3299c3be1ad20ab974be3dd97789e20b68dfa949.tar.gz |
Merge OpenSSL 1.0.1i.
Diffstat (limited to 'secure/lib/libcrypto/man/pem.3')
-rw-r--r-- | secure/lib/libcrypto/man/pem.3 | 9 |
1 files changed, 6 insertions, 3 deletions
diff --git a/secure/lib/libcrypto/man/pem.3 b/secure/lib/libcrypto/man/pem.3 index 01fc4b0..d478da8 100644 --- a/secure/lib/libcrypto/man/pem.3 +++ b/secure/lib/libcrypto/man/pem.3 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "pem 3" -.TH pem 3 "2014-06-05" "1.0.1h" "OpenSSL" +.TH pem 3 "2014-08-06" "1.0.1i" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -598,9 +598,9 @@ byte \fBsalt\fR encoded as a set of hexadecimal digits. .PP After this is the base64 encoded encrypted data. .PP -The encryption key is determined using \fIEVP_bytestokey()\fR, using \fBsalt\fR and an +The encryption key is determined using \fIEVP_BytesToKey()\fR, using \fBsalt\fR and an iteration count of 1. The \s-1IV\s0 used is the value of \fBsalt\fR and *not* the \s-1IV\s0 -returned by \fIEVP_bytestokey()\fR. +returned by \fIEVP_BytesToKey()\fR. .SH "BUGS" .IX Header "BUGS" The \s-1PEM\s0 read routines in some versions of OpenSSL will not correctly reuse @@ -624,3 +624,6 @@ The read routines return either a pointer to the structure read or \s-1NULL\s0 if an error occurred. .PP The write routines return 1 for success or 0 for failure. +.SH "SEE ALSO" +.IX Header "SEE ALSO" +\&\fIEVP_get_cipherbyname\fR\|(3), \fIEVP_BytesToKey\fR\|(3) |