Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Jump to bottom

Avoid module-level imports of oscrypt #36

Closed
wants to merge 1 commit into from
Closed

Avoid module-level imports of oscrypt #36

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
9 changes: 5 additions & 4 deletions minikerberos/pkinit.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,6 @@
from asn1crypto import x509
from asn1crypto import keys

from oscrypto.keys import parse_pkcs12
from oscrypto.asymmetric import rsa_pkcs1v15_sign, load_private_key

from minikerberos.protocol.constants import NAME_TYPE, MESSAGE_TYPE, PaDataType
from minikerberos.protocol.encryption import Enctype, _checksum_table, _enctype_table, Key
from minikerberos.protocol.structures import AuthenticatorChecksum
Expand Down Expand Up @@ -113,6 +110,8 @@ def from_windows_certstore(username, certstore_name = 'MY', cert_serial = None,

@staticmethod
def from_pfx(pfxfile, pfxpass, dh_params = None):
from oscrypto.keys import parse_pkcs12
from oscrypto.asymmetric import load_private_key
pkinit = PKINIT()
#print('Loading pfx12')
if isinstance(pfxpass, str):
Expand Down Expand Up @@ -330,6 +329,8 @@ def sign_authpack_native(self, data, wrap_signed = False):
2. the certificate used to sign the data blob
3. the singed 'signed_attrs' structure (ASN1) which points to the "data" structure (in point 1)
"""

from oscrypto.asymmetric import rsa_pkcs1v15_sign

da = {}
da['algorithm'] = algos.DigestAlgorithmId('1.3.14.3.2.26') # for sha1
Expand Down Expand Up @@ -456,4 +457,4 @@ def get_metadata(self, target = None):
md['Info'] = Info(info)
md['1'] = [CertIssuer({'data' : ci.dump()})]

return MetaData(md).dump()
return MetaData(md).dump()