Commit Graph

59 Commits

Author SHA1 Message Date
Darren Tucker
a615314d3b - (dtucker) [ssh-keyscan.c] Sync RCSIDs, missed in SSH_SSFDMAX change below. 2003-12-10 00:52:37 +11:00
Damien Miller
e00074a726 - (djm) OpenBSD CVS Sync
- djm@cvs.openbsd.org 2003/11/23 23:17:34
     [ssh-keyscan.c]
     from portable - use sysconf to detect fd limit; ok markus@
     (tidy diff by adding SSH_SSFDMAX macro to defines.h)
2003-11-24 13:07:45 +11:00
Darren Tucker
3d32622171 - markus@cvs.openbsd.org 2003/09/19 11:30:39
[ssh-keyscan.c]
     avoid fatal_cleanup, just call exit(); ok deraadt
2003-09-22 21:11:20 +10:00
Damien Miller
59d3d5b8b4 - (djm) s/get_progname/ssh_get_progname/g to avoid conflict with Heimdal
-lbroken; ok dtucker
2003-08-22 09:34:41 +10:00
Darren Tucker
9f63f22aa0 - deraadt@cvs.openbsd.org 2003/06/28 16:23:06
[atomicio.c atomicio.h authfd.c clientloop.c monitor_wrap.c msg.c
     progressmeter.c scp.c sftp-client.c ssh-keyscan.c ssh.h sshconnect.c
     sshd.c]
     deal with typing of write vs read in atomicio
2003-07-03 13:46:56 +10:00
Damien Miller
7e1bbc55af - (djm) Remove IPv4 by default hack now that we can specify AF in config 2003-05-18 20:52:40 +10:00
Damien Miller
ea5ade28fb - deraadt@cvs.openbsd.org 2003/04/26 04:29:49
[ssh-keyscan.c]
     -t in usage(); rogier@quaak.org
2003-05-14 13:43:53 +10:00
Damien Miller
2372ace572 - markus@cvs.openbsd.org 2003/04/14 14:17:50
[channels.c sshconnect.c sshd.c ssh-keyscan.c]
     avoid hardcoded SOCK_xx; with itojun@; should allow ssh over SCTP
2003-05-14 13:42:23 +10:00
Damien Miller
8e7fb33523 - markus@cvs.openbsd.org 2003/02/16 17:09:57
[kex.c kexdh.c kexgex.c kex.h sshconnect2.c sshd.c ssh-keyscan.c]
     split kex into client and server code, no need to link
     server code into the client; ok provos@
2003-02-24 12:03:03 +11:00
Damien Miller
9b481510bb - (djm) Sync sys/tree.h with OpenBSD -current. Rename tree.h and
fake-queue.h to sys-tree.h and sys-queue.h
2002-09-12 10:43:29 +10:00
Ben Lindstrom
5c98db50bf - (bal) Minor KNF on ssh-keyscan.c
This is really from Theo's patch.  I missed it by looking at the wrong
function call.
2002-07-07 22:25:29 +00:00
Ben Lindstrom
6a9fbc96c0 - stevesk@cvs.openbsd.org 2002/07/06 17:47:58
[ssh-keyscan.c]
     unused variable
2002-07-07 22:19:13 +00:00
Ben Lindstrom
965710f66e - deraadt@cvs.openbsd.org 2002/07/06 01:01:26
[ssh-keyscan.c]
     KNF, realloc fix, and clean usage
2002-07-07 22:17:22 +00:00
Ben Lindstrom
edd098b196 - stevesk@cvs.openbsd.org 2002/06/27 19:49:08
[ssh-keyscan.c]
     use convtime(); ok markus@
2002-07-04 00:07:13 +00:00
Ben Lindstrom
04f9af7dfc - markus@cvs.openbsd.org 2002/06/27 08:49:44
[dh.c ssh-keyscan.c sshconnect.c]
     more checks for NULL pointers; from grendel@zeitbombe.org; ok deraadt@
2002-07-04 00:03:56 +00:00
Ben Lindstrom
61c183bea3 - itojun@cvs.openbsd.org 2002/06/16 21:30:58
[ssh-keyscan.c]
     use TAILQ_xx macro.  from lukem@netbsd.  markus ok
2002-06-21 00:09:54 +00:00
Ben Lindstrom
924144e650 - (bal) Too many <sys/queue.h> issues. Remove all workarounds and
using internal version only.
2002-04-05 20:23:35 +00:00
Ben Lindstrom
6b28c35a04 - stevesk@cvs.openbsd.org 2002/03/04 18:30:23
[ssh-keyscan.c]
     handle connection close during read of protocol version string.
     fixes erroneous "bad greeting".  ok markus@
