X-Git-Url: https://git.distorted.org.uk/u/mdw/putty/blobdiff_plain/3d88e64dfcf5dc0fd361ce0c504c67a9196ce44c..0324502578dfd38930ca73431367fcdf9a96d03b:/pageant.c

diff --git a/pageant.c b/pageant.c
index 41ae837e..e8428b03 100644
--- a/pageant.c
+++ b/pageant.c
@@ -114,12 +114,6 @@ static gsi_fn_t getsecurityinfo;
 #endif
 
 /*
- * Exports from pageantc.c
- */
-void agent_query(void *in, int inlen, void **out, int *outlen);
-int agent_exists(void);
-
-/*
  * Forward references
  */
 static void *make_keylist1(int *length);
@@ -128,6 +122,24 @@ static void *get_keylist1(void);
 static void *get_keylist2(void);
 
 /*
+ * We need this to link with the RSA code, because rsaencrypt()
+ * pads its data with random bytes. Since we only use rsadecrypt()
+ * and the signing functions, which are deterministic, this should
+ * never be called.
+ *
+ * If it _is_ called, there is a _serious_ problem, because it
+ * won't generate true random numbers. So we must scream, panic,
+ * and exit immediately if that should happen.
+ */
+int random_byte(void)
+{
+    MessageBox(main_hwnd, "Internal Error", APPNAME, MB_OK | MB_ICONERROR);
+    exit(0);
+    /* this line can't be reached but it placates MSVC's warnings :-) */
+    return 0;
+}
+
+/*
  * Blob structure for passing to the asymmetric SSH2 key compare
  * function, prototyped here.
  */
@@ -518,7 +530,7 @@ static void add_keyfile(Filename filename)
 	if (already_running) {
 	    unsigned char *request, *response;
 	    void *vresponse;
-	    int reqlen, clen, resplen;
+	    int reqlen, clen, resplen, ret;
 
 	    clen = strlen(rkey->comment);
 
@@ -551,7 +563,9 @@ static void add_keyfile(Filename filename)
 	    reqlen += 4 + clen;
 	    PUT_32BIT(request, reqlen - 4);
 
-	    agent_query(request, reqlen, &vresponse, &resplen);
+	    ret = agent_query(request, reqlen, &vresponse, &resplen,
+			      NULL, NULL);
+	    assert(ret == 1);
 	    response = vresponse;
 	    if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS)
 		MessageBox(NULL, "The already running Pageant "
@@ -568,7 +582,7 @@ static void add_keyfile(Filename filename)
 	if (already_running) {
 	    unsigned char *request, *response;
 	    void *vresponse;
-	    int reqlen, alglen, clen, keybloblen, resplen;
+	    int reqlen, alglen, clen, keybloblen, resplen, ret;
 	    alglen = strlen(skey->alg->name);
 	    clen = strlen(skey->comment);
 
@@ -596,7 +610,9 @@ static void add_keyfile(Filename filename)
 	    PUT_32BIT(request, reqlen - 4);
 	    reqlen += clen + 4;
 
-	    agent_query(request, reqlen, &vresponse, &resplen);
+	    ret = agent_query(request, reqlen, &vresponse, &resplen,
+			      NULL, NULL);
+	    assert(ret == 1);
 	    response = vresponse;
 	    if (resplen < 5 || response[4] != SSH_AGENT_SUCCESS)
 		MessageBox(NULL, "The already running Pageant "
@@ -721,11 +737,12 @@ static void *get_keylist1(void)
     if (already_running) {
 	unsigned char request[5], *response;
 	void *vresponse;
-	int resplen;
+	int resplen, retval;
 	request[4] = SSH1_AGENTC_REQUEST_RSA_IDENTITIES;
 	PUT_32BIT(request, 4);
 
-	agent_query(request, 5, &vresponse, &resplen);
+	retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
+	assert(retval == 1);
 	response = vresponse;
 	if (resplen < 5 || response[4] != SSH1_AGENT_RSA_IDENTITIES_ANSWER)
 	    return NULL;
@@ -751,12 +768,13 @@ static void *get_keylist2(void)
     if (already_running) {
 	unsigned char request[5], *response;
 	void *vresponse;
-	int resplen;
+	int resplen, retval;
 
 	request[4] = SSH2_AGENTC_REQUEST_IDENTITIES;
 	PUT_32BIT(request, 4);
 
-	agent_query(request, 5, &vresponse, &resplen);
+	retval = agent_query(request, 5, &vresponse, &resplen, NULL, NULL);
+	assert(retval == 1);
 	response = vresponse;
 	if (resplen < 5 || response[4] != SSH2_AGENT_IDENTITIES_ANSWER)
 	    return NULL;
@@ -1774,8 +1792,20 @@ void spawn_cmd(char *cmdline, char * args, int show)
     }
 }
 
+/*
+ * This is a can't-happen stub, since Pageant never makes
+ * asynchronous agent requests.
+ */
+void agent_schedule_callback(void (*callback)(void *, void *, int),
+			     void *callback_ctx, void *data, int len)
+{
+    assert(!"We shouldn't get here");
+}
+
 void cleanup_exit(int code) { exit(code); }
 
+int flags = FLAG_SYNCAGENT;
+
 int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
 {
     WNDCLASS wndclass;
@@ -1930,11 +1960,6 @@ int WINAPI WinMain(HINSTANCE inst, HINSTANCE prev, LPSTR cmdline, int show)
     }
 
     /*
-     * Initialise the random number generator.
-     */
-    random_init();
-
-    /*
      * Initialise storage for short-term passphrase cache.
      */
     passphrases = newtree234(NULL);