|
 |
daa7419 |
From 651a1afe80bcc421da26f38015e8a322e140f130 Mon Sep 17 00:00:00 2001
|
|
|
daa7419 |
From: Ben McGinnes <ben@adversary.org>
|
|
|
daa7419 |
Date: Sat, 20 Oct 2018 11:07:55 +1100
|
|
|
daa7419 |
Subject: [PATCH] python bindings: callback test
|
|
|
daa7419 |
|
|
|
daa7419 |
* lang/python/tests/t-callbacks.py: Updated test logic to try
|
|
|
daa7419 |
generating a key which expires in 2099 and if that fails then
|
|
|
daa7419 |
fallback to an expiration in 2037 in an attempt to catch the 32-bit
|
|
|
daa7419 |
systems.
|
|
|
daa7419 |
---
|
|
|
daa7419 |
lang/python/tests/t-callbacks.py | 32 ++++++++++++++++++++++++++++++--
|
|
|
daa7419 |
1 file changed, 30 insertions(+), 2 deletions(-)
|
|
|
daa7419 |
|
|
|
daa7419 |
diff --git a/lang/python/tests/t-callbacks.py b/lang/python/tests/t-callbacks.py
|
|
|
daa7419 |
index 5bcac237..3a210dd0 100755
|
|
|
daa7419 |
--- a/lang/python/tests/t-callbacks.py
|
|
|
daa7419 |
+++ b/lang/python/tests/t-callbacks.py
|
|
|
daa7419 |
@@ -20,12 +20,14 @@
|
|
|
daa7419 |
from __future__ import absolute_import, print_function, unicode_literals
|
|
|
daa7419 |
|
|
|
daa7419 |
import os
|
|
|
daa7419 |
+import platform
|
|
|
daa7419 |
import gpg
|
|
|
daa7419 |
import support
|
|
|
daa7419 |
_ = support # to appease pyflakes.
|
|
|
daa7419 |
|
|
|
daa7419 |
del absolute_import, print_function, unicode_literals
|
|
|
daa7419 |
|
|
|
daa7419 |
+oops = None
|
|
|
daa7419 |
c = gpg.Context()
|
|
|
daa7419 |
c.set_pinentry_mode(gpg.constants.PINENTRY_MODE_LOOPBACK)
|
|
|
daa7419 |
|
|
|
daa7419 |
@@ -99,6 +101,17 @@ Expire-Date: 2099-12-31
|
|
|
daa7419 |
</GnupgKeyParms>
|
|
|
daa7419 |
"""
|
|
|
daa7419 |
|
|
|
daa7419 |
+prams = """<GnupgKeyParms format="internal">
|
|
|
daa7419 |
+Key-Type: RSA
|
|
|
daa7419 |
+Key-Length: 1024
|
|
|
daa7419 |
+Name-Real: Joe Tester
|
|
|
daa7419 |
+Name-Comment: with stupid passphrase
|
|
|
daa7419 |
+Name-Email: joe+gpg@example.org
|
|
|
daa7419 |
+Passphrase: Crypt0R0cks
|
|
|
daa7419 |
+Expire-Date: 2037-12-31
|
|
|
daa7419 |
+</GnupgKeyParms>
|
|
|
daa7419 |
+"""
|
|
|
daa7419 |
+
|
|
|
daa7419 |
messages = []
|
|
|
daa7419 |
|
|
|
daa7419 |
|
|
|
daa7419 |
@@ -111,7 +124,10 @@ def progress_cb(what, typ, current, total, hook=None):
|
|
|
daa7419 |
|
|
|
daa7419 |
c = gpg.Context()
|
|
|
daa7419 |
c.set_progress_cb(progress_cb, messages)
|
|
|
daa7419 |
-c.op_genkey(parms, None, None)
|
|
|
daa7419 |
+try:
|
|
|
daa7419 |
+ c.op_genkey(parms, None, None)
|
|
|
daa7419 |
+except Exception as oops:
|
|
|
daa7419 |
+ c.op_genkey(prams, None, None)
|
|
|
daa7419 |
assert len(messages) > 0
|
|
|
daa7419 |
|
|
|
daa7419 |
|
|
|
daa7419 |
@@ -123,7 +139,10 @@ def progress_cb(what, typ, current, total, hook=None):
|
|
|
daa7419 |
c = gpg.Context()
|
|
|
daa7419 |
c.set_progress_cb(progress_cb, None)
|
|
|
daa7419 |
try:
|
|
|
daa7419 |
- c.op_genkey(parms, None, None)
|
|
|
daa7419 |
+ try:
|
|
|
daa7419 |
+ c.op_genkey(parms, None, None)
|
|
|
daa7419 |
+ except Exception as oops:
|
|
|
daa7419 |
+ c.op_genkey(prams, None, None)
|
|
|
daa7419 |
except Exception as e:
|
|
|
daa7419 |
assert e == myException
|
|
|
daa7419 |
else:
|
|
|
daa7419 |
@@ -139,6 +158,15 @@ alpha = c.get_key("A0FF4590BB6122EDEF6E3C542D727CC768697734", False)
|
|
|
daa7419 |
cookie = object()
|
|
|
daa7419 |
edit_cb_called = False
|
|
|
daa7419 |
|
|
|
daa7419 |
+def oops_check():
|
|
|
daa7419 |
+ if oops is not None and platform.architecture()[0] != "64bit":
|
|
|
daa7419 |
+ y2k38_msg = "System appears to be 32-bit and vulnerable to EOL in 2038."
|
|
|
daa7419 |
+ elif oops is not None and platform.architecture()[0] == "64bit":
|
|
|
daa7419 |
+ y2k38_msg = "System appears to be 64-bit, but may use 32-bit time."
|
|
|
daa7419 |
+ else:
|
|
|
daa7419 |
+ y2k38_msg = "System is 64-bit and/or not susceptible to 2038 EOL."
|
|
|
daa7419 |
+ return y2k38_msg
|
|
|
daa7419 |
+
|
|
|
daa7419 |
|
|
|
daa7419 |
def edit_cb(status, args, hook):
|
|
|
daa7419 |
global edit_cb_called
|
|
|
daa7419 |
--
|
|
|
daa7419 |
2.21.0.rc1
|
|
|
daa7419 |
|