2002-03-05 01:54:52 +00:00
Ben Lindstrom
9c8edc96fc - markus@cvs.openbsd.org 2002/02/22 12:20:34
[log.c log.h ssh-keyscan.c]
     overwrite fatal() in ssh-keyscan.c; fixes pr 2354; ok provos@
2002-02-26 17:52:14 +00:00
Damien Miller
83c02ef623 - markus@cvs.openbsd.org 2001/12/10 20:34:31
[ssh-keyscan.c]
     check that server supports v1 for -t rsa1, report from wirth@dfki.de
2001-12-21 12:45:43 +11:00
Ben Lindstrom
28c603bf43 - stevesk@cvs.openbsd.org 2001/11/22 05:27:29
[ssh-keyscan.c]
     don't use "\n" in fatal()
2001-12-06 16:45:10 +00:00
Ben Lindstrom
eaffb9d6b6 - markus@cvs.openbsd.org 2001/11/16 12:46:13
[ssh-keyscan.c]
     handle empty lines instead of dumping core; report from sha@sha-1.net
2001-12-06 16:28:19 +00:00
Damien Miller
efdc1f179d - (djm) Fix IPv4 default in ssh-keyscan. Spotted by Dan Astoorian
<djast@cs.toronto.edu> Fix from markus@
2001-11-15 08:40:45 +11:00
Ben Lindstrom
4e088e4de0 - (bal) seed_init() and seed_rng() required in ssh-keyscan.c 2001-10-10 20:45:43 +00:00
Damien Miller
139d4cd908 - markus@cvs.openbsd.org 2001/10/09 10:12:08
[session.c]
     chdir $HOME after krb_afslog(); from bbense@networking.stanford.edu
2001-10-10 15:07:44 +10:00
Kevin Steves
76e7d9b630 whitespace sync 2001-09-20 20:30:09 +00:00
Ben Lindstrom
520b55c8c4 - markus@cvs.openbsd.org 2001/08/30 22:22:32
[ssh-keyscan.c]
     do not pass pointers to longjmp; fix from wayne@blorf.net
2001-09-12 18:05:05 +00:00
Ben Lindstrom
78bbd9ebe3 - danh@cvs.openbsd.org 2001/08/27 22:02:13
[ssh-keyscan.c]
     fix memory fault if non-existent filename is given to the -f option
     ok markus@
2001-09-12 17:10:40 +00:00
Ben Lindstrom
de8fc6fadc - markus@cvs.openbsd.org 2001/08/05 23:29:58
[ssh-keyscan.c]
     make -t dsa work with commercial servers, too
2001-08-06 22:43:50 +00:00
Ben Lindstrom
325e70c90f - markus@cvs.openbsd.org 2001/08/05 23:18:20
[ssh-keyscan.1 ssh-keyscan.c]
     ssh 2 support; from wayned@users.sourceforge.net
2001-08-06 22:41:30 +00:00
Ben Lindstrom
ddfb1e3a89 - jakob@cvs.openbsd.org 2001/08/03 10:31:30
[ssh-add.c ssh-agent.c ssh-keyscan.c]
     improve usage(). ok markus@
2001-08-06 22:06:35 +00:00
Ben Lindstrom
bba81213b9 - itojun@cvs.openbsd.org 2001/06/23 15:12:20
[auth1.c auth2.c auth2-chall.c authfd.c authfile.c auth-rhosts.c
      canohost.c channels.c cipher.c clientloop.c deattack.c dh.c
      hostfile.c kex.c kexdh.c kexgex.c key.c nchan.c packet.c radix.c
      readpass.c scp.c servconf.c serverloop.c session.c sftp.c
      sftp-client.c sftp-glob.c sftp-int.c sftp-server.c ssh-add.c
      ssh-agent.c ssh.c sshconnect1.c sshconnect2.c sshconnect.c sshd.c
      ssh-keygen.c ssh-keyscan.c]
     more strict prototypes.  raise warning level in Makefile.inc.
     markus ok'ed
     TODO; cleanup headers
2001-06-25 05:01:22 +00:00
Ben Lindstrom
a238f6e834 - pvalchev@cvs.openbsd.org 2001/06/05 05:05:39
[ssh-keyscan.1 ssh-keyscan.c]
     License clarification from David Mazieres, ok deraadt@
