Skip to content

Work on cicada #2

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

Open
wants to merge 1 commit into
base: master
Choose a base branch
from
Open

Work on cicada #2

Show file tree
Hide file tree
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
3 changes: 3 additions & 0 deletions itss.py
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -165,6 +165,9 @@ def enroll(self, enrollment_id):
r = requests.put(self.EA_url + '/cits/ts_102941_v111/ea/enroll', data=encoded_er)

print(">>>", self.EA_url + '/cits/ts_102941_v111/ea/enroll')
if r.status_code != 200:
print(r.text)
sys.exit(1)
EnrolmentResponse = self.asn1.decode('EnrolmentResponse', r.content)
if EnrolmentResponse[0] != 'successfulEnrolment':
print("Enrollment failed!")
Expand Down
11 changes: 7 additions & 4 deletions itss/hsm_pkcs11.py
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,5 +1,6 @@
import PyKCS11
import hashlib

import PyKCS11
import cryptography.hazmat.primitives.serialization

from .hsm_abc import HSM
Expand All @@ -9,7 +10,7 @@ class PKCS11HSM(HSM):
def __init__(self):
self._privateKey = None
self._pkcs11 = PyKCS11.PyKCS11Lib()
self._pkcs11.load(pkcs11dll_filename="/Applications/YubiKey PIV Manager.app/Contents/MacOS/libykcs11.1.dylib")
self._pkcs11.load(pkcs11dll_filename="/usr/lib/cicada-pkcs11.so")
self._session = None


Expand All @@ -26,7 +27,7 @@ def generate_private_key(self):
def load(self):
self._slot = self._pkcs11.getSlotList(tokenPresent=True)[0]
self._session = self._pkcs11.openSession(self._slot, PyKCS11.CKF_SERIAL_SESSION)
self._session.login("11223344")
self._session.login("1234")

self._publicKey = self._session.findObjects([(PyKCS11.CKA_CLASS, PyKCS11.CKO_PUBLIC_KEY)])[0]
self._privateKey = self._session.findObjects([(PyKCS11.CKA_CLASS, PyKCS11.CKO_PRIVATE_KEY)])[0]
Expand All @@ -52,6 +53,8 @@ def get_public_key(self):


def sign(self, payload):
rs = self._session.sign(self._privateKey, payload, mecha=PyKCS11.Mechanism(PyKCS11.CKM_ECDSA_SHA256, None))
m = hashlib.sha256()
m.update(payload)
rs = self._session.sign(self._privateKey, m.digest(), mecha=PyKCS11.Mechanism(PyKCS11.CKM_ECDSA, None))
r, s = int.from_bytes(rs[:32], "big"), int.from_bytes(rs[32:], "big")
return r, s