From f47047ee5809d11357201f0841a8dbcf4b96f1f3 Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Tue, 9 Jun 2015 14:04:07 -0700 Subject: [PATCH 1/3] Update key function usage --- saml/signature.py | 7 +++++-- 1 file changed, 5 insertions(+), 2 deletions(-) diff --git a/saml/signature.py b/saml/signature.py index c4c388c..604874f 100644 --- a/saml/signature.py +++ b/saml/signature.py @@ -146,9 +146,12 @@ def verify(xml, stream): xmlsec.KeyFormat.PEM, xmlsec.KeyFormat.CERT_PEM]: stream.seek(0) - key = xmlsec.Key.from_memory(stream, fmt) - if key is not None: + try: + key = xmlsec.Key.from_memory(stream, fmt) break + except ValueError: + # xmlsec now throws when it can't load the key + pass # Set the key on the context. ctx.key = key From 8e748a5cd08a32c168064b998196cbaea8b34cbf Mon Sep 17 00:00:00 2001 From: Ryan Leckey Date: Fri, 19 Jun 2015 14:55:00 -0700 Subject: [PATCH 2/3] Bump version --- saml/_version.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/saml/_version.py b/saml/_version.py index 138c06d..b47a122 100644 --- a/saml/_version.py +++ b/saml/_version.py @@ -1,3 +1,3 @@ # -*- coding: utf-8 -*- -__version_info__ = (0, 8, 0) +__version_info__ = (0, 9, 0) __version__ = '.'.join(map(str, __version_info__)) From d866656cc3cc91e91c37627e5f9b6a94a6b0ade2 Mon Sep 17 00:00:00 2001 From: Alex Meng Date: Fri, 18 Dec 2015 09:41:21 -0700 Subject: [PATCH 3/3] Correct a typo Fixes #7 --- saml/schema/base.py | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/saml/schema/base.py b/saml/schema/base.py index f429eef..fbe64c6 100644 --- a/saml/schema/base.py +++ b/saml/schema/base.py @@ -446,4 +446,4 @@ def deserialize(cls, xml): @classmethod def fromstring(cls, text): - return cls.deserialized(etree.XML(text)) + return cls.deserialize(etree.XML(text))