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

Fix certificate reading

Browse source 
In some cases there could be garbage at the beginning or end of the certificate file
This commit is contained in:
Škof, Aljaž 2025-02-26 16:21:07 +01:00
parent cb8bb2531e
commit 25c047af28
1 changed files with 2 additions and 1 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
marginaltool
View file

@ -33,7 +33,8 @@ def init(args):
args.certfile = config.get(args.url, 'certfile') args.certfile = config.get(args.url, 'certfile')
if not args.keyfile or not args.certfile: if not args.keyfile or not args.certfile:
raise Exception('key or certificate file not specified') raise Exception('key or certificate file not specified')
args.cert = ''.join(line.strip() for line in open(args.certfile) if not line.startswith('-----')) cert = open(args.certfile).read()
args.cert = ''.join(cert[cert.find('-----BEGIN CERTIFICATE-----' + 27):cert.find('-----END CERTIFICATE-----')])
case 'pkcs11': case 'pkcs11':
if not args.id: if not args.id: