From f7f5bab8fb470974062be4dd82bae13fa94d47b6 Mon Sep 17 00:00:00 2001
From: Alex Mauer <hawke@hawkesnest.net>
Date: Fri, 16 Sep 2005 00:14:18 +0000
Subject: [PATCH] Whoops, didn't mean to commit that.

---
 src/common/GnuPG.py | 49 ++++++++++++++++-----------------------------
 1 file changed, 17 insertions(+), 32 deletions(-)

diff --git a/src/common/GnuPG.py b/src/common/GnuPG.py
index 895d67518..52dd35243 100644
--- a/src/common/GnuPG.py
+++ b/src/common/GnuPG.py
@@ -18,10 +18,8 @@
 ##
 
 from os import tmpfile
-from dialogs import *
 
 USE_GPG = True
-GPG_DEBUG = True
 
 try:
 	import GnuPGInterface # Debian package doesn't distribute 'our' file
@@ -56,23 +54,19 @@ else:
 			resp = {}
 			while 1:
 				line = child_stdout.readline()
-				if line == '': break
+				if line == "": break
 				line = line.rstrip()
 				if line[0:9] == '[GNUPG:] ':
+					# Chop off the prefix
 					line = line[9:]
 					L = line.split(None, 1)
-		#			self._handle_response(L.pop(0), L)
+					keyword = L[0]
+					if len(L) > 1:
+						resp[ keyword ] = L[1]
+					else:
+						resp[ keyword ] = ""
 			return resp
 
-		def _handle_response(self, response, parameters):
-			return
-			#if response == 'NEED_PASSPHRASE':
-				#w = dialogs.PassphraseDialog(
-				#  _('Password Required'),
-				#  _('Enter your password for key %s') % parameters[0][:8],
-				#  _('Save password'))
-            	#self.passphrase[parameters[0][:8]], save = w.run()
-
 		def encrypt(self, str, recipients):
 			if not USE_GPG:
 				return str
@@ -104,34 +98,25 @@ else:
 			except IOError: pass
 			return output
 
-		def sign(self, data, keyID):
+		def sign(self, str, keyID):
 			if not USE_GPG:
-				return data
-			proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr', 'passphrase'])
-			proc.handles['stdin'].write(data)
+				return str
+			proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr'])
+			proc.handles['stdin'].write(str)
 			proc.handles['stdin'].close()
-			proc.handles['passphrase'].close()
-			stat = proc.handles['status']
-			while 1:
-				line = stat.readline()
-				print line
-				if line == '': break
-				line = line.rstrip()
-				if line[0:9] == '[GNUPG:] ':
-					line = line[9:]
-					L = line.split(None, 1)
-					print L
-					#self._handle_response(L.pop(0), L)
-			proc.handles['status'].close()
 
 			output = proc.handles['stdout'].read()
 			proc.handles['stdout'].close()
 			proc.handles['stderr'].close()
 
+			stat = proc.handles['status']
+			resp = self._read_response(stat)
+			proc.handles['status'].close()
+
 			try: proc.wait()
 			except IOError: pass
-			#if resp.has_key('GOOD_PASSPHRASE') or resp.has_key('SIG_CREATED'):
-			#	return self._stripHeaderFooter(output)
+			if resp.has_key('GOOD_PASSPHRASE') or resp.has_key('SIG_CREATED'):
+				return self._stripHeaderFooter(output)
 			return 'BAD_PASSPHRASE'
 
 		def verify(self, str, sign):