nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-03-22 14:39:24 -05:00
Code Issues Projects Releases Wiki Activity

Unix Pageant: link in uxagentc.c and uxcons.c.

Browse Source 
This brings in the code we'll need to request passphrases from the
terminal, and to talk to an existing SSH agent as a client.

Adding uxcons.c required adjusting the set of stub functions in
uxpgnt.c: uxcons.c removed the need for several, but added one of its
own (log_eventlog). A net win, though.
This commit is contained in:
Simon Tatham 2015-05-11 17:56:51 +01:00
parent da944972d8
commit cd528f3e76
2 changed files with 9 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

7
Recipe
View File

@ -303,9 +303,10 @@ puttygen : [U] cmdgen sshrsag sshdssg sshprime sshdes sshbn sshmd5 version
pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC pscp : [U] pscp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC psftp : [U] psftp uxsftp uxcons UXSSH BE_SSH SFTP wildcard UXMISC
pageant : [U] uxpgnt pageant sshrsa sshpubk sshdes sshbn sshmd5 version pageant : [U] uxpgnt uxagentc pageant sshrsa sshpubk sshdes sshbn sshmd5
+ tree234 misc sshaes sshsha sshdss sshsh256 sshsh512 sshecc + version tree234 misc sshaes sshsha sshdss sshsh256 sshsh512 sshecc
+ conf uxsignal nocproxy nogss be_none x11fwd ux_x11 UXMISC LIBS + conf uxsignal nocproxy nogss be_none x11fwd ux_x11 uxcons
+ UXMISC LIBS
PuTTY : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH PuTTY : [MX] osxmain OSXTERM OSXMISC CHARSET U_BE_ALL NONSSH UXSSH
+ ux_x11 uxpty uxsignal testback putty.icns info.plist + ux_x11 uxpty uxsignal testback putty.icns info.plist

12
unix/uxpgnt.c
View File

@ -93,7 +93,6 @@ void uxsel_input_remove(int id) { }
/* /*
* More stubs. * More stubs.
*/ */
void logevent(void *frontend, const char *string) {}
void random_save_seed(void) {} void random_save_seed(void) {}
void random_destroy_seed(void) {} void random_destroy_seed(void) {}
void noise_ultralight(unsigned long data) {} void noise_ultralight(unsigned long data) {}
@ -102,8 +101,7 @@ int platform_default_i(const char *name, int def) { return def; }
FontSpec *platform_default_fontspec(const char *name) { return fontspec_new(""); } FontSpec *platform_default_fontspec(const char *name) { return fontspec_new(""); }
Filename *platform_default_filename(const char *name) { return filename_from_str(""); } Filename *platform_default_filename(const char *name) { return filename_from_str(""); }
char *x_get_default(const char *key) { return NULL; } char *x_get_default(const char *key) { return NULL; }
void old_keyfile_warning(void) {} void log_eventlog(void *handle, const char *event) {}
void timer_change_notify(unsigned long next) {}
/* /*
* Short description of parameters. * Short description of parameters.
@ -131,10 +129,6 @@ void keylist_update(void)
const char *const appname = "Pageant"; const char *const appname = "Pageant";
char *platform_get_x_display(void) {
return dupstr(getenv("DISPLAY"));
}
static int time_to_die = FALSE; static int time_to_die = FALSE;
/* Stub functions to permit linking against x11fwd.c. These never get /* Stub functions to permit linking against x11fwd.c. These never get
@ -281,6 +275,10 @@ const char *display = NULL;
void run_client(void) void run_client(void)
{ {
if (!agent_exists()) {
fprintf(stderr, "pageant: no agent running to talk to\n");
exit(1);
}
fprintf(stderr, "NYI\n"); fprintf(stderr, "NYI\n");
exit(1); exit(1);
} }