nhyatt/putty-source
1
0
Fork 0
mirror of https://git.tartarus.org/simon/putty.git synced 2025-04-18 03:28:07 -05:00
Code Issues Projects Releases Wiki Activity

Remove the diagnostics I checked in by mistake in the last revision.

Browse Source 
AGAIN. I really must stop doing that.

[originally from svn r1045]
This commit is contained in:
Simon Tatham 2001-04-16 11:18:15 +00:00
parent 522f130391
commit a7f58efa85
1 changed files with 0 additions and 51 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

51
pageant.c
View File

@ -11,16 +11,6 @@
#include <ctype.h> #include <ctype.h>
#include <tchar.h> #include <tchar.h>
// FIXME
#define DEBUG
#ifdef DEBUG
void dprintf(char *fmt, ...);
#define debug(x) (dprintf x)
#else
#define debug(x)
#endif
#include "ssh.h" #include "ssh.h"
#include "tree234.h" #include "tree234.h"
@ -296,22 +286,16 @@ static void add_keyfile(char *filename) {
return; return;
} }
debug(("ooh %d\n", __LINE__));
if (ver == 1) if (ver == 1)
needs_pass = rsakey_encrypted(filename, &comment); needs_pass = rsakey_encrypted(filename, &comment);
else else
needs_pass = ssh2_userkey_encrypted(filename, &comment); needs_pass = ssh2_userkey_encrypted(filename, &comment);
debug(("ooh %d\n", __LINE__));
attempts = 0; attempts = 0;
debug(("ooh %d\n", __LINE__));
if (ver == 1) if (ver == 1)
rkey = smalloc(sizeof(*rkey)); rkey = smalloc(sizeof(*rkey));
debug(("ooh %d\n", __LINE__));
pps.passphrase = passphrase; pps.passphrase = passphrase;
pps.comment = comment; pps.comment = comment;
debug(("ooh %d\n", __LINE__));
do { do {
debug(("ooh %d\n", __LINE__));
if (needs_pass) { if (needs_pass) {
int dlgret; int dlgret;
dlgret = DialogBoxParam(instance, MAKEINTRESOURCE(210), dlgret = DialogBoxParam(instance, MAKEINTRESOURCE(210),
@ -325,13 +309,10 @@ debug(("ooh %d\n", __LINE__));
} }
} else } else
*passphrase = '\0'; *passphrase = '\0';
debug(("ooh %d\n", __LINE__));
if (ver == 1) if (ver == 1)
ret = loadrsakey(filename, rkey, passphrase); ret = loadrsakey(filename, rkey, passphrase);
else { else {
debug(("ooh %d\n", __LINE__));
skey = ssh2_load_userkey(filename, passphrase); skey = ssh2_load_userkey(filename, passphrase);
debug(("ooh %d\n", __LINE__));
if (skey == SSH2_WRONG_PASSPHRASE) if (skey == SSH2_WRONG_PASSPHRASE)
ret = -1; ret = -1;
else if (!skey) else if (!skey)
@ -341,9 +322,7 @@ debug(("ooh %d\n", __LINE__));
} }
attempts++; attempts++;
} while (ret == -1); } while (ret == -1);
debug(("ooh %d\n", __LINE__));
if (comment) sfree(comment); if (comment) sfree(comment);
debug(("ooh %d\n", __LINE__));
if (ret == 0) { if (ret == 0) {
MessageBox(NULL, "Couldn't load private key.", APPNAME, MessageBox(NULL, "Couldn't load private key.", APPNAME,
MB_OK | MB_ICONERROR); MB_OK | MB_ICONERROR);
@ -351,15 +330,12 @@ debug(("ooh %d\n", __LINE__));
sfree(rkey); sfree(rkey);
return; return;
} }
debug(("ooh %d\n", __LINE__));
if (ver == 1) { if (ver == 1) {
if (already_running) { if (already_running) {
unsigned char *request, *response; unsigned char *request, *response;
int reqlen, clen, resplen; int reqlen, clen, resplen;
debug(("ooh %d\n", __LINE__));
clen = strlen(rkey->comment); clen = strlen(rkey->comment);
debug(("ooh %d\n", __LINE__));
reqlen = 4 + 1 + /* length, message type */ reqlen = 4 + 1 + /* length, message type */
4 + /* bit count */ 4 + /* bit count */
@ -371,14 +347,10 @@ debug(("ooh %d\n", __LINE__));
ssh1_bignum_length(rkey->q) + ssh1_bignum_length(rkey->q) +
4 + clen /* comment */ 4 + clen /* comment */
; ;
debug(("ooh %d %d\n", __LINE__, reqlen));
request = smalloc(reqlen); request = smalloc(reqlen);
debug(("ooh %d\n", __LINE__));
debug(("ooh %d\n", __LINE__));
request[4] = SSH1_AGENTC_ADD_RSA_IDENTITY; request[4] = SSH1_AGENTC_ADD_RSA_IDENTITY;
debug(("ooh %d\n", __LINE__));
reqlen = 5; reqlen = 5;
PUT_32BIT(request+reqlen, bignum_bitcount(rkey->modulus)); PUT_32BIT(request+reqlen, bignum_bitcount(rkey->modulus));
reqlen += 4; reqlen += 4;
@ -393,9 +365,7 @@ debug(("ooh %d\n", __LINE__));
reqlen += 4+clen; reqlen += 4+clen;
PUT_32BIT(request, reqlen-4); PUT_32BIT(request, reqlen-4);
debug(("ooh %d\n", __LINE__));
agent_query(request, reqlen, &response, &resplen); agent_query(request, reqlen, &response, &resplen);
debug(("ooh %d\n", __LINE__));
if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS) if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS)
MessageBox(NULL, "The already running Pageant " MessageBox(NULL, "The already running Pageant "
"refused to add the key.", APPNAME, "refused to add the key.", APPNAME,
@ -408,58 +378,37 @@ debug(("ooh %d\n", __LINE__));
if (already_running) { if (already_running) {
unsigned char *request, *response; unsigned char *request, *response;
int reqlen, alglen, clen, keybloblen, resplen; int reqlen, alglen, clen, keybloblen, resplen;
debug(("ooh %d\n", __LINE__));
alglen = strlen(skey->alg->name); alglen = strlen(skey->alg->name);
debug(("ooh %d\n", __LINE__));
clen = strlen(skey->comment); clen = strlen(skey->comment);
debug(("ooh %d\n", __LINE__));
debug(("ooh %d\n", __LINE__));
keybloblen = skey->alg->openssh_fmtkey(skey->data, NULL, 0); keybloblen = skey->alg->openssh_fmtkey(skey->data, NULL, 0);
debug(("ooh %d\n", __LINE__));
debug(("ooh %d\n", __LINE__));
reqlen = 4 + 1 + /* length, message type */ reqlen = 4 + 1 + /* length, message type */
4 + alglen + /* algorithm name */ 4 + alglen + /* algorithm name */
keybloblen + /* key data */ keybloblen + /* key data */
4 + clen /* comment */ 4 + clen /* comment */
; ;
debug(("ooh %d\n", __LINE__));
debug(("ooh %d\n", __LINE__));
request = smalloc(reqlen); request = smalloc(reqlen);
debug(("ooh %d\n", __LINE__));
request[4] = SSH2_AGENTC_ADD_IDENTITY; request[4] = SSH2_AGENTC_ADD_IDENTITY;
debug(("ooh %d\n", __LINE__));
reqlen = 5; reqlen = 5;
debug(("ooh %d\n", __LINE__));
PUT_32BIT(request+reqlen, alglen); PUT_32BIT(request+reqlen, alglen);
debug(("ooh %d\n", __LINE__));
reqlen += 4; reqlen += 4;
debug(("ooh %d\n", __LINE__));
memcpy(request+reqlen, skey->alg->name, alglen); memcpy(request+reqlen, skey->alg->name, alglen);
debug(("ooh %d\n", __LINE__));
reqlen += alglen; reqlen += alglen;
debug(("ooh %d\n", __LINE__));
reqlen += skey->alg->openssh_fmtkey(skey->data, reqlen += skey->alg->openssh_fmtkey(skey->data,
request+reqlen, keybloblen); request+reqlen, keybloblen);
debug(("ooh %d\n", __LINE__));
PUT_32BIT(request+reqlen, clen); PUT_32BIT(request+reqlen, clen);
debug(("ooh %d\n", __LINE__));
memcpy(request+reqlen+4, skey->comment, clen); memcpy(request+reqlen+4, skey->comment, clen);
debug(("ooh %d\n", __LINE__));
PUT_32BIT(request, reqlen-4); PUT_32BIT(request, reqlen-4);
debug(("ooh %d\n", __LINE__));
reqlen += clen+4; reqlen += clen+4;
agent_query(request, reqlen, &response, &resplen); agent_query(request, reqlen, &response, &resplen);
debug(("ooh %d\n", __LINE__));
if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS) if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS)
MessageBox(NULL, "The already running Pageant" MessageBox(NULL, "The already running Pageant"
"refused to add the key.", APPNAME, "refused to add the key.", APPNAME,
MB_OK | MB_ICONERROR); MB_OK | MB_ICONERROR);
debug(("ooh %d\n", __LINE__));
} else { } else {
if (add234(ssh2keys, skey) != skey) { if (add234(ssh2keys, skey) != skey) {
skey->alg->freekey(skey->data); skey->alg->freekey(skey->data);