2001-06-09 01:30:39 +00:00
Kevin Steves
54f15b6b6f - (stevesk) ssh-keyscan.c: specify "openbsd-compat/fake-queue.h" 2001-03-14 18:37:13 +00:00
Ben Lindstrom
e21c4adaac - deraadt@cvs.openbsd.org 2001/03/06 06:11:18
[ssh-keyscan.c]
     appease gcc
2001-03-07 01:23:30 +00:00
Ben Lindstrom
884a4aca88 - millert@cvs.openbsd.org 2001/03/06 01:06:03
[ssh-keyscan.c]
     Don't assume we wil get the version string all in one read().
     deraadt@ OK'd
2001-03-06 03:33:04 +00:00
Kevin Steves
935aa24bf4 - (stevesk) OpenBSD sync:
- deraadt@cvs.openbsd.org 2001/03/05 08:37:27
     [ssh-keyscan.c]
     skip inlining, why bother
2001-03-05 19:46:37 +00:00
Ben Lindstrom
c1e0421cb4 - millert@cvs.openbsd.org 2001/03/03 21:19:41
[ssh-keyscan.c]
     Dynamically allocate read_wait and its copies.  Since maxfd is
     based on resource limits it is often (usually?) larger than FD_SETSIZE.
2001-03-05 07:04:38 +00:00
Ben Lindstrom
d20b855bc6 - deraadt@cvs.openbsd.org 2001/03/03 06:53:12
[ssh-keyscan.c]
     standard theo sweep
2001-03-05 07:01:18 +00:00
Ben Lindstrom
b0a4cd8f91 - deraadt@cvs.openbsd.org 2001/02/21 07:37:04
[ssh-keyscan.c]
     inline -> __inline__, and some indent
2001-03-05 04:54:49 +00:00
Ben Lindstrom
f9452513fc - deraadt@cvs.openbsd.org 2001/02/12 22:56:09
[clientloop.c packet.c ssh-keyscan.c]
     deal with EAGAIN/EINTR selects which were skipped
2001-02-15 03:12:08 +00:00
Ben Lindstrom
c791bebc2a - itojun@cvs.openbsd.org 2001/02/07 18:04:50
[ssh-keyscan.c]
     fix size_t -> int cast (use u_long).  markus ok
   - markus@cvs.openbsd.org 2001/02/07 22:43:16
     [ssh-keyscan.c]
     s/getline/Linebuf_getline/; from roumen.petrov@skalasoft.com
   - itojun@cvs.openbsd.org 2001/02/09 9:04:59
     [ssh-keyscan.c]
     do not assume malloc() returns zero-filled region.  found by
     malloc.conf=AJ.
2001-02-10 23:18:11 +00:00
Kevin Steves
28a7f26d03 RCSID; whitespace 2001-02-05 15:43:59 +00:00
Kevin Steves
ef4eea9bad - stevesk@cvs.openbsd.org 2001/02/04 08:32:27
[many files; did this manually to our top-level source dir]
     unexpand and remove end-of-line whitespace; ok markus@
