summaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorAljaž Škof <as76011@student.uni-lj.si>2025-02-26 16:42:47 +0100
committerTimotej Lazar <timotej.lazar@fri.uni-lj.si>2025-02-26 17:02:47 +0100
commitf99891ad4a6d2f7a7c3ec6a0507e482a0fe139ce (patch)
tree1bf581da206996b6a6edf2d53b9cb9f0937dc758
parentcb8bb2531ef67bf072226bfdae042f90f27a795c (diff)
Fix certificate loading
Ignore garbage produced when converting certificates with openssl.
-rwxr-xr-xmarginaltool4
1 files changed, 3 insertions, 1 deletions
diff --git a/marginaltool b/marginaltool
index 6eac1c2..c5b5acc 100755
--- a/marginaltool
+++ b/marginaltool
@@ -33,7 +33,9 @@ def init(args):
args.certfile = config.get(args.url, 'certfile')
if not args.keyfile or not args.certfile:
raise Exception('key or certificate file not specified')
- args.cert = ''.join(line.strip() for line in open(args.certfile) if not line.startswith('-----'))
+ args.cert = ''.join(
+ cert.split('-----BEGIN CERTIFICATE-----', 1)[1]
+ .split('-----END CERTIFICATE-----', 1)[0])
case 'pkcs11':
if not args.id: