copyleftie
/
gajim-plural
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

Whoops, didn't mean to commit that.

This commit is contained in:
Alex Mauer 2005-09-16 00:14:18 +00:00
parent 3da22df9c1
commit f7f5bab8fb
1 changed files with 17 additions and 32 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

49
src/common/GnuPG.py
View File

@ -18,10 +18,8 @@
## ##
from os import tmpfile from os import tmpfile
from dialogs import *
USE_GPG = True USE_GPG = True
GPG_DEBUG = True
try: try:
import GnuPGInterface # Debian package doesn't distribute 'our' file import GnuPGInterface # Debian package doesn't distribute 'our' file
@ -56,23 +54,19 @@ else:
resp = {} resp = {}
while 1: while 1:
line = child_stdout.readline() line = child_stdout.readline()
if line == '': break if line == "": break
line = line.rstrip() line = line.rstrip()
if line[0:9] == '[GNUPG:] ': if line[0:9] == '[GNUPG:] ':
# Chop off the prefix
line = line[9:] line = line[9:]
L = line.split(None, 1) 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 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): def encrypt(self, str, recipients):
if not USE_GPG: if not USE_GPG:
return str return str
@ -104,34 +98,25 @@ else:
except IOError: pass except IOError: pass
return output return output
def sign(self, data, keyID): def sign(self, str, keyID):
if not USE_GPG: if not USE_GPG:
return data return str
proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr', 'passphrase']) proc = self.run(['-b', '-u %s'%keyID], create_fhs=['stdin', 'stdout', 'status', 'stderr'])
proc.handles['stdin'].write(data) proc.handles['stdin'].write(str)
proc.handles['stdin'].close() 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() output = proc.handles['stdout'].read()
proc.handles['stdout'].close() proc.handles['stdout'].close()
proc.handles['stderr'].close() proc.handles['stderr'].close()
stat = proc.handles['status']
resp = self._read_response(stat)
proc.handles['status'].close()
try: proc.wait() try: proc.wait()
except IOError: pass except IOError: pass
#if resp.has_key('GOOD_PASSPHRASE') or resp.has_key('SIG_CREATED'): if resp.has_key('GOOD_PASSPHRASE') or resp.has_key('SIG_CREATED'):
# return self._stripHeaderFooter(output) return self._stripHeaderFooter(output)
return 'BAD_PASSPHRASE' return 'BAD_PASSPHRASE'
def verify(self, str, sign): def verify(self, str, sign):