[git] GPGME - branch, ben/docs/2018-03, updated. gpgme-1.10.0-118-g7221bb6
by Ben McGinnes
cvs at cvs.gnupg.org
Mon Mar 19 23:54:55 CET 2018
This is an automated email from the git hooks/post-receive script. It was
generated because a ref change was pushed to the repository containing
the project "GnuPG Made Easy".
The branch, ben/docs/2018-03 has been updated
via 7221bb67642eb01a07957d66d0cbcd4ef8aadbf8 (commit)
via f3fe47e8fd2e7bc748016befcae494421223368c (commit)
via f0790f224d7af9521efe96e69a8f719fb89a5af2 (commit)
from 7ab42e79ade89f28507ea42d51148a40b4bfc736 (commit)
Those revisions listed above that are new to this repository have
not appeared on any other notification email; so we list those
revisions in full, below.
- Log -----------------------------------------------------------------
commit 7221bb67642eb01a07957d66d0cbcd4ef8aadbf8
Author: Ben McGinnes <ben at adversary.org>
Date: Tue Mar 20 09:53:27 2018 +1100
example: encrypt file
* Nested encryption in try/except statement in case recipient key is
untrusted or invalid.
diff --git a/lang/python/examples/howto/encrypt-file.py b/lang/python/examples/howto/encrypt-file.py
index 8aee52a..017a342 100755
--- a/lang/python/examples/howto/encrypt-file.py
+++ b/lang/python/examples/howto/encrypt-file.py
@@ -52,13 +52,19 @@ with open(filename, "rb") as f:
text = f.read()
with gpg.Context(armor=True) as ca:
- ciphertext, result, sign_result = ca.encrypt(text, recipients=rkey,
- sign=False)
- with open("{0}.asc".format(filename), "wb") as fa:
- fa.write(ciphertext)
+ try:
+ ciphertext, result, sign_result = ca.encrypt(text, recipients=rkey,
+ sign=False)
+ with open("{0}.asc".format(filename), "wb") as fa:
+ fa.write(ciphertext)
+ except gpg.errors.InvalidRecipients as e:
+ print(e)
with gpg.Context() as cg:
- ciphertext, result, sign_result = cg.encrypt(text, recipients=rkey,
- sign=False)
- with open("{0}.gpg".format(filename), "wb") as fg:
- fg.write(ciphertext)
+ try:
+ ciphertext, result, sign_result = cg.encrypt(text, recipients=rkey,
+ sign=False)
+ with open("{0}.gpg".format(filename), "wb") as fg:
+ fg.write(ciphertext)
+ except gpg.errors.InvalidRecipients as e:
+ print(e)
commit f3fe47e8fd2e7bc748016befcae494421223368c
Author: Ben McGinnes <ben at adversary.org>
Date: Tue Mar 20 09:47:39 2018 +1100
example: sign and encrypt file
* Example to sign and encrypt a file.
* Similar to encrypt-file.py except all keys are considered trusted
and signs with the default key.
* Also encrypts to the default key.
diff --git a/lang/python/examples/howto/encrypt-sign-file.py b/lang/python/examples/howto/encrypt-sign-file.py
new file mode 100755
index 0000000..c8850b2
--- /dev/null
+++ b/lang/python/examples/howto/encrypt-sign-file.py
@@ -0,0 +1,70 @@
+#!/usr/bin/env python3
+# -*- coding: utf-8 -*-
+
+from __future__ import absolute_import, division, unicode_literals
+
+# Copyright (C) 2018 Ben McGinnes <ben at gnupg.org>
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU General Public License as published by the Free Software
+# Foundation; either version 2 of the License, or (at your option) any later
+# version.
+#
+# This program is free software; you can redistribute it and/or modify it under
+# the terms of the GNU Lesser General Public License as published by the Free
+# Software Foundation; either version 2.1 of the License, or (at your option)
+# any later version.
+#
+# This program is distributed in the hope that it will be useful, but WITHOUT
+# ANY WARRANTY; without even the implied warranty of MERCHANTABILITY or FITNESS
+# FOR A PARTICULAR PURPOSE. See the GNU General Public License and the GNU
+# Lesser General Public Licensefor more details.
+#
+# You should have received a copy of the GNU General Public License and the GNU
+# Lesser General Public along with this program; if not, see
+# <http://www.gnu.org/licenses/>.
+
+import gpg
+import sys
+
+"""
+Signs and encrypts a file to a specified key. If entering both the key and the
+filename on the command line, the key must be entered first.
+
+Signs with and also encrypts to the default key of the user invoking the
+script. Will treat all recipients as trusted to permit encryption.
+
+Will produce both an ASCII armoured and GPG binary format copy of the encrypted
+file.
+"""
+
+if len(sys.argv) > 3:
+ a_key = sys.argv[1]
+ filename = " ".join(sys.argv[2:])
+elif len(sys.argv) == 3:
+ a_key = sys.argv[1]
+ filename = sys.argv[2]
+elif len(sys.argv) == 2:
+ a_key = sys.argv[1]
+ filename = input("Enter the path and filename to encrypt: ")
+else:
+ a_key = input("Enter the fingerprint or key ID to encrypt to: ")
+ filename = input("Enter the path and filename to encrypt: ")
+
+rkey = list(c.keylist(pattern=a_key, secret=False))
+with open(filename, "rb") as f:
+ text = f.read()
+
+with gpg.Context(armor=True) as ca:
+ ciphertext, result, sign_result = ca.encrypt(text, recipients=rkey,
+ always_trust=True,
+ add_encrypt_to=True)
+ with open("{0}.asc".format(filename), "wb") as fa:
+ fa.write(ciphertext)
+
+with gpg.Context() as cg:
+ ciphertext, result, sign_result = cg.encrypt(text, recipients=rkey,
+ always_trust=True,
+ add_encrypt_to=True)
+ with open("{0}.gpg".format(filename), "wb") as fg:
+ fg.write(ciphertext)
commit f0790f224d7af9521efe96e69a8f719fb89a5af2
Author: Ben McGinnes <ben at adversary.org>
Date: Tue Mar 20 09:39:48 2018 +1100
example: encrypt file
* Fixed typo in second encryption call.
diff --git a/lang/python/examples/howto/encrypt-file.py b/lang/python/examples/howto/encrypt-file.py
index 718c715..8aee52a 100755
--- a/lang/python/examples/howto/encrypt-file.py
+++ b/lang/python/examples/howto/encrypt-file.py
@@ -58,7 +58,7 @@ with gpg.Context(armor=True) as ca:
fa.write(ciphertext)
with gpg.Context() as cg:
- ciphertext, result, sign_result = ca.encrypt(text, recipients=rkey,
+ ciphertext, result, sign_result = cg.encrypt(text, recipients=rkey,
sign=False)
with open("{0}.gpg".format(filename), "wb") as fg:
fg.write(ciphertext)
-----------------------------------------------------------------------
Summary of changes:
lang/python/examples/howto/encrypt-file.py | 22 ++++++++++++++--------
.../{encrypt-file.py => encrypt-sign-file.py} | 18 ++++++++++++------
2 files changed, 26 insertions(+), 14 deletions(-)
copy lang/python/examples/howto/{encrypt-file.py => encrypt-sign-file.py} (75%)
hooks/post-receive
--
GnuPG Made Easy
http://git.gnupg.org
More information about the Gnupg-commits
mailing list