2001-02-05 12:42:17 +00:00
Ben Lindstrom
6413635b01 - (bal) renamed queue.h to fake-queue.h (even if it's an OpenBSD
based file) to ensure #include space does not get confused.
2001-02-02 19:03:13 +00:00
Ben Lindstrom
226cfa0378 Hopefully things did not get mixed around too much. It compiles under
Linux and works.  So that is at least a good sign. =)
20010122
 - (bal) OpenBSD Resync
   - markus@cvs.openbsd.org 2001/01/19 12:45:26 GMT 2001 by markus
     [servconf.c ssh.h sshd.c]
     only auth-chall.c needs #ifdef SKEY
   - markus@cvs.openbsd.org 2001/01/19 15:55:10 GMT 2001 by markus
     [auth-krb4.c auth-options.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
      auth1.c auth2.c channels.c clientloop.c dh.c dispatch.c nchan.c
      packet.c pathname.h readconf.c scp.c servconf.c serverloop.c
      session.c ssh-add.c ssh-keygen.c ssh-keyscan.c ssh.c ssh.h
      ssh1.h sshconnect1.c sshd.c ttymodes.c]
     move ssh1 definitions to ssh1.h, pathnames to pathnames.h
   - markus@cvs.openbsd.org 2001/01/19 16:48:14
     [sshd.8]
     fix typo; from stevesk@
   - markus@cvs.openbsd.org 2001/01/19 16:50:58
     [ssh-dss.c]
     clear and free digest, make consistent with other code (use dlen); from
     stevesk@
   - markus@cvs.openbsd.org 2001/01/20 15:55:20 GMT 2001 by markus
     [auth-options.c auth-options.h auth-rsa.c auth2.c]
     pass the filename to auth_parse_options()
   - markus@cvs.openbsd.org 2001/01/20 17:59:40 GMT 2001
     [readconf.c]
     fix SIGSEGV from -o ""; problem noted by jehsom@togetherweb.com
   - stevesk@cvs.openbsd.org 2001/01/20 18:20:29
     [sshconnect2.c]
     dh_new_group() does not return NULL.  ok markus@
   - markus@cvs.openbsd.org 2001/01/20 21:33:42
     [ssh-add.c]
     do not loop forever if askpass does not exist; from
     andrew@pimlott.ne.mediaone.net
   - djm@cvs.openbsd.org 2001/01/20 23:00:56
     [servconf.c]
     Check for NULL return from strdelim; ok markus
   - djm@cvs.openbsd.org 2001/01/20 23:02:07
     [readconf.c]
     KNF; ok markus
   - jakob@cvs.openbsd.org 2001/01/21 9:00:33
     [ssh-keygen.1]
     remove -R flag; ok markus@
   - markus@cvs.openbsd.org 2001/01/21 19:05:40
     [atomicio.c automicio.h auth-chall.c auth-krb4.c auth-options.c
      auth-options.h auth-passwd.c auth-rh-rsa.c auth-rhosts.c auth-rsa.c
      auth.c auth.h auth1.c auth2-chall.c auth2.c authfd.c authfile.c
      bufaux.c  bufaux.h buffer.c canahost.c canahost.h channels.c
      cipher.c cli.c clientloop.c clientloop.h compat.c compress.c
      deattack.c dh.c dispatch.c groupaccess.c hmac.c hostfile.c kex.c
      key.c key.h log-client.c log-server.c log.c log.h login.c login.h
      match.c misc.c misc.h nchan.c packet.c pty.c radix.h readconf.c
      readpass.c readpass.h rsa.c scp.c servconf.c serverloop.c serverloop.h
      session.c sftp-server.c ssh-add.c ssh-agent.c ssh-dss.c ssh-keygen.c
      ssh-keyscan.c ssh-rsa.c ssh.c ssh.h sshconnect.c sshconnect.h
      sshconnect1.c sshconnect2.c sshd.c tildexpand.c tildexpand.h
      ttysmodes.c uidswap.c xmalloc.c]
     split ssh.h and try to cleanup the #include mess. remove unnecessary
     #includes.  rename util.[ch] -> misc.[ch]
 - (bal) renamed 'PIDDIR' to '_PATH_SSH_PIDDIR' to match OpenBSD tree
 - (bal) Moved #ifdef KRB4 in auth-krb4.c above the #include to resolve
   conflict when compiling for non-kerb install
 - (bal) removed the #ifdef SKEY in auth1.c to match Markus' changes
   on 1/19.
2001-01-22 05:34:40 +00:00
Ben Lindstrom
bf555ba621 NOTE: This update changes the RSA key generation. *NEW RSA KEYS
NEED TO BE GENERATED*  =)  Refer to to entry "2001/01/16 19:20:06"
      for more details.

