summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
authorjmc <jmc@openbsd.org>2014-06-25 06:57:42 +0000
committerjmc <jmc@openbsd.org>2014-06-25 06:57:42 +0000
commit8eea412253605e6ce6b4f9f80b35a7706846047a (patch)
tree368ac1ec341d1098a65a6718482f4a9faafc6760
parentdocument why we explicit_bzero (diff)
downloadwireguard-openbsd-8eea412253605e6ce6b4f9f80b35a7706846047a.tar.xz
wireguard-openbsd-8eea412253605e6ce6b4f9f80b35a7706846047a.zip
Alexander Schrijver posted a diff to remove references to the c_rehash script,
which we don;t have in base. after some discussion with jca, i've not removed these references, but tried to make it clearer it's distributed with openssl and not included in base;
-rw-r--r--usr.bin/ftp/ftp.17
-rw-r--r--usr.sbin/openssl/openssl.111
2 files changed, 9 insertions, 9 deletions
diff --git a/usr.bin/ftp/ftp.1 b/usr.bin/ftp/ftp.1
index c3441814ef2..cef516a2cac 100644
--- a/usr.bin/ftp/ftp.1
+++ b/usr.bin/ftp/ftp.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: ftp.1,v 1.91 2014/01/23 08:09:08 jmc Exp $
+.\" $OpenBSD: ftp.1,v 1.92 2014/06/25 06:57:42 jmc Exp $
.\" $NetBSD: ftp.1,v 1.22 1997/08/18 10:20:22 lukem Exp $
.\"
.\" Copyright (c) 1985, 1989, 1990, 1993
@@ -30,7 +30,7 @@
.\"
.\" @(#)ftp.1 8.3 (Berkeley) 10/9/94
.\"
-.Dd $Mdocdate: January 23 2014 $
+.Dd $Mdocdate: June 25 2014 $
.Dt FTP 1
.Os
.Sh NAME
@@ -232,7 +232,8 @@ validation.
.It Cm capath Ns = Ns Ar /path/to/certs/
Directory containing PEM encoded CA certificates used for certificate
validation.
-Such a directory can be prepared using the c_rehash OpenSSL utility.
+Such a directory can be prepared using the c_rehash script distributed with
+OpenSSL.
.It Cm ciphers Ns = Ns Ar cipher_list
Specify the list of ciphers that will be used by
.Nm .
diff --git a/usr.sbin/openssl/openssl.1 b/usr.sbin/openssl/openssl.1
index 169f43743ab..a95e5a39827 100644
--- a/usr.sbin/openssl/openssl.1
+++ b/usr.sbin/openssl/openssl.1
@@ -1,4 +1,4 @@
-.\" $OpenBSD: openssl.1,v 1.96 2014/06/02 17:06:28 jsing Exp $
+.\" $OpenBSD: openssl.1,v 1.97 2014/06/25 06:57:42 jmc Exp $
.\" ====================================================================
.\" Copyright (c) 1998-2002 The OpenSSL Project. All rights reserved.
.\"
@@ -112,7 +112,7 @@
.\"
.\" OPENSSL
.\"
-.Dd $Mdocdate: June 2 2014 $
+.Dd $Mdocdate: June 25 2014 $
.Dt OPENSSL 1
.Os
.Sh NAME
@@ -8935,11 +8935,10 @@ or have symbolic links to them of this form
option of the
.Nm x509
utility).
-Under
-.Ux ,
-the
+The
.Nm c_rehash
-script will automatically create symbolic links to a directory of certificates.
+script distributed with OpenSSL
+will automatically create symbolic links to a directory of certificates.
.It Fl crl_check
Checks end entity certificate validity by attempting to look up a valid CRL.
If a valid CRL cannot be found an error occurs.