Prompted by Kris Kennaway <kris@FreeBSD.org>

Update to to the current time for OpenSSH.  The notable commit given to me
for this new date is:

(provos@cvs.openbsd.org)

        usr.bin/ssh    : hostfile.c

in known_hosts key lookup the entry for the bits does not need to match, all
the information is contained in n and e.  This solves the problem with buggy
servers announcing the wrong modulus length.  markus and me.

4 files changed, 31 insertions, 32 deletions

diff --git a/security/openssh/Makefile b/security/openssh/Makefile
index 0037d56810e2..74b22cfc58ab 100644
--- a/security/openssh/Makefile
+++ b/security/openssh/Makefile
@@ -21,7 +21,7 @@ CAT?=		/bin/cat
 DISTFILES!=	${CAT} ${FILESDIR}/distfiles
 
 CVS_CMD?=	cvs -z3
-CVS_DATE=	Mon Nov 15 01:30:17 EST 1999
+CVS_DATE=	Tue Nov 16 16:45:45 PST 1999
 CVS_SITE?=	anoncvs@anoncvs1.ca.openbsd.org:/cvs
 CRYPTOLIBS=	-L${PREFIX}/lib -lcrypto
 .if defined(USA_RESIDENT) && ${USA_RESIDENT} == YES
diff --git a/security/openssh/distinfo b/security/openssh/distinfo
index d9ddfad34cfe..c546ee038065 100644
--- a/security/openssh/distinfo
+++ b/security/openssh/distinfo
@@ -1,7 +1,6 @@
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/lib/Makefile) = f8ea9d03d277967a45f5e0d677762d30
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/lib/Makefile) = fcf2c95b795ebb2c3ef37eee749e0bc3
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp/Makefile) = 5cb4c5fcabde5ccc4f9ca475ac3452f4
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/COPYING.Ylonen) = d8416f438a512281d230790c8487ce0b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ChangeLog) = afe0acb540f878018ff1f01995e6cdd3
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/Makefile) = 7f10222699e8a34758fe63d0c7df6806
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/Makefile.inc) = 8f096d4d5a830efe7dde5674b482cd2b
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/OVERVIEW) = 2aa4be725bbc218e97ca89e5f8bb181b
@@ -9,12 +8,12 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/README) = a744582db9d285ffbc55030ced3d87d5
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/RFC.nroff) = 1615f30810a3d47716883b2eaddd712c
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-krb4.c) = 5e49fb727617e55f95c66246d3c90843
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-passwd.c) = dd6381fb76a253e47e423dd1034f0cb4
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rh-rsa.c) = e44488b9ddcdaa09230f34bb3b7545fa
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rh-rsa.c) = 01b63ab1fa245f1aa9a14f3b8b60ef12
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rhosts.c) = 11d47e5a115b83aae44674237ed99d84
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rsa.c) = 35eff425d02403f5f4991fb450d1f32b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-rsa.c) = cf67217fc3a7579468236648c9c04c70
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/auth-skey.c) = b06ddb3c15f79fc3f566e384db648b62
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.c) = 69de44afa5afe230f31cded7ad730687
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.h) = 5655f3f400fc6db0e8e288c3a43bc714
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.c) = 09ca2c6cdd41443a3c5684ab17499bc6
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfd.h) = fb324de954d588249db26709b6c1cc05
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/authfile.c) = 83796ca9b5c914d0a29a58adc13816db
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.c) = b9c43d1b9fb421e6b737f420b94076ab
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/bufaux.h) = e4f6b704a67973170d44695f3b566f05
@@ -24,8 +23,8 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/canohost.c) = 7abfb8e99c3441ec76bd962ecfdde8cf
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.c) = dd58bbe867cfe914f37a39c757ccd4b5
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.c) = 0d41a91415bf02c246810d1b0d8fb6bd
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/channels.h) = 72d03b7b023c7d794c28b38ce43d9e5b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.c) = 45f7af7b8007328906639ae1a70bbe72
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.h) = 305a9edc17d5b10ff4af3cb4b9f23d3c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.c) = 346796f428b6d87ad8c307b0f17827a0
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/cipher.h) = e8167ec15b1da0a2c6015fe5751b8034
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/clientloop.c) = 35d83161add433f156605ad6ef1f0a7c
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.c) = 6bac0ff0847f26f16b3f11f47d56c367
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/compat.h) = 8d4063d6eb22bd9b9aba4f768a96ce65
@@ -35,21 +34,21 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/crc32.h) = ca822d3b56144b7f3ebf23505696df64
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.c) = 688e2300af960a6b88cc7af582276b77
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/deattack.h) = 84cd5fc5ab5857659c337495f13e97af
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/getput.h) = 564761caa67f9c507e73b2383f86dc0c
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/hostfile.c) = 8a2a731b0df42fc69232235ea2d538e5
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/hostfile.c) = 1c18dcfc56c007b0cf51490e9a7398cf
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/includes.h) = 21a803e66cf63001eaf3fd22bf6c2b54
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-client.c) = 68418f7939765d0abee948d5cc169ab5
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/log-server.c) = 7e7091fe67d498832c79b93b6de38a24
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/log.c) = 80b576a3a50316fb10af6d374faf29d1
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/login.c) = b9700635ffbdcc489613eabf26e93214
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/match.c) = 559b73caeb055519cab5f403e412b099
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.c) = ee3f89360b5ab19e88d7a5eb5270f59b
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.h) = 5394ef9021c3394c2b0aeba22b18426e
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.c) = fb1b916a31c47f83d65b0f1c3f9d90c2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/mpaux.h) = 2e3c5530ecd7972373baf7d23da49d51
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.c) = a4ec43de3e4b9687e76e14b22d701ba2
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.h) = fc559438a23bf1c4f6e7faaaf5f581a4
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/nchan.ms) = 6a168c05b13aed9a6c9b9d384edcf2c2
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.c) = e79e440c02605a629578609e9b625d9c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.c) = dc38cd8b52272d0cd9b555812b612625
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh/Makefile) = 41b006d3c04b599619990b47da60f81e
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.h) = 0a4004c7f560485793487457dab838c2
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/packet.h) = 9ed190c08fc4bfd230adfa50d02d6ed2
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.c) = 0f62619cb5f1622a1d0940993b6bb5e9
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/pty.h) = c42c8189284dfe0d34125b77446bd062
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/radix.c) = 0e98d49a6f27cb09480f38c9dfce9b62
@@ -63,19 +62,19 @@ MD5 (OpenSSH-1.2/src/usr.bin/ssh/scp.c) = dbe9a6bd347ef622e1248751ff2707b2
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.c) = 751b822fb21c816b40b457cf0b736c11
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/servconf.h) = 468c25070e4afbccf948730311690a34
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/serverloop.c) = 3462fbffbcac79a61c333ce8561fac7a
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.1) = db457a15c9bcc6709c5911c969fbbee7
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.c) = 611aef095c1423688fd7bbd3ac4e75af
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.1) = 4b97d6fbe61628569dfc12dad1fe3228
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-add.c) = 0e51e4ece3a96e2400f369813e9ee0d9
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.1) = 9c14e6863f382158793f122a61cab429
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.c) = 208fb65fba423e338920b0015f1cd22c
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.1) = 74b7482f75183f6f1f7a7574b69c2f21
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.c) = ae844594322a8da0805e5381a62b8331
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.1) = 955a39c28fef60670ced4205dbf7aa71
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.c) = d87762c34bbe041f717e349a717bbeae
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.h) = cd8c5167b6008fef45a2b009d5c5c393
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-agent.c) = 564cc76f9bdc4cc38b0c23f484cf86d9
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.1) = 746734eab948fff84a44c3383f5a1701
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh-keygen.c) = 27f16c34361e7043405dbf4e9ce943e3
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.1) = 79990c8a57e503ed1edbb66a772f210c
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.c) = cea39462d5846a2fc799a6e7551a8d45
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh.h) = fb253bd3a36bcef99f1c4f5b63cef8e7
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ssh_config) = 9658715526aeaf0bc43528d3159b475f
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = 14e58e52c1a2d54b6e69878002c05a1b
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshconnect.c) = eae083dc313b8976add5ad1ea30f8fa1
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.8) = 97965e2d3844e6bc5979dcaa268af7bb
-MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = be6391ba3207277d506eb50be1a99d8f
+MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd.c) = 7105359a53ed30d552b64d215bed16bf
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/sshd_config) = e78b81c34da5c97eee1359cccda908d6
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/tildexpand.c) = 6f797f65e32fe1022ee20f291611a6e2
 MD5 (OpenSSH-1.2/src/usr.bin/ssh/ttymodes.c) = b11079749fc93e0a8337af4afb3ebc43
