Merge branch 'master' into neopg-wip

2018-07-01 13:52:37 +03:00
parent 6b6d9f5d20 b7a8c42893
commit 4968ca7ff3
19 changed files with 202 additions and 53 deletions
--- a/libagent/gpg/keyring.py
+++ b/libagent/gpg/keyring.py
@@ -48,9 +48,9 @@ def communicate(sock, msg):
    return recvline(sock)


-def sendline(sock, msg):
+def sendline(sock, msg, confidential=False):
    """Send a binary message, followed by EOL."""
-    log.debug('<- %r', msg)
+    log.debug('<- %r', ('<snip>' if confidential else msg))
    sock.sendall(msg + b'\n')