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/usr.bin/openssl/man/ec.1 | |
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/usr.bin/openssl/man/ec.1')
-rw-r--r-- | secure/usr.bin/openssl/man/ec.1 | 4 |
1 files changed, 2 insertions, 2 deletions
diff --git a/secure/usr.bin/openssl/man/ec.1 b/secure/usr.bin/openssl/man/ec.1 index 0fdc3de..22bf121 100644 --- a/secure/usr.bin/openssl/man/ec.1 +++ b/secure/usr.bin/openssl/man/ec.1 @@ -124,7 +124,7 @@ .\" ======================================================================== .\" .IX Title "EC 1" -.TH EC 1 "2014-01-06" "1.0.1f" "OpenSSL" +.TH EC 1 "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 @@ -164,7 +164,7 @@ PKCS#8 private key format use the \fBpkcs8\fR command. .IX Item "-inform DER|PEM" This specifies the input format. The \fB\s-1DER\s0\fR option with a private key uses an \s-1ASN\s0.1 \s-1DER\s0 encoded \s-1SEC1\s0 private key. When used with a public key it -uses the SubjectPublicKeyInfo structur as specified in \s-1RFC\s0 3280. +uses the SubjectPublicKeyInfo structure as specified in \s-1RFC\s0 3280. The \fB\s-1PEM\s0\fR form is the default format: it consists of the \fB\s-1DER\s0\fR format base64 encoded with additional header and footer lines. In the case of a private key PKCS#8 format is also accepted. |