Skip to content

Commit cf2c74e

Browse files
authored
Merge pull request #84 from arun11299/master
Close file descriptors after reading. Gives ResourceWarning in python
2 parents b5ef2f1 + 949728b commit cf2c74e

1 file changed

Lines changed: 12 additions & 3 deletions

File tree

src/jwkest/jwk.py

Lines changed: 12 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -92,7 +92,11 @@ def sha512_digest(msg):
9292

9393

9494
def import_rsa_key_from_file(filename, passphrase=None):
95-
return RSA.importKey(open(filename, 'r').read(), passphrase=passphrase)
95+
content = None
96+
with open(filename, 'r') as f:
97+
content = f.read()
98+
99+
return RSA.importKey(content, passphrase=passphrase)
96100

97101

98102
def import_rsa_key(key, passphrase=None):
@@ -119,7 +123,10 @@ def der2rsa(der):
119123

120124
def pem_cert2rsa(pem_file):
121125
# Convert from PEM to DER
122-
pem = open(pem_file).read()
126+
pem = None
127+
with open(pem_file) as f:
128+
pem = f.read()
129+
123130
_rsa = RSA.importKey(pem)
124131
lines = pem.replace(" ", '').split()
125132
return der2rsa(a2b_base64(''.join(lines[1:-1])))
@@ -163,7 +170,9 @@ def load_x509_cert(url, spec2key):
163170

164171
def rsa_load(filename):
165172
"""Read a PEM-encoded RSA key pair from a file."""
166-
pem = open(filename, 'r').read()
173+
pem = None
174+
with open(filename, 'r') as f:
175+
pem = f.read()
167176
return import_rsa_key(pem)
168177

169178

0 commit comments

Comments
 (0)