re-enable python 3 testing #328
Merged
Conversation
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
diabonas
suggested changes
Nov 27, 2019
There was a problem hiding this comment.
For full Python 3 compatibility, you also need the following two changes:
diff --git a/tools/tpm2_pkcs11/commandlets_keys.py b/tools/tpm2_pkcs11/commandlets_keys.py
index d9b6c4b..066a67d 100644
--- a/tools/tpm2_pkcs11/commandlets_keys.py
+++ b/tools/tpm2_pkcs11/commandlets_keys.py
@@ -518,7 +518,7 @@ class AddCert(Command):
path = args['path']
label = args['label']
- keylabel = args['key_label']
+ keylabel = args['key_label'].encode()
certpath = args['cert']
# rather than use pycryptography x509 parser, which gives native type access to certficiate
@@ -531,7 +531,7 @@ class AddCert(Command):
# print(cert.prettyPrint())
- h = binascii.hexlify
+ h = lambda b : binascii.hexlify(b).decode()
b = berenc.encode
d = derenc.encode
williamcroberts
force-pushed
the
cert-support
branch
from
f8b8f73 to
1c9f737
Compare
python2 and python3 differ in behavior on reading from a file that was opened with the binary flag. In python2 the read data is a str, in python3 its bytes. This is posing an issue in the asn1 calls as outlined in bug: - etingof/pyasn1#185 We can work around this for now, since pem files are always string, remove the binary flag and open pem w/o binary mode flag Additionally, python3 and python 2 differe in handling str and bytes and python3 requires more type correctness. Fix all this in a way that works with python2 and python3 Releates to bug tpm2-software#327 Signed-off-by: William Roberts <[email protected]>
williamcroberts
force-pushed
the
cert-support
branch
from
1c9f737 to
14ce431
Compare
|
Yeah I go those today |
This reverts commit 0d92fce. Fixes: tpm2-software#327 Signed-off-by: William Roberts <[email protected]>
williamcroberts
force-pushed
the
cert-support
branch
from
14ce431 to
b478853
Compare
Codecov Report
@@ Coverage Diff @@
## master #328 +/- ##
=========================================
Coverage ? 76.81%
=========================================
Files ? 25
Lines ? 4921
Branches ? 0
=========================================
Hits ? 3780
Misses ? 1141
Partials ? 0Continue to review full report at Codecov.
|
Sign up for free
to join this conversation on GitHub.
Already have an account?
Sign in to comment
Add this suggestion to a batch that can be applied as a single commit.
This suggestion is invalid because no changes were made to the code.
Suggestions cannot be applied while the pull request is closed.
Suggestions cannot be applied while viewing a subset of changes.
Only one suggestion per line can be applied in a batch.
Add this suggestion to a batch that can be applied as a single commit.
Applying suggestions on deleted lines is not supported.
You must change the existing code in this line in order to create a valid suggestion.
Outdated suggestions cannot be applied.
This suggestion has been applied or marked resolved.
Suggestions cannot be applied from pending reviews.
Suggestions cannot be applied on multi-line comments.
Suggestions cannot be applied while the pull request is queued to merge.
Suggestion cannot be applied right now. Please check back later.
Figured out the issue, for details see commit messages and etingof/pyasn1#185