GNUPG-1-9-BRANCH gnupg/agent (ChangeLog command-ssh.c)

[cvs user mo]

    Date: Wednesday, January 26, 2005 @ 23:33:11
  Author: mo
    Path: /cvs/gnupg/gnupg/agent
     Tag: GNUPG-1-9-BRANCH

Modified: ChangeLog command-ssh.c

2005-01-26  Moritz Schulte  <moritz at g10code.com>

	* command-ssh.c (ssh_handler_sign_request): Confirm to agent
	protocol in case of failure.


---------------+
 ChangeLog     |    4 ++++
 command-ssh.c |   10 +++++-----
 2 files changed, 9 insertions(+), 5 deletions(-)


Index: gnupg/agent/ChangeLog
diff -u gnupg/agent/ChangeLog:1.59.2.57 gnupg/agent/ChangeLog:1.59.2.58
--- gnupg/agent/ChangeLog:1.59.2.57	Wed Jan 26 23:20:21 2005
+++ gnupg/agent/ChangeLog	Wed Jan 26 23:33:11 2005
@@ -1,6 +1,10 @@
 2005-01-26  Moritz Schulte  <moritz at g10code.com>
 
+	* command-ssh.c (ssh_handler_sign_request): Confirm to agent
+	protocol in case of failure.
+
 	* command-ssh.c: New file.
+
 	* Makefile.am (gpg_agent_SOURCES): New source file: command-ssh.c.
 
 	* findkey.c (modify_description): New function.
Index: gnupg/agent/command-ssh.c
diff -u gnupg/agent/command-ssh.c:1.1.4.1 gnupg/agent/command-ssh.c:1.1.4.2
--- gnupg/agent/command-ssh.c:1.1.4.1	Wed Jan 26 23:25:36 2005
+++ gnupg/agent/command-ssh.c	Wed Jan 26 23:33:11 2005
@@ -1706,14 +1706,14 @@
   if (! bad)
     {
       /* Done.  */
-      es_write_byte (response, SSH_RESPONSE_SIGN_RESPONSE);
-      if (! es_ferror (response))
+      if (! err)
 	{
-	  if (! err)
+	  es_write_byte (response, SSH_RESPONSE_SIGN_RESPONSE);
+	  if (! es_ferror (response))
 	    es_write_string (response, sig, sig_n);
-	  else
-	    es_write_byte (response, SSH_RESPONSE_FAILURE);
 	}
+      else
+	es_write_byte (response, SSH_RESPONSE_FAILURE);
     }
   
   gcry_sexp_release (key);