20010118
 - (bal) Super Sized OpenBSD Resync
   - markus@cvs.openbsd.org 2001/01/11 22:14:20 GMT 2001 by markus
     [sshd.c]
     maxfd+1
   - markus@cvs.openbsd.org 2001/01/13 17:59:18
     [ssh-keygen.1]
     small ssh-keygen manpage cleanup; stevesk@pobox.com
   - markus@cvs.openbsd.org 2001/01/13 18:03:07
     [scp.c ssh-keygen.c sshd.c]
     getopt() returns -1 not EOF; stevesk@pobox.com
   - markus@cvs.openbsd.org 2001/01/13 18:06:54
     [ssh-keyscan.c]
     use SSH_DEFAULT_PORT; from stevesk@pobox.com
   - markus@cvs.openbsd.org 2001/01/13 18:12:47
     [ssh-keyscan.c]
     free() -> xfree(); fix memory leak; from stevesk@pobox.com
   - markus@cvs.openbsd.org 2001/01/13 18:14:13
     [ssh-add.c]
     typo, from stevesk@sweden.hp.com
   - markus@cvs.openbsd.org 2001/01/13 18:32:50
     [packet.c session.c ssh.c sshconnect.c sshd.c]
     split out keepalive from packet_interactive (from dale@accentre.com)
     set IPTOS_LOWDELAY TCP_NODELAY IPTOS_THROUGHPUT for ssh2, too.
   - markus@cvs.openbsd.org 2001/01/13 18:36:45
     [packet.c packet.h]
     reorder, typo
   - markus@cvs.openbsd.org 2001/01/13 18:38:00
     [auth-options.c]
     fix comment
   - markus@cvs.openbsd.org 2001/01/13 18:43:31
     [session.c]
     Wall
   - markus@cvs.openbsd.org 2001/01/13 19:14:08
     [clientloop.h clientloop.c ssh.c]
     move callback to headerfile
   - markus@cvs.openbsd.org 2001/01/15 21:40:10
     [ssh.c]
     use log() instead of stderr
   - markus@cvs.openbsd.org 2001/01/15 21:43:51
     [dh.c]
     use error() not stderr!
   - markus@cvs.openbsd.org 2001/01/15 21:45:29
     [sftp-server.c]
     rename must fail if newpath exists, debug off by default
   - markus@cvs.openbsd.org 2001/01/15 21:46:38
     [sftp-server.c]
     readable long listing for sftp-server, ok deraadt@
   - markus@cvs.openbsd.org 2001/01/16 19:20:06
     [key.c ssh-rsa.c]
     make "ssh-rsa" key format for ssh2 confirm to the ietf-drafts; from
     galb@vandyke.com.  note that you have to delete older ssh2-rsa keys,
     since they are in the wrong format, too. they must be removed from
     .ssh/authorized_keys2 and .ssh/known_hosts2, etc.
     (cd; grep -v ssh-rsa .ssh/authorized_keys2 > TMP && mv TMP
     .ssh/authorized_keys2) additionally, we now check that
     BN_num_bits(rsa->n) >= 768.
   - markus@cvs.openbsd.org 2001/01/16 20:54:27
     [sftp-server.c]
     remove some statics. simpler handles; idea from nisse@lysator.liu.se
   - deraadt@cvs.openbsd.org 2001/01/16 23:58:08
     [bufaux.c radix.c sshconnect.h sshconnect1.c]
     indent
 - (bal) Added bsd-strmode.[ch] since some non-OpenBSD platforms may
   be missing such feature.
2001-01-18 02:04:35 +00:00
Ben Lindstrom
48bd7c118a - (bal) OpenBSD Sync
- markus@cvs.openbsd.org 2001/01/08 22:29:05
     [auth2.c compat.c compat.h servconf.c servconf.h sshd.8
      sshd_config version.h]
     implement option 'Banner /etc/issue.net' for ssh2, move version to
     2.3.1 (needed for bugcompat detection, 2.3.0 would fail if Banner
     is enabled).
   - markus@cvs.openbsd.org 2001/01/08 22:03:23
     [channels.c ssh-keyscan.c]
     O_NDELAY -> O_NONBLOCK; thanks stevesk@pobox.com
   - markus@cvs.openbsd.org 2001/01/08 21:55:41
     [sshconnect1.c]
     more cleanups and fixes from stevesk@pobox.com:
     1) try_agent_authentication() for loop will overwrite key just
        allocated with key_new(); don't alloc
     2) call ssh_close_authentication_connection() before exit
        try_agent_authentication()
     3) free mem on bad passphrase in try_rsa_authentication()
   - markus@cvs.openbsd.org 2001/01/08 21:48:17
     [kex.c]
     missing free; thanks stevesk@pobox.com
2001-01-09 00:35:42 +00:00
Ben Lindstrom
42717bf8ff 20001229
- (bal) Fixed spelling of 'authorized_keys' in ssh-copy-id.1 by Christian
   Kurz <shorty@debain.org>

20001228
 - (bal) SCO patch to not include <sys/queue.h> since it's unrelated
   header.  Patch by Tim Rice <tim@multitalents.net>
 - Updated TODO w/ known HP/UX issue
 - (bal) removed extra <netdb.h> noticed by Kevin Steves and removed the
   bad reference to 'NeXT including it else were' on the #ifdef version.
2000-12-28 15:46:20 +00:00
Ben Lindstrom
5adbad22cb This should bring NeXTStep back into the family of supported operating
systems.
 - (bal) Fixed NeXT's lack of CPPFLAGS honoring.
 - (bal) ssh-keyscan.c: NeXT (and older BSDs) don't support getrlimit() w/
   'RLIMIT_NOFILE'
2000-12-27 07:06:21 +00:00