From c542cec82472c7e67f3ecd0e0fa857c8cdbdefd8 Mon Sep 17 00:00:00 2001
From: "Sybren A. St?vel" <sybren@stuvel.eu>
Date: Sat, 30 Jul 2011 20:13:09 +0200
Subject: Ignore fields in PEM-encoded files

---
 rsa/pem.py                   | 4 ++++
 tests/test_load_save_keys.py | 4 ++++
 2 files changed, 8 insertions(+)

diff --git a/rsa/pem.py b/rsa/pem.py
index 9e159e8..d252772 100644
--- a/rsa/pem.py
+++ b/rsa/pem.py
@@ -69,6 +69,10 @@ def load_pem(contents, pem_marker):
             in_pem_part = False
             break
 
+        # Skip empty lines or 'key: value' pairs.
+        if ':' in line or not line.strip():
+            continue
+
         pem_lines.append(line)
 
     # Do some sanity checks
diff --git a/tests/test_load_save_keys.py b/tests/test_load_save_keys.py
index facb826..466a3f5 100644
--- a/tests/test_load_save_keys.py
+++ b/tests/test_load_save_keys.py
@@ -16,6 +16,8 @@ PRIVATE_PEM = '''
 Cruft before the key
 
 -----BEGIN RSA PRIVATE KEY-----
+Comment: something blah
+
 %s
 -----END RSA PRIVATE KEY-----
 
@@ -34,6 +36,8 @@ PUBLIC_PEM = '''
 Cruft before the key
 
 -----BEGIN RSA PUBLIC KEY-----
+Comment: something blah
+
 %s
 -----END RSA PUBLIC KEY-----
 
-- 
cgit v1.2.1