aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorRob Austein <sra@hactrn.net>2008-05-13 06:10:09 +0000
committerRob Austein <sra@hactrn.net>2008-05-13 06:10:09 +0000
commit36d650328e35f0af285dd79081624a240ef2f499 (patch)
treebf37fef2a61e8cf5c899b5cb87494c0e041c2180
parent9861e5873e03735ce2c6717e617334618c6528ec (diff)
Apparently strings in tlslite are occasionally something else, isn't
that special? So far I've only seen this happen on Fedora, dunno why. svn path=/rpkid/rpki/x509.py; revision=1771
-rw-r--r--rpkid/rpki/x509.py5
1 files changed, 4 insertions, 1 deletions
diff --git a/rpkid/rpki/x509.py b/rpkid/rpki/x509.py
index 76661981..23b7a693 100644
--- a/rpkid/rpki/x509.py
+++ b/rpkid/rpki/x509.py
@@ -277,7 +277,10 @@ class X509(DER_object):
self.DER = self.POWpkix.toString()
return self.get_DER()
if self.tlslite:
- self.DER = self.tlslite.writeBytes()
+ der = self.tlslite.writeBytes()
+ if not isinstance(der, str): # Apparently sometimes tlslite strings aren't strings,
+ der = der.tostring() # then again somtimes they are. Isn't that special?
+ self.DER = der
return self.get_DER()
raise rpki.exceptions.DERObjectConversionError, "No conversion path to DER available"