mirror of git://git.tartarus.org/simon/putty.git, used for client testing
Перейти к файлу
Simon Tatham 90af5bed04 Sort out the mess with OpenSSH key file formats.
When I implemented reading and writing of the new format a couple of
weeks ago, I kept them strictly separate in the UI, so you have to ask
for the format you want when exporting. But in fact this is silly,
because not every key type can be saved in both formats, and OpenSSH
itself has the policy of using the old format for key types it can
handle, unless specifically asked to use the new one.

So I've now arranged that the key file format enum has three values
for OpenSSH: PEM, NEW and AUTO. Files being loaded are identified as
either PEM or NEW, which describe the two physical file formats. But
exporting UIs present either AUTO or NEW, where AUTO is the virtual
format meaning 'save in the old format if possible, otherwise the new
one'.
2015-05-10 13:11:43 +01:00
charset Rework versioning system to not depend on Subversion. 2014-09-24 10:33:13 +00:00
contrib New 'contrib' tool: a script for faking initial KEX. 2015-02-28 07:58:29 +00:00
doc Divide the Bugs panel in half. 2015-04-25 10:54:18 +01:00
icons Stop using physical tabs in Python. (I was goaded into doing this by 2009-02-28 23:04:58 +00:00
macosx Completely remove the privdata mechanism in dialog.h. 2015-05-08 19:04:16 +01:00
testdata Fix an array-size bug in modmul, and add some tests for it. 2013-08-02 06:27:54 +00:00
unix Completely remove the privdata mechanism in dialog.h. 2015-05-08 19:04:16 +01:00
windows Sort out the mess with OpenSSH key file formats. 2015-05-10 13:11:43 +01:00
.gitignore New 'contrib' tool: a script for faking initial KEX. 2015-02-28 07:58:29 +00:00
Buildscr Bump version number for 0.64 release. 2015-02-28 07:57:35 +00:00
Buildscr.cv Rework versioning system to not depend on Subversion. 2014-09-24 10:33:13 +00:00
CHECKLST.txt Add a new checklist item. 2015-02-28 15:47:45 +00:00
LATEST.VER Bump version number for 0.64 release. 2015-02-28 07:57:35 +00:00
LICENCE Merge branch 'pre-0.64' 2015-01-05 23:49:25 +00:00
README Update documentation to refer to Git rather than Subversion. 2014-11-01 17:17:57 +00:00
Recipe Provide a Unix port of Pageant. 2015-05-05 20:16:23 +01:00
be_all.c Rationalise access to, and content of, backends[] array. 2007-06-30 21:56:44 +00:00
be_all_s.c Rationalise access to, and content of, backends[] array. 2007-06-30 21:56:44 +00:00
be_none.c Fix bug in which the SSH-only tools (pscp, psftp) did not honour a 2011-07-27 18:43:16 +00:00
be_nos_s.c Rationalise access to, and content of, backends[] array. 2007-06-30 21:56:44 +00:00
be_nossh.c Rationalise access to, and content of, backends[] array. 2007-06-30 21:56:44 +00:00
be_ssh.c Fix bug in which the SSH-only tools (pscp, psftp) did not honour a 2011-07-27 18:43:16 +00:00
callback.c Oops! Remove a tight-looping diagnostic. 2013-09-15 14:40:46 +00:00
cmdgen.c Sort out the mess with OpenSSH key file formats. 2015-05-10 13:11:43 +01:00
cmdline.c New option to manually configure the expected host key(s). 2014-09-09 11:46:24 +00:00
conf.c Tighten up a lot of casts from unsigned to int which are read by one 2013-07-14 10:45:54 +00:00
config.c Fix two small memory leaks in config mechanism. 2015-05-08 18:57:18 +01:00
configure.ac Move the Unix configure script up to the top level. 2014-02-22 18:01:32 +00:00
cproxy.c Post-release destabilisation! Completely remove the struct type 2011-07-14 18:52:21 +00:00
dialog.c Add some missing initialisations. 2014-11-22 15:26:16 +00:00
dialog.h Completely remove the privdata mechanism in dialog.h. 2015-05-08 19:04:16 +01:00
errsock.c Remove sk_{get,set}_private_ptr completely! 2013-11-17 14:04:48 +00:00
import.c Sort out the mess with OpenSSH key file formats. 2015-05-10 13:11:43 +01:00
int64.c Further correction: on reflection, after examining all the call 2008-09-16 22:56:08 +00:00
int64.h Some extra int64 functions. 2006-08-05 13:48:53 +00:00
ldisc.c Move echo/edit state change functionality out of ldisc_send. 2014-11-22 16:18:00 +00:00
ldisc.h Post-release destabilisation! Completely remove the struct type 2011-07-14 18:52:21 +00:00
ldiscucs.c Patch from Yoshida Masato to fill in the missing pieces of Windows 2012-02-17 19:28:55 +00:00
logging.c Free copied Conf in log_free(). 2014-11-09 00:54:35 +00:00
minibidi.c Rework versioning system to not depend on Subversion. 2014-09-24 10:33:13 +00:00
misc.c Const-correctness in the debug functions! 2015-05-09 15:02:45 +01:00
misc.h Const-correctness in the debug functions! 2015-05-09 15:02:45 +01:00
mkauto.sh Move the Unix configure script up to the top level. 2014-02-22 18:01:32 +00:00
mkfiles.pl Consistently use &def for %makefile_extra pieces. 2014-11-22 16:30:29 +00:00
mksrcarc.sh Stop using 'zip -k' to construct the Windows source archive. 2014-03-04 22:56:08 +00:00
mkunxarc.sh Turn mkunxarc.sh back into an ordinary sh script. 2014-10-01 20:52:16 +00:00
network.h Implement connection sharing between instances of PuTTY. 2013-11-17 14:05:41 +00:00
nocproxy.c Malcolm Smith's patch to support CHAP (digest-based) authentication 2004-08-30 13:11:17 +00:00
nogss.c Rewrite gprefs() in settings.c so that its input mapping includes 2011-06-25 17:37:31 +00:00
noprint.c A few small changes to make the PuTTY source base more usable as a 2005-12-09 20:04:19 +00:00
noshare.c Fix the prototype of the stub function in noshare.c. 2014-04-22 17:53:50 +00:00
noterm.c Make calling term_nopaste() a cross-platform feature. 2013-08-17 16:06:40 +00:00
notiming.c Two related changes to timing code: 2012-09-18 21:42:48 +00:00
pageant.c Remove the list of key algorithms in pageant.c. 2015-05-07 19:59:07 +01:00
pageant.h Clean up Unix Pageant's setup and teardown. 2015-05-07 19:06:12 +01:00
pgssapi.c Patch from Alejandro Sedeno, somewhat modified by me, which 2010-05-19 18:22:17 +00:00
pgssapi.h Patch from Alejandro Sedeno, somewhat modified by me, which 2010-05-19 18:22:17 +00:00
pinger.c Two related changes to timing code: 2012-09-18 21:42:48 +00:00
portfwd.c Refactor ssh.c's APIs to x11fwd.c and portfwd.c. 2013-11-17 14:04:41 +00:00
pproxy.c Post-release destabilisation! Completely remove the struct type 2011-07-14 18:52:21 +00:00
proxy.c Implement connection sharing between instances of PuTTY. 2013-11-17 14:05:41 +00:00
proxy.h Replace the hacky 'OSSocket' type with a closure. 2013-11-17 14:03:55 +00:00
pscp.c Move echo/edit state change functionality out of ldisc_send. 2014-11-22 16:18:00 +00:00
psftp.c Merge branch 'pre-0.64' 2014-12-20 18:52:40 +00:00
psftp.h Propagate file permissions in both directions in Unix pscp and psftp. 2011-08-11 17:59:30 +00:00
putty.h Support RFC 4419. 2015-04-25 10:54:18 +01:00
puttymem.h Rework the new type-check in sresize so that it doesn't cause a 2012-07-19 04:29:50 +00:00
puttyps.h Oops: r9004 should have removed various pieces from the Makefile and 2010-09-25 08:37:30 +00:00
raw.c Another missing initialisation. 2014-11-22 16:35:54 +00:00
resource.h Initial checkin: beta 0.43 1999-01-08 13:02:13 +00:00
rlogin.c Use the new host_str* functions to improve IPv6 literal support. 2014-01-25 15:58:54 +00:00
sercfg.c Post-release destabilisation! Completely remove the struct type 2011-07-14 18:52:21 +00:00
settings.c Support RFC 4419. 2015-04-25 10:54:18 +01:00
sftp.c Tighten up a lot of casts from unsigned to int which are read by one 2013-07-14 10:45:54 +00:00
sftp.h Propagate file permissions in both directions in Unix pscp and psftp. 2011-08-11 17:59:30 +00:00
sign.sh Generate some checksum files with more up-to-date hash functions than 2011-07-10 11:45:52 +00:00
ssh.c Support public keys using the "ssh-ed25519" method. 2015-05-09 15:14:35 +01:00
ssh.h Sort out the mess with OpenSSH key file formats. 2015-05-10 13:11:43 +01:00
sshaes.c Introduce a new utility function smemclr(), which memsets things to 2012-07-22 19:51:50 +00:00
ssharcf.c Introduce a new utility function smemclr(), which memsets things to 2012-07-22 19:51:50 +00:00
sshbcrypt.c Implementation of OpenSSH's bcrypt. 2015-04-27 20:48:29 +01:00
sshblowf.c Provide a script to regenerate the Blowfish init tables. 2015-04-27 20:48:29 +01:00
sshblowf.h Implementation of OpenSSH's bcrypt. 2015-04-27 20:48:29 +01:00
sshbn.c Provide a little-endian version of bignum_from_bytes(). 2015-05-09 15:02:50 +01:00
sshcrc.c Rename crc32() to crc32_compute(), to avoid clashing catastrophically 2003-05-13 18:23:43 +00:00
sshcrcda.c Unify GET_32BIT()/PUT_32BIT() et al from numerous source files into misc.h. 2005-04-12 20:04:56 +00:00
sshdes.c Implement connection sharing between instances of PuTTY. 2013-11-17 14:05:41 +00:00
sshdh.c Enforce acceptable range for Diffie-Hellman server value. 2015-02-28 07:57:35 +00:00
sshdss.c Const-correctness in public-key functions. 2015-05-05 20:16:17 +01:00
sshdssg.c Generate keys more carefully, so that when the user asks for an n-bit 2012-03-04 00:24:49 +00:00
sshecc.c Support public keys using the "ssh-ed25519" method. 2015-05-09 15:14:35 +01:00
sshecdsag.c Support public keys using the "ssh-ed25519" method. 2015-05-09 15:14:35 +01:00
sshgss.h Post-release destabilisation! Completely remove the struct type 2011-07-14 18:52:21 +00:00
sshgssc.c Patch from Alejandro Sedeno, somewhat modified by me, which 2010-05-19 18:22:17 +00:00
sshgssc.h Patch from Alejandro Sedeno, somewhat modified by me, which 2010-05-19 18:22:17 +00:00
sshmd5.c Add smemclrs of all hash states we destroy. 2015-04-26 23:55:33 +01:00
sshnogss.c Post-release destabilisation! Completely remove the struct type 2011-07-14 18:52:21 +00:00
sshprime.c Generate keys more carefully, so that when the user asks for an n-bit 2012-03-04 00:24:49 +00:00
sshpubk.c Sort out the mess with OpenSSH key file formats. 2015-05-10 13:11:43 +01:00
sshrand.c random_ref() should always increment the reference count. 2013-10-09 18:38:35 +00:00
sshrsa.c Const-correctness in public-key functions. 2015-05-05 20:16:17 +01:00
sshrsag.c Make modinv able to return NULL if its inputs are not coprime, and 2013-08-04 19:34:07 +00:00
sshsh256.c Add smemclrs of all hash states we destroy. 2015-04-26 23:55:33 +01:00
sshsh512.c Add smemclrs of all hash states we destroy. 2015-04-26 23:55:33 +01:00
sshsha.c Add smemclrs of all hash states we destroy. 2015-04-26 23:55:33 +01:00
sshshare.c Don't reject _and_ accept X forwarding requests! 2014-11-22 15:26:16 +00:00
sshzlib.c Add a missing bounds check in the Deflate decompressor. 2014-10-01 18:33:45 +00:00
storage.h Turn 'Filename' into a dynamically allocated type with no arbitrary 2011-10-02 11:01:57 +00:00
telnet.c Move echo/edit state change functionality out of ldisc_send. 2014-11-22 16:18:00 +00:00
terminal.c Don't output negative numbers in the ESC[13t report. 2015-03-07 20:57:26 +00:00
terminal.h Remove the timed part of the terminal paste mechanism. 2013-09-15 14:05:38 +00:00
testback.c Rework versioning system to not depend on Subversion. 2014-09-24 10:33:13 +00:00
time.c Comment explaining location in top-level directory. 2005-02-07 15:23:45 +00:00
timing.c Fix a stupid sign bug in run_timers() that broke Windows Plink (and 2012-09-19 22:12:00 +00:00
tree234.c Fixes for the tree234 unit test: break its dependencies on half of the 2013-07-11 17:24:32 +00:00
tree234.h Run entire source base through GNU indent to tidy up the varying 2001-05-06 14:35:20 +00:00
version.c Rework versioning system to not depend on Subversion. 2014-09-24 10:33:13 +00:00
version.h Rework versioning system to not depend on Subversion. 2014-09-24 10:33:13 +00:00
wcwidth.c Fix another type mismatch introduced by r9409. 2012-03-05 18:40:36 +00:00
wildcard.c Add a missing null pointer check in wc_unescape, to bring it in line 2013-07-14 10:46:17 +00:00
x11fwd.c Const-correctness in x11_setup_display. 2015-05-05 20:16:18 +01:00

README

This is the README for the source archive of PuTTY, a free Win32
and Unix Telnet and SSH client.

If you want to rebuild PuTTY from source, we provide a variety of
Makefiles and equivalents. (If you have fetched the source from
Git, you'll have to generate the Makefiles yourself -- see
below.)

There are various compile-time directives that you can use to
disable or modify certain features; it may be necessary to do this
in some environments. They are documented in `Recipe', and in
comments in many of the generated Makefiles.

For building on Windows:

 - windows/Makefile.vc is for command-line builds on MS Visual C++
   systems. Change into the `windows' subdirectory and type `nmake
   -f Makefile.vc' to build all the PuTTY binaries.

   Last time we checked, PuTTY built with vanilla VC7, or VC6 with
   an up-to-date Platform SDK. (It might still be possible to build
   with vanilla VC6, but you'll certainly have to remove some
   functionality with directives such as NO_IPV6.)

   (We've also had reports of success building with the
   OpenWatcom compiler -- www.openwatcom.org -- using Makefile.vc
   with `wmake -ms -f makefile.vc' and NO_MULTIMON, although we
   haven't tried this ourselves. Version 1.3 is reported to work.)

 - Inside the windows/MSVC subdirectory are MS Visual Studio project
   files for doing GUI-based builds of the various PuTTY utilities.
   These have been tested on Visual Studio 6.

   You should be able to build each PuTTY utility by loading the
   corresponding .dsp file in Visual Studio. For example,
   MSVC/putty/putty.dsp builds PuTTY itself, MSVC/plink/plink.dsp
   builds Plink, and so on.

 - windows/Makefile.bor is for the Borland C compiler. Type `make -f
   Makefile.bor' while in the `windows' subdirectory to build all
   the PuTTY binaries.

 - windows/Makefile.cyg is for Cygwin / MinGW installations. Type
   `make -f Makefile.cyg' while in the `windows' subdirectory to
   build all the PuTTY binaries.

   You'll probably need quite a recent version of the w32api package.
   Note that by default the multiple monitor and HTML Help support are
   excluded from the Cygwin build, since at the time of writing Cygwin
   doesn't include the necessary headers.

 - windows/Makefile.lcc is for lcc-win32. Type `make -f
   Makefile.lcc' while in the `windows' subdirectory. (You will
   probably need to specify COMPAT=-DNO_MULTIMON.)

 - Inside the windows/DEVCPP subdirectory are Dev-C++ project
   files for doing GUI-based builds of the various PuTTY utilities.

The PuTTY team actively use Makefile.vc (with VC7) and Makefile.cyg
(with mingw32), so we'll probably notice problems with those
toolchains fairly quickly. Please report any problems with the other
toolchains mentioned above.

For building on Unix:

 - unix/configure is for Unix and GTK. If you don't have GTK, you
   should still be able to build the command-line utilities (PSCP,
   PSFTP, Plink, PuTTYgen) using this script. To use it, change into
   the `unix' subdirectory, run `./configure' and then `make'. Or you
   can do the same in the top-level directory (we provide a little
   wrapper that invokes configure one level down), which is more like
   a normal Unix source archive but doesn't do so well at keeping the
   per-platform stuff in each platform's subdirectory; it's up to you.

   Note that Unix PuTTY has mostly only been tested on Linux so far;
   portability problems such as BSD-style ptys or different header file
   requirements are expected.

 - unix/Makefile.gtk and unix/Makefile.ux are for non-autoconfigured
   builds. These makefiles expect you to change into the `unix'
   subdirectory, then run `make -f Makefile.gtk' or `make -f
   Makefile.ux' respectively. Makefile.gtk builds all the programs but
   relies on Gtk, whereas Makefile.ux builds only the command-line
   utilities and has no Gtk dependence.

 - For the graphical utilities, Gtk+-1.2 and Gtk+-2.0 should both be
   supported. If you have both installed, you can manually specify
   which one you want by giving the option '--with-gtk=1' or
   '--with-gtk=2' to the configure script. (2 is the default, of
   course.) In the absence of either, the configure script will
   automatically construct a Makefile which builds only the
   command-line utilities; you can manually create this condition by
   giving configure the option '--without-gtk'.

 - pterm would like to be setuid or setgid, as appropriate, to permit
   it to write records of user logins to /var/run/utmp and
   /var/log/wtmp. (Of course it will not use this privilege for
   anything else, and in particular it will drop all privileges before
   starting up complex subsystems like GTK.) By default the makefile
   will not attempt to add privileges to the pterm executable at 'make
   install' time, but you can ask it to do so by running configure
   with the option '--enable-setuid=USER' or '--enable-setgid=GROUP'.

 - The Unix Makefiles have an `install' target. Note that by default
   it tries to install `man' pages; if you have fetched the source via
   Git then you will need to have built these using Halibut
   first - see below.

 - It's also possible to build the Windows version of PuTTY to run
   on Unix by using Winelib.  To do this, change to the `windows'
   directory and run `make -f Makefile.cyg CC=winegcc RC=wrc'.

All of the Makefiles are generated automatically from the file
`Recipe' by the Perl script `mkfiles.pl' (except for the Unix one,
which is generated by the `configure' script; mkfiles.pl only
generates the input to automake). Additions and corrections to Recipe,
mkfiles.pl and/or configure.ac are much more useful than additions and
corrections to the actual Makefiles, Makefile.am or Makefile.in.

The Unix `configure' script and its various requirements are generated
by the shell script `mkauto.sh', which requires GNU Autoconf, GNU
Automake, and Gtk; if you've got the source from Git rather
than using one of our source snapshots, you'll need to run this
yourself. The input file to Automake is generated by mkfiles.pl along
with all the rest of the makefiles, so you will need to run mkfiles.pl
and then mkauto.sh.

Documentation (in various formats including Windows Help and Unix
`man' pages) is built from the Halibut (`.but') files in the `doc'
subdirectory using `doc/Makefile'. If you aren't using one of our
source snapshots, you'll need to do this yourself. Halibut can be
found at <http://www.chiark.greenend.org.uk/~sgtatham/halibut/>.

The PuTTY home web site is

    http://www.chiark.greenend.org.uk/~sgtatham/putty/

If you want to send bug reports or feature requests, please read the
Feedback section of the web site before doing so. Sending one-line
reports saying `it doesn't work' will waste your time as much as
ours.

See the file LICENCE for the licence conditions.