py: added asym en/decryption, fine tuned test script

This commit is contained in:
TLINDEN
2014-12-23 20:13:52 +01:00
parent 87efb36e46
commit b52ac4b0df
3 changed files with 106 additions and 35 deletions

View File

@@ -29,16 +29,16 @@ class Context(object):
for key in recipients:
libpcp.pcphash_add(self._ctx, key._pk, key._pk.type)
def encrypt(self, string=None, file=None, sign=False, passphrase=None, armor=False):
def encrypt(self, source=None, sign=False, passphrase=None, armor=False):
anon = 0
dosign = 0
instream = None
outstream = None
if string:
instream = Stream(string=string)
if source:
instream = Stream(source)
else:
instream = Stream(file)
self.throw(RuntimeError, "source argument required")
outstream = Stream()
@@ -84,18 +84,19 @@ class Context(object):
def decrypt(self, string=None, file=None, verify=False, passphrase=None):
def decrypt(self, source=None, verify=False, passphrase=None):
doverify = 0
doanon = 0
instream = None
outstream = None
if verify:
doverify = 1
if string:
instream = Stream(string=string)
if source:
instream = Stream(source)
else:
instream = Stream(file)
self.throw(RuntimeError, "source argument required")
libpcp.ps_setdetermine(instream._stream, PCP_BLOCK_SIZE/2)
outstream = Stream()
@@ -118,8 +119,19 @@ class Context(object):
self.throw(IOError, "failed to decrypt")
else:
# asymmetric
# TODO
pass
if not self._sk:
self.throw(RuntimeError, "no secret key associated with current context")
if head[0] == PCP_ASYM_CIPHER_ANON:
doanon = 1
if head[0] == PCP_ASYM_CIPHER_SIG:
doverify
size = libpcp.pcp_decrypt_stream(self._ctx, instream._stream,
outstream._stream, self._sk,
ffi.NULL, doverify, doanon)
if size <= 0:
self.throw(IOError, "failed to decrypt")
# return the raw buffer contents
return ffi.buffer(libpcp.buffer_get_remainder(outstream._stream.b),

View File

@@ -2,12 +2,12 @@ from pypcp.dll import *
class Stream(object):
def __init__(self, string=None, file=None):
if file:
fd = open(file, 'r')
def __init__(self, backend=None):
if type(backend) is file:
fd = open(backend, 'r')
self._stream = libpcp.ps_new_file(fd)
elif string:
buf = libpcp.buffer_new_buf('inbuf', string, len(string))
elif type(backend) is str:
buf = libpcp.buffer_new_buf('inbuf', backend, len(backend))
self._stream = libpcp.ps_new_inbuffer(buf)
else:
self._stream = libpcp.ps_new_outbuffer()