diff options
| -rw-r--r-- | pyasn1_modules/pem.py | 9 | ||||
| -rw-r--r-- | tools/crldump.py | 2 | ||||
| -rw-r--r-- | tools/ocspclient.py | 4 | ||||
| -rw-r--r-- | tools/pkcs10dump.py | 2 | ||||
| -rw-r--r-- | tools/pkcs1dump.py | 2 | ||||
| -rw-r--r-- | tools/pkcs7dump.py | 2 | ||||
| -rw-r--r-- | tools/pkcs8dump.py | 2 | ||||
| -rw-r--r-- | tools/x509dump.py | 2 |
8 files changed, 16 insertions, 9 deletions
diff --git a/pyasn1_modules/pem.py b/pyasn1_modules/pem.py index abef3e7..d8d8158 100644 --- a/pyasn1_modules/pem.py +++ b/pyasn1_modules/pem.py @@ -4,7 +4,7 @@ stSpam, stHam, stDump = 0, 1, 2 # The markers parameters is in form ('start1', 'stop1'), ('start2', 'stop2')... # Return is (marker-index, substrate) -def readPemFromFile(fileObj, *markers): +def readPemBlocksFromFile(fileObj, *markers): startMarkers = dict(map(lambda x: (x[1],x[0]), enumerate(map(lambda x: x[0], markers)))) stopMarkers = dict(map(lambda x: (x[1],x[0]), @@ -35,6 +35,13 @@ def readPemFromFile(fileObj, *markers): break return idx, substrate +# Backward compatibility routine +def readPemFromFile(fileObj, + startMarker='-----BEGIN CERTIFICATE-----', + endMarker='-----END CERTIFICATE-----'): + idx, substrate = readPemBlocksFromFile(fileObj, (startMarker, endMarker)) + return substrate + def readBase64FromFile(fileObj): if sys.version_info[0] <= 2: return ''.join([ base64.b64decode(x) for x in fileObj.readlines() ]) diff --git a/tools/crldump.py b/tools/crldump.py index 7d8f610..d4b0a54 100644 --- a/tools/crldump.py +++ b/tools/crldump.py @@ -18,7 +18,7 @@ asn1Spec = rfc2459.CertificateList() cnt = 0 while 1: - idx, substrate = pem.readPemFromFile(sys.stdin, ('-----BEGIN X509 CRL-----', '-----END X509 CRL-----')) + idx, substrate = pem.readPemBlocksFromFile(sys.stdin, ('-----BEGIN X509 CRL-----', '-----END X509 CRL-----')) if not substrate: break diff --git a/tools/ocspclient.py b/tools/ocspclient.py index 24a824b..b2d1dfc 100644 --- a/tools/ocspclient.py +++ b/tools/ocspclient.py @@ -106,13 +106,13 @@ else: # Parse CA and user certificates issuerCert, _ = decoder.decode( - pem.readPemFromFile( + pem.readPemBlocksFromFile( sys.stdin, ('-----BEGIN CERTIFICATE-----', '-----END CERTIFICATE-----') )[1], asn1Spec=rfc2459.Certificate() ) userCert, _ = decoder.decode( - pem.readPemFromFile( + pem.readPemBlocksFromFile( sys.stdin, ('-----BEGIN CERTIFICATE-----', '-----END CERTIFICATE-----') )[1], asn1Spec=rfc2459.Certificate() diff --git a/tools/pkcs10dump.py b/tools/pkcs10dump.py index f3a4e67..ea979c0 100644 --- a/tools/pkcs10dump.py +++ b/tools/pkcs10dump.py @@ -17,7 +17,7 @@ certType = rfc2314.CertificationRequest() certCnt = 0 while 1: - idx, substrate = pem.readPemFromFile( + idx, substrate = pem.readPemBlocksFromFile( sys.stdin, ('-----BEGIN CERTIFICATE REQUEST-----', '-----END CERTIFICATE REQUEST-----') ) diff --git a/tools/pkcs1dump.py b/tools/pkcs1dump.py index 85feefe..d0da82b 100644 --- a/tools/pkcs1dump.py +++ b/tools/pkcs1dump.py @@ -16,7 +16,7 @@ $ cat rsakey.pem | %s""" % sys.argv[0]) cnt = 0 while 1: - idx, substrate = pem.readPemFromFile(sys.stdin, ('-----BEGIN RSA PRIVATE KEY-----', '-----END RSA PRIVATE KEY-----'), ('-----BEGIN DSA PRIVATE KEY-----', '-----END DSA PRIVATE KEY-----') ) + idx, substrate = pem.readPemBlocksFromFile(sys.stdin, ('-----BEGIN RSA PRIVATE KEY-----', '-----END RSA PRIVATE KEY-----'), ('-----BEGIN DSA PRIVATE KEY-----', '-----END DSA PRIVATE KEY-----') ) if not substrate: break diff --git a/tools/pkcs7dump.py b/tools/pkcs7dump.py index 27b6abe..7794871 100644 --- a/tools/pkcs7dump.py +++ b/tools/pkcs7dump.py @@ -12,7 +12,7 @@ if len(sys.argv) != 1: $ cat pkcs7Certificate.pem | %s""" % sys.argv[0]) sys.exit(-1) -idx, substrate = pem.readPemFromFile( +idx, substrate = pem.readPemBlocksFromFile( sys.stdin, ('-----BEGIN PKCS7-----', '-----END PKCS7-----') ) diff --git a/tools/pkcs8dump.py b/tools/pkcs8dump.py index a76a01c..d1d125f 100644 --- a/tools/pkcs8dump.py +++ b/tools/pkcs8dump.py @@ -15,7 +15,7 @@ $ cat pkcs8key.pem | %s""" % sys.argv[0]) cnt = 0 while 1: - idx, substrate = pem.readPemFromFile(sys.stdin, ('-----BEGIN PRIVATE KEY-----', '-----END PRIVATE KEY-----'), ('-----BEGIN ENCRYPTED PRIVATE KEY-----', '-----END ENCRYPTED PRIVATE KEY-----') ) + idx, substrate = pem.readPemBlocksFromFile(sys.stdin, ('-----BEGIN PRIVATE KEY-----', '-----END PRIVATE KEY-----'), ('-----BEGIN ENCRYPTED PRIVATE KEY-----', '-----END ENCRYPTED PRIVATE KEY-----') ) if not substrate: break diff --git a/tools/x509dump.py b/tools/x509dump.py index ba4f761..64cba7e 100644 --- a/tools/x509dump.py +++ b/tools/x509dump.py @@ -18,7 +18,7 @@ certType = rfc2459.Certificate() certCnt = 0 while 1: - idx, substrate = pem.readPemFromFile( + idx, substrate = pem.readPemBlocksFromFile( sys.stdin, ('-----BEGIN CERTIFICATE-----', '-----END CERTIFICATE-----') ) |