File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change @@ -156,31 +156,27 @@ def setup():
156156 openssl_conf = _tf ()
157157 logging .debug ("Generating OpenSSL config" )
158158 with open (openssl_conf , "w" ) as f :
159- f .write ("""
160- openssl_conf = openssl_def
161-
162- [openssl_def]
163- engines = engine_section
164-
165- [engine_section]
166- pkcs11 = pkcs11_section
167-
168- [req]
169- distinguished_name = req_distinguished_name
170-
171- [req_distinguished_name]
172-
173- [pkcs11_section]
174- engine_id = pkcs11
175- """ )
176- if openssl_version == "1.0" :
177- f .write ("dynamic_path = %s" % component_path ['P11_ENGINE' ])
178-
179- f .write ("""
180- MODULE_PATH = %s
181- PIN = secret1
182- init = 0
183- """ % (component_path ['P11_MODULE' ]))
159+ dynamic_path = (
160+ "dynamic_path = %s" % component_path ['P11_ENGINE' ]
161+ if openssl_version == "1.0"
162+ else ""
163+ )
164+ f .write ("\n " .join ([
165+ "openssl_conf = openssl_def" ,
166+ "[openssl_def]" ,
167+ "engines = engine_section" ,
168+ "[engine_section]" ,
169+ "pkcs11 = pkcs11_section" ,
170+ "[req]" ,
171+ "distinguished_name = req_distinguished_name" ,
172+ "[req_distinguished_name]" ,
173+ "[pkcs11_section]" ,
174+ "engine_id = pkcs11" ,
175+ dynamic_path ,
176+ "MODULE_PATH = %s" % component_path ['P11_MODULE' ],
177+ "PIN = secret1" ,
178+ "init = 0" ,
179+ ]))
184180
185181 signer_cert_der = _tf ()
186182
You can’t perform that action at this time.
0 commit comments