rc/marginaltool
2
0
Fork 1
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Report error when signing fails

Browse source
This commit is contained in:
Timotej Lazar 2024-01-16 21:51:47 +01:00
parent 0578bdffcb
commit 188567a429
1 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
margfools
View file

@ -15,12 +15,12 @@ import getpass
# use requests instead of urllib.request for keep-alive connection # use requests instead of urllib.request for keep-alive connection
import requests import requests
def sign(data, key, pin=None, engine=None): def sign(b64data, key, pin=None, engine=None):
if engine is None: if engine is None:
# key in file # key in file
cmd = ['openssl', 'pkeyutl', '-sign', '-inkey', key, '-pkeyopt', 'digest:sha256'] cmd = ['openssl', 'pkeyutl', '-sign', '-inkey', key, '-pkeyopt', 'digest:sha256']
raw_data = base64.b64decode(data)
env = None env = None
data = base64.b64decode(b64data)
elif engine == 'pkcs11': elif engine == 'pkcs11':
# key on smartcard # key on smartcard
digest_info = { # from RFC 3447 digest_info = { # from RFC 3447
@ -33,8 +33,12 @@ def sign(data, key, pin=None, engine=None):
} }
cmd = ['pkcs11-tool', '--id', key, '-s', '-m', 'RSA-PKCS', '-p', 'env:PIN'] cmd = ['pkcs11-tool', '--id', key, '-s', '-m', 'RSA-PKCS', '-p', 'env:PIN']
env = {'PIN': pin} env = {'PIN': pin}
raw_data = bytes.fromhex(digest_info['SHA-256']) + base64.b64decode(data) data = bytes.fromhex(digest_info['SHA-256']) + base64.b64decode(b64data)
p = subprocess.run(cmd, env=env, input=raw_data, capture_output=True)
p = subprocess.run(cmd, env=env, input=data, capture_output=True)
if p.returncode != 0:
raise RuntimeError('could not sign data')
return base64.b64encode(p.stdout).decode() return base64.b64encode(p.stdout).decode()
if __name__ == '__main__': if __name__ == '__main__':