diff options
| author | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-04-08 21:06:58 +0000 |
| commit | 89b378c4b34c70b60981e17ea385f14c9e285912 (patch) | |
| tree | 782ade2dc94388e4ddc56b20d9c7ccf578d61077 /secure/lib/libcrypto/man/pem.3 | |
| parent | 808e531530813c805e5f01db2b51e22340fd77a6 (diff) | |
| download | FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.zip FreeBSD-src-89b378c4b34c70b60981e17ea385f14c9e285912.tar.gz | |
Merge OpenSSL 1.0.1g.
Approved by: benl (maintainer)
Diffstat (limited to 'secure/lib/libcrypto/man/pem.3')
| -rw-r--r-- | secure/lib/libcrypto/man/pem.3 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/secure/lib/libcrypto/man/pem.3 b/secure/lib/libcrypto/man/pem.3 index e8eeccf..4f39fcb 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-01-06" "1.0.1f" "OpenSSL" +.TH pem 3 "2014-04-07" "1.0.1g" "OpenSSL" .\" For nroff, turn off justification. Always turn off hyphenation; it makes .\" way too many mistakes in technical documents. .if n .ad l @@ -329,7 +329,7 @@ handle PKCS#8 format encrypted and unencrypted keys too. \&\fIPEM_write_bio_PKCS8PrivateKey()\fR and \fIPEM_write_PKCS8PrivateKey()\fR write a private key in an \s-1EVP_PKEY\s0 structure in PKCS#8 EncryptedPrivateKeyInfo format using PKCS#5 v2.0 password based encryption -algorithms. The \fBcipher\fR argument specifies the encryption algoritm to +algorithms. The \fBcipher\fR argument specifies the encryption algorithm to use: unlike all other \s-1PEM\s0 routines the encryption is applied at the PKCS#8 level and not in the \s-1PEM\s0 headers. If \fBcipher\fR is \s-1NULL\s0 then no encryption is used and a PKCS#8 PrivateKeyInfo structure is used instead. |
