mirror of
https://git.tartarus.org/simon/putty.git
synced 2025-01-10 09:58:01 +00:00
f1c8298000
The text of the host key warnings was replicated in three places: the Windows rc file, the GTK dialog setup function, and the console.c shared between both platforms' CLI tools. Now it lives in just one place, namely ssh/common.c where the rest of the centralised host-key checking is done, so it'll be easier to adjust the wording in future. This comes with some extra automation. Paragraph wrapping is no longer done by hand in any version of these prompts. (Previously we let GTK do the wrapping on GTK, but on Windows the resource file contained a bunch of pre-wrapped LTEXT lines, and console.c had pre-wrapped terminal messages.) And the dialog heights in Windows are determined automatically based on the amount of stuff in the window. The main idea of all this is that it'll be easier to set up more elaborate kinds of host key prompt that deal with certificates (if, e.g., a server sends us a certified host key which we don't trust the CA for). But there are side benefits of this refactoring too: each tool now reliably inserts its own appname in the prompts, and also, on Windows the entire prompt text is copy-pastable. Details of implementation: there's a new type SeatDialogText which holds a set of (type, string) pairs describing the contents of a prompt. Type codes distinguish ordinary text paragraphs, paragraphs to be displayed prominently (like key fingerprints), the extra-bold scary title at the top of the 'host key changed' version of the dialog, and the various information that lives in the subsidiary 'more info' box. ssh/common.c constructs this, and passes it to the Seat to present the actual prompt. In order to deal with the different UI for answering the prompt, I've added an extra Seat method 'prompt_descriptions' which returns some snippets of text to interpolate into the messages. ssh/common.c calls that while it's still constructing the text, and incorporates the resulting snippets into the SeatDialogText. For the moment, this refactoring only affects the host key prompts. The warnings about outmoded crypto are still done the old-fashioned way; they probably ought to be similarly refactored to use this new SeatDialogText system, but it's not immediately critical for the purpose I have right now. |
||
|---|---|---|
| .. | ||
| utils | ||
| agent-client.c | ||
| cliloop.c | ||
| CMakeLists.txt | ||
| config.c | ||
| conpty.c | ||
| console.c | ||
| controls.c | ||
| cryptoapi.h | ||
| dialog.c | ||
| gss.c | ||
| handle-io.c | ||
| handle-socket.c | ||
| handle-wait.c | ||
| help.c | ||
| help.h | ||
| help.rc2 | ||
| installer.wxs | ||
| jump-list.c | ||
| local-proxy.c | ||
| make_install_images.sh | ||
| msifixup.py | ||
| named-pipe-client.c | ||
| named-pipe-server.c | ||
| network.c | ||
| no-jump-list.c | ||
| nohelp.c | ||
| noise.c | ||
| pageant-rc.h | ||
| pageant.c | ||
| pageant.ico | ||
| pageant.mft | ||
| pageant.rc | ||
| pageants.ico | ||
| platform.h | ||
| plink.c | ||
| plink.rc | ||
| printing.c | ||
| pscp.ico | ||
| pscp.rc | ||
| psftp.rc | ||
| psocks.c | ||
| pterm.c | ||
| pterm.ico | ||
| pterm.rc | ||
| ptermcfg.ico | ||
| putty-common.rc2 | ||
| putty-rc.h | ||
| putty.c | ||
| putty.ico | ||
| putty.mft | ||
| putty.rc | ||
| puttycfg.ico | ||
| puttygen-rc.h | ||
| puttygen.c | ||
| puttygen.ico | ||
| puttygen.mft | ||
| puttygen.rc | ||
| puttyins.ico | ||
| puttytel.mft | ||
| puttytel.rc | ||
| rcstuff.h | ||
| README-msi.txt | ||
| security-api.h | ||
| select-cli.c | ||
| select-gui.c | ||
| serial.c | ||
| sftp.c | ||
| sharing.c | ||
| sizetip.c | ||
| storage.c | ||
| test_screenshot.c | ||
| unicode.c | ||
| version.rc2 | ||
| website.url | ||
| win-gui-seat.h | ||
| window.c | ||
| x11.c | ||