Compare commits
13 Commits
Author | SHA256 | Date | |
---|---|---|---|
c8aaabd165 | |||
e2edcafc86 | |||
3c36aff150 | |||
50006b9517 | |||
fb2280729f | |||
7b13058015 | |||
e252b5f565 | |||
948eeb54f5 | |||
a0e5571812 | |||
4fa7fc286d | |||
51ccbc5d57 | |||
9ca193ea16 | |||
e58b4efb36 |
@@ -1,53 +0,0 @@
|
|||||||
Index: tpm2-pytss-2.2.0/src/tpm2_pytss/internal/crypto.py
|
|
||||||
===================================================================
|
|
||||||
--- tpm2-pytss-2.2.0.orig/src/tpm2_pytss/internal/crypto.py
|
|
||||||
+++ tpm2-pytss-2.2.0/src/tpm2_pytss/internal/crypto.py
|
|
||||||
@@ -23,7 +23,7 @@ from cryptography.hazmat.primitives.ciph
|
|
||||||
from cryptography.hazmat.primitives.ciphers import modes, Cipher, CipherAlgorithm
|
|
||||||
from cryptography.hazmat.backends import default_backend
|
|
||||||
from cryptography.exceptions import UnsupportedAlgorithm, InvalidSignature
|
|
||||||
-from typing import Tuple, Type
|
|
||||||
+from typing import Tuple, Type, Any
|
|
||||||
import secrets
|
|
||||||
import sys
|
|
||||||
|
|
||||||
@@ -220,7 +220,7 @@ def public_to_key(obj):
|
|
||||||
return key
|
|
||||||
|
|
||||||
|
|
||||||
-class _MyRSAPrivateNumbers(rsa.RSAPrivateNumbers):
|
|
||||||
+class _MyRSAPrivateNumbers:
|
|
||||||
def __init__(self, p: int, n: int, e: int, pubnums: rsa.RSAPublicNumbers):
|
|
||||||
|
|
||||||
q = n // p
|
|
||||||
@@ -231,7 +231,12 @@ class _MyRSAPrivateNumbers(rsa.RSAPrivat
|
|
||||||
dmq1 = rsa.rsa_crt_dmq1(d, q)
|
|
||||||
iqmp = rsa.rsa_crt_iqmp(p, q)
|
|
||||||
|
|
||||||
- super().__init__(p, q, d, dmp1, dmq1, iqmp, pubnums)
|
|
||||||
+ self._private_numbers = rsa.RSAPrivateNumbers(
|
|
||||||
+ p, q, d, dmp1, dmq1, iqmp, pubnums
|
|
||||||
+ )
|
|
||||||
+
|
|
||||||
+ def private_key(self, *args: Any, **kwargs: Any) -> rsa.RSAPrivateKey:
|
|
||||||
+ return self._private_numbers.private_key(*args, **kwargs)
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _xgcd(a: int, b: int) -> Tuple[int, int, int]:
|
|
||||||
@@ -251,15 +256,7 @@ class _MyRSAPrivateNumbers(rsa.RSAPrivat
|
|
||||||
#
|
|
||||||
@staticmethod
|
|
||||||
def _modinv(a, m):
|
|
||||||
-
|
|
||||||
- if sys.version_info < (3, 8):
|
|
||||||
- g, x, y = _MyRSAPrivateNumbers._xgcd(a, m)
|
|
||||||
- if g != 1:
|
|
||||||
- raise Exception("modular inverse does not exist")
|
|
||||||
- else:
|
|
||||||
- return x % m
|
|
||||||
- else:
|
|
||||||
- return pow(a, -1, m)
|
|
||||||
+ return pow(a, -1, m)
|
|
||||||
|
|
||||||
@staticmethod
|
|
||||||
def _generate_d(p, q, e, n):
|
|
@@ -1,3 +0,0 @@
|
|||||||
version https://git-lfs.github.com/spec/v1
|
|
||||||
oid sha256:68e1caf6fc81fc93392bc917a72a48bb149bf03acf1c3408ed3a8433095d94d2
|
|
||||||
size 210068
|
|
Reference in New Issue
Block a user