From aeb5a4ff70fa036e3502afc9daf7d02795216340 Mon Sep 17 00:00:00 2001 From: jkim Date: Thu, 10 Apr 2014 22:39:22 +0000 Subject: MFC: r261037, r264278 Merge OpenSSL 1.0.1f and 1.0.1g. --- secure/lib/libcrypto/man/pem.3 | 6 +++--- 1 file changed, 3 insertions(+), 3 deletions(-) (limited to 'secure/lib/libcrypto/man/pem.3') diff --git a/secure/lib/libcrypto/man/pem.3 b/secure/lib/libcrypto/man/pem.3 index 0cab0d3..4f39fcb 100644 --- a/secure/lib/libcrypto/man/pem.3 +++ b/secure/lib/libcrypto/man/pem.3 @@ -1,4 +1,4 @@ -.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.23) +.\" Automatically generated by Pod::Man 2.25 (Pod::Simple 3.28) .\" .\" Standard preamble: .\" ======================================================================== @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "pem 3" -.TH pem 3 "2013-02-11" "1.0.1e" "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. -- cgit v1.1