diff --git a/security/openssh/files/patch-ah b/security/openssh/files/patch-ah
index 369de0681301..0ebde6715cb9 100644
--- a/security/openssh/files/patch-ah
+++ b/security/openssh/files/patch-ah
@@ -5,10 +5,10 @@ diff -ru /home/green/ssh/cipher.h ./cipher.h
  #ifndef CIPHER_H
  #define CIPHER_H
  
--#include <des.h>
+-#include <ssl/des.h>
 -#include <ssl/blowfish.h>
-+#include <openssl/blowfish.h>
 +#include <openssl/des.h>
++#include <openssl/blowfish.h>
  
  /* Cipher types.  New types can be added, but old types should not be removed
     for compatibility.  The maximum allowed value is 31. */
diff --git a/security/openssh/files/patch-aj b/security/openssh/files/patch-aj
index 8a42eeee4c8b..2b51018f9bc7 100644
--- a/security/openssh/files/patch-aj
+++ b/security/openssh/files/patch-aj
@@ -1,11 +1,11 @@
---- ./lib/Makefile.orig	Thu Nov 11 05:32:55 1999
-+++ ./lib/Makefile	Thu Nov 11 08:54:34 1999
+--- ./lib/Makefile.orig	Tue Nov 16 16:50:53 1999
++++ ./lib/Makefile	Tue Nov 16 16:52:01 1999
 @@ -4,7 +4,7 @@
  SRCS=   authfd.c authfile.c bufaux.c buffer.c canohost.c channels.c \
- 	cipher.c compat.c compress.c crc32.c deattack.c hostfile.c \
- 	log.c match.c mpaux.c nchan.c packet.c readpass.c rsa.c \
--	tildexpand.c ttymodes.c uidswap.c xmalloc.c
-+	tildexpand.c ttymodes.c uidswap.c xmalloc.c strlcpy.c
+ 	cipher.c compat.c compress.c crc32.c deattack.c fingerprint.c \
+ 	hostfile.c log.c match.c mpaux.c nchan.c packet.c readpass.c \
+-	rsa.c tildexpand.c ttymodes.c uidswap.c xmalloc.c
++	rsa.c strlcpy.c tildexpand.c ttymodes.c uidswap.c xmalloc.c
  
  NOPROFILE= yes
  NOPIC=	yes