[git] GPGME - branch, ben/howto-update-05, updated. gpgme-1.11.1-26-gfd42264

by Ben McGinnes cvs at cvs.gnupg.org
Wed May 30 01:19:53 CEST 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/howto-update-05 has been updated
       via  fd4226429d923537ad5a04141163fdb5ee7c04db (commit)
       via  93bdf4b50aca884859125d041685e0b2cfe2b4fe (commit)
      from  095093df2037fa5fc2778fa5fac13a5d2d73e8dd (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 fd4226429d923537ad5a04141163fdb5ee7c04db
Author: Ben McGinnes <ben at adversary.org>
Date:   Wed May 30 09:11:28 2018 +1000

    examples: exporting keys
    
    * Fixed the descriptions and explanation of what happens if no
      search/user ID/key ID data is included (it exports the lot).

diff --git a/lang/python/examples/howto/export-key.py b/lang/python/examples/howto/export-key.py
index 108881d..5c3280b 100755
--- a/lang/python/examples/howto/export-key.py
+++ b/lang/python/examples/howto/export-key.py
@@ -33,7 +33,10 @@ c = gpg.Context(armor=True)
 k = gpg.Data()
 
 print("""
-This script exports a secret key to a file.
+This script exports one or more public keys to a file.
+
+If the uer or key IDs are not included then all available public keys will be
+exported to a file (ASCII aroured).
 """)
 
 if len(sys.argv) > 3:
@@ -51,7 +54,7 @@ elif len(sys.argv) == 2:
 else:
     filepth = input("Enter the filename and path of the key file: ")
     homedir = input("Enter the GPG configuration directory path (optional): ")
-    keytext = input("Enter the user or key ID for export: ")
+    keytext = input("Enter the user or key ID for export (optional): ")
 
 if homedir.startswith("~"):
     if os.path.exists(os.path.expanduser(homedir)) is True:
diff --git a/lang/python/examples/howto/export-secret-key.py b/lang/python/examples/howto/export-secret-key.py
index fa3aa7e..2ee59bc 100755
--- a/lang/python/examples/howto/export-secret-key.py
+++ b/lang/python/examples/howto/export-secret-key.py
@@ -33,9 +33,13 @@ c = gpg.Context(armor=True)
 k = gpg.Data()
 
 print("""
-This script exports a secret key to a file.
+This script exports one or more secret keys to a file.
 
-Will prompt for passphrase using gpg-agent and pinentry.
+Will prompt for passphrase using gpg-agent and pinentry for each key to be
+exported.
+
+If the user or key ID(s) are not entered then it will attempt to export all
+available keys and will prompt for the passphrase of each one.
 """)
 
 if len(sys.argv) > 3:
@@ -53,7 +57,7 @@ elif len(sys.argv) == 2:
 else:
     filepth = input("Enter the filename and path of the key file: ")
     homedir = input("Enter the GPG configuration directory path (optional): ")
-    keytext = input("Enter the user or key ID for export: ")
+    keytext = input("Enter the user or key ID for export (optional): ")
 
 if homedir.startswith("~"):
     if os.path.exists(os.path.expanduser(homedir)) is True:

commit 93bdf4b50aca884859125d041685e0b2cfe2b4fe
Author: Ben McGinnes <ben at adversary.org>
Date:   Wed May 30 08:55:12 2018 +1000

    examples: python bindings
    
    * 2 more scripts for planned expansion of the HOWTO.
    * export-key.py - is very similar to both the import-key.py script and
      an earlier example.
    * export-secret-key.py - the holiest of holies, a script to be very
      careful with (though on posix systems it is saved in a chmodded 600
      file).

diff --git a/lang/python/examples/howto/export-key.py b/lang/python/examples/howto/export-key.py
new file mode 100755
index 0000000..108881d
--- /dev/null
+++ b/lang/python/examples/howto/export-key.py
@@ -0,0 +1,71 @@
+#!/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 os
+import os.path
+import sys
+
+c = gpg.Context(armor=True)
+k = gpg.Data()
+
+print("""
+This script exports a secret key to a file.
+""")
+
+if len(sys.argv) > 3:
+    filepth = sys.argv[1]
+    homedir = sys.argv[2]
+    keytext = sys.argv[3]
+elif len(sys.argv) == 3:
+    filepth = sys.argv[1]
+    homedir = sys.argv[2]
+    keytext = input("Enter the user or key ID for export: ")
+elif len(sys.argv) == 2:
+    filepth = sys.argv[1]
+    homedir = input("Enter the GPG configuration directory path (optional): ")
+    keytext = input("Enter the user or key ID for export: ")
+else:
+    filepth = input("Enter the filename and path of the key file: ")
+    homedir = input("Enter the GPG configuration directory path (optional): ")
+    keytext = input("Enter the user or key ID for export: ")
+
+if homedir.startswith("~"):
+    if os.path.exists(os.path.expanduser(homedir)) is True:
+        c.home_dir = os.path.expanduser(homedir)
+    else:
+        pass
+elif os.path.exists(homedir) is True:
+    c.home_dir = homedir
+else:
+    pass
+
+c.op_export(keytext, 0, k)
+k.seek(0, os.SEEK_SET)
+expkey = k.read()
+
+with open(filepth, "wb") as f:
+    f.write(expkey)
diff --git a/lang/python/examples/howto/export-secret-key.py b/lang/python/examples/howto/export-secret-key.py
new file mode 100755
index 0000000..fa3aa7e
--- /dev/null
+++ b/lang/python/examples/howto/export-secret-key.py
@@ -0,0 +1,75 @@
+#!/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 os
+import os.path
+import sys
+
+c = gpg.Context(armor=True)
+k = gpg.Data()
+
+print("""
+This script exports a secret key to a file.
+
+Will prompt for passphrase using gpg-agent and pinentry.
+""")
+
+if len(sys.argv) > 3:
+    filepth = sys.argv[1]
+    homedir = sys.argv[2]
+    keytext = sys.argv[3]
+elif len(sys.argv) == 3:
+    filepth = sys.argv[1]
+    homedir = sys.argv[2]
+    keytext = input("Enter the user or key ID for export: ")
+elif len(sys.argv) == 2:
+    filepth = sys.argv[1]
+    homedir = input("Enter the GPG configuration directory path (optional): ")
+    keytext = input("Enter the user or key ID for export: ")
+else:
+    filepth = input("Enter the filename and path of the key file: ")
+    homedir = input("Enter the GPG configuration directory path (optional): ")
+    keytext = input("Enter the user or key ID for export: ")
+
+if homedir.startswith("~"):
+    if os.path.exists(os.path.expanduser(homedir)) is True:
+        c.home_dir = os.path.expanduser(homedir)
+    else:
+        pass
+elif os.path.exists(homedir) is True:
+    c.home_dir = homedir
+else:
+    pass
+
+c.op_export(keytext, gpg.core.gpgme.GPGME_EXPORT_MODE_SECRET, k)
+k.seek(0, os.SEEK_SET)
+seckey = k.read()
+
+with open(filepth, "wb") as f:
+    f.write(seckey)
+
+os.chmod(filepth, 0o600)

-----------------------------------------------------------------------

Summary of changes:
 .../howto/{import-key.py => export-key.py}         | 39 ++++++++++----------
 .../howto/{import-key.py => export-secret-key.py}  | 42 ++++++++++++----------
 2 files changed, 42 insertions(+), 39 deletions(-)
 copy lang/python/examples/howto/{import-key.py => export-key.py} (74%)
 copy lang/python/examples/howto/{import-key.py => export-secret-key.py} (69%)


hooks/post-receive
-- 
GnuPG Made Easy
http://git.gnupg.org




More information about the Gnupg-commits mailing list