nik/FreedomBox
1
0
Fork 0
mirror of https://github.com/freedombox/FreedomBox.git synced 2026-09-19 04:59:01 +00:00
Code Issues Packages Projects Releases Wiki Activity

sso: Update usage of OpenSSL crypt signing API

Browse Source 
Avoid the deprecation warning:

DeprecationWarning: str for data is no longer accepted, use bytes
    sig = crypto.sign(pkey, data, 'sha512')

Tests:

- Login to web interface, access Syncthing web interface. The login should work.

Signed-off-by: Sunil Mohan Adapa <sunil@medhas.org>
Reviewed-by: James Valleroy <jvalleroy@mailbox.org>
This commit is contained in:
Sunil Mohan Adapa 2021-09-21 14:30:49 -07:00 committed by James Valleroy
parent 07e62a213b
commit a0d880b62c
No known key found for this signature in database
GPG Key ID: 77C0C75E7B650808
1 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
actions/auth-pubtkt
View File

@ -74,8 +74,8 @@ def create_ticket(pkey, uid, validuntil, ip=None, tokens=None, udata=None,
tokens and f'tokens={tokens}', tokens and f'tokens={tokens}',
graceperiod and f'graceperiod={int(graceperiod)}', graceperiod and f'graceperiod={int(graceperiod)}',
udata and f'udata={udata}', udata and f'udata={udata}',
extra_fields and ';'.join( extra_fields
['{}={}'.format(k, v) for k, v in extra_fields]) and ';'.join(['{}={}'.format(k, v) for k, v in extra_fields]),
] ]
data = ';'.join(filter(None, fields)) data = ';'.join(filter(None, fields))
signature = 'sig={}'.format(sign(pkey, data)) signature = 'sig={}'.format(sign(pkey, data))
@ -84,7 +84,7 @@ def create_ticket(pkey, uid, validuntil, ip=None, tokens=None, udata=None,
def sign(pkey, data): def sign(pkey, data):
"""Calculates and returns ticket's signature.""" """Calculates and returns ticket's signature."""
sig = crypto.sign(pkey, data, 'sha512') sig = crypto.sign(pkey, data.encode(), 'sha512')
return base64.b64encode(sig).decode() return base64.b64encode(sig).decode()