From 9ce6e9b9fc6f1a5e9ae19f6338b9ee2a3cc172dc Mon Sep 17 00:00:00 2001 From: Thierry Parmentelat Date: Wed, 10 Jun 2009 01:00:10 +0000 Subject: [PATCH] adds newline to the ---parent--- separator --- geni/util/cert.py | 6 ++++-- 1 file changed, 4 insertions(+), 2 deletions(-) diff --git a/geni/util/cert.py b/geni/util/cert.py index 2ebad5cc..08963f18 100644 --- a/geni/util/cert.py +++ b/geni/util/cert.py @@ -170,6 +170,8 @@ class Certificate: issuerSubject = None parent = None + separator="-----parent-----\n" + ## # Create a certificate object. # @@ -211,7 +213,7 @@ class Certificate: def load_from_string(self, string): # if it is a chain of multiple certs, then split off the first one and # load it - parts = string.split("-----parent-----", 1) + parts = string.split(Certificate.separator, 1) self.cert = crypto.load_certificate(crypto.FILETYPE_PEM, parts[0]) # if there are more certs, then create a parent and let the parent load @@ -236,7 +238,7 @@ class Certificate: def save_to_string(self, save_parents=False): string = crypto.dump_certificate(crypto.FILETYPE_PEM, self.cert) if save_parents and self.parent: - string = string + "-----parent-----" + self.parent.save_to_string(save_parents) + string = string + Certificate.separator + self.parent.save_to_string(save_parents) return string ## -- 2.43.0