summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDarren Tucker <dtucker@zip.com.au>2008-06-13 04:44:25 +1000
committerDarren Tucker <dtucker@zip.com.au>2008-06-13 04:44:25 +1000
commitdcc1ab5483a5f0f0a72c14149ace9979c8dea085 (patch)
treed0c2a7d64a5ec09c9046e4e708461cac393edd8e
parent014d76fa7294db63e37c642556008206f0179622 (diff)
- grunk@cvs.openbsd.org 2008/06/11 23:03:56
[ssh_config.5] CheckHostIP set to ``fingerprint'' will display both hex and random art spotted by naddy@
-rw-r--r--ChangeLog6
-rw-r--r--ssh_config.55
2 files changed, 8 insertions, 3 deletions
diff --git a/ChangeLog b/ChangeLog
index 28aaf6091..3e7f20152 100644
--- a/ChangeLog
+++ b/ChangeLog
@@ -37,6 +37,10 @@
37 - otto@cvs.openbsd.org 2008/06/11 23:02:22 37 - otto@cvs.openbsd.org 2008/06/11 23:02:22
38 [key.c] 38 [key.c]
39 simpler way of computing the augmentations; ok grunk@ 39 simpler way of computing the augmentations; ok grunk@
40 - grunk@cvs.openbsd.org 2008/06/11 23:03:56
41 [ssh_config.5]
42 CheckHostIP set to ``fingerprint'' will display both hex and random art
43 spotted by naddy@
40 44
4120080611 4520080611
42 - (djm) [channels.c configure.ac] 46 - (djm) [channels.c configure.ac]
@@ -4199,4 +4203,4 @@
4199 OpenServer 6 and add osr5bigcrypt support so when someone migrates 4203 OpenServer 6 and add osr5bigcrypt support so when someone migrates
4200 passwords between UnixWare and OpenServer they will still work. OK dtucker@ 4204 passwords between UnixWare and OpenServer they will still work. OK dtucker@
4201 4205
4202$Id: ChangeLog,v 1.4972 2008/06/12 18:43:51 dtucker Exp $ 4206$Id: ChangeLog,v 1.4973 2008/06/12 18:44:25 dtucker Exp $
diff --git a/ssh_config.5 b/ssh_config.5
index 28ac724c8..8bcf323cc 100644
--- a/ssh_config.5
+++ b/ssh_config.5
@@ -34,7 +34,7 @@
34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF 34.\" (INCLUDING NEGLIGENCE OR OTHERWISE) ARISING IN ANY WAY OUT OF THE USE OF
35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE. 35.\" THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF SUCH DAMAGE.
36.\" 36.\"
37.\" $OpenBSD: ssh_config.5,v 1.107 2008/06/11 21:01:35 grunk Exp $ 37.\" $OpenBSD: ssh_config.5,v 1.108 2008/06/11 23:03:56 grunk Exp $
38.Dd $Mdocdate: June 11 2008 $ 38.Dd $Mdocdate: June 11 2008 $
39.Dt SSH_CONFIG 5 39.Dt SSH_CONFIG 5
40.Os 40.Os
@@ -162,7 +162,8 @@ file.
162This allows ssh to detect if a host key changed due to DNS spoofing. 162This allows ssh to detect if a host key changed due to DNS spoofing.
163If the option is set to 163If the option is set to
164.Dq fingerprint , 164.Dq fingerprint ,
165not only the host IP address will be checked, but also an ASCII art 165not only the host IP address will be checked, but also a fingerprint
166along with an ASCII art
166representation of the key will be printed. 167representation of the key will be printed.
167If the option is set to 168If the option is set to
168.Dq no , 169.Dq no ,