diff options
| author | Rob Austein <sra@hactrn.net> | 2007-10-30 22:17:42 +0000 |
|---|---|---|
| committer | Rob Austein <sra@hactrn.net> | 2007-10-30 22:17:42 +0000 |
| commit | 5936396836aecdb73d50c0a8ed3b96ab203c1cea (patch) | |
| tree | ae1811c026c47d9290033fabb57910d892e6defa | |
| parent | a704abb9ef3e67e5d34cd82bb2f10bbb4b967070 (diff) | |
Handle binary files correctly
svn path=/scripts/manifests.py; revision=1207
| -rw-r--r-- | scripts/manifests.py | 4 | ||||
| -rw-r--r-- | scripts/rpki/x509.py | 4 |
2 files changed, 4 insertions, 4 deletions
diff --git a/scripts/manifests.py b/scripts/manifests.py index 8c42f46a..ce72ffc6 100644 --- a/scripts/manifests.py +++ b/scripts/manifests.py @@ -40,12 +40,12 @@ if show_signed_manifest_PEM: print m.get_PEM() if dump_manifest_content_DER: - f = open("manifest-content.der", "w") + f = open("manifest-content.der", "wb") f.write(m.get_content().toString()) f.close() if dump_signed_manifest_DER: - f = open("signed-manifest.der", "w") + f = open("signed-manifest.der", "wb") f.write(m.get_DER()) f.close() diff --git a/scripts/rpki/x509.py b/scripts/rpki/x509.py index 4c32c7fd..25768d19 100644 --- a/scripts/rpki/x509.py +++ b/scripts/rpki/x509.py @@ -30,7 +30,7 @@ class PEM_converter(object): def to_DER(self, pem): """Convert from PEM to DER.""" - lines = pem.splitlines(0) + lines = [line.strip() for line in pem.splitlines(0)] while lines and lines.pop(0) != self.b: pass while lines and lines.pop(-1) != self.e: @@ -103,7 +103,7 @@ class DER_object(object): self.DER = base64.b64decode(kw[name]) return if name in ("PEM_file", "DER_file", "Auto_file"): - f = open(kw[name], "r") + f = open(kw[name], "rb") value = f.read() f.close() if name == "PEM_file" or (name == "Auto_file" and self.pem_converter.looks_like_PEM(value)): |