From 3ea044fb59bf6ada2c0e9b507c1d6c4dfd8aaa23 Mon Sep 17 00:00:00 2001
From: Rob Crittenden <rcritten@redhat.com>
Date: Mon, 3 May 2010 17:38:39 -0400
Subject: Handle CSRs whether they have NEW in the header or not

Also consolidate some duplicate code
---
 ipapython/certdb.py | 9 ++-------
 1 file changed, 2 insertions(+), 7 deletions(-)

(limited to 'ipapython/certdb.py')

diff --git a/ipapython/certdb.py b/ipapython/certdb.py
index 891b6c061..fb99e25ac 100644
--- a/ipapython/certdb.py
+++ b/ipapython/certdb.py
@@ -19,6 +19,7 @@
 
 from ipapython import ipautil
 from ipapython import nsslib
+from ipalib import pkcs10
 import tempfile
 import sha
 import shutil
@@ -99,13 +100,7 @@ class CertDB(object):
         f.close()
         csr = "".join(csr)
 
-        # We just want the CSR bits, make sure there is nothing else
-        s = csr.find("-----BEGIN NEW CERTIFICATE REQUEST-----")
-        e = csr.find("-----END NEW CERTIFICATE REQUEST-----")
-        if e > 0:
-            e = e + 37
-        if s >= 0:
-            csr = csr[s:]
+        csr = pkcs10.strip_header(csr)
 
         return csr
 
-- 
cgit