X-Git-Url: http://git.cascardo.eti.br/?p=cascardo%2Fipsilon.git;a=blobdiff_plain;f=ipsilon%2Ftools%2Fsaml2metadata.py;h=d360ccdcb9452bfafa5ffce49e86adcbcc1bed6b;hp=98e7c67e0efe0fc4fca4034c2aed6544ab734513;hb=16422cfd77e080ba1c1f2cb8559620d0c200e0b9;hpb=07ec779defce9b0fecf4da8c726d1b492c147626

diff --git a/ipsilon/tools/saml2metadata.py b/ipsilon/tools/saml2metadata.py
index 98e7c67..d360ccd 100755
--- a/ipsilon/tools/saml2metadata.py
+++ b/ipsilon/tools/saml2metadata.py
@@ -97,11 +97,11 @@ class Metadata(object):
         elif isinstance(exp, datetime.datetime):
             d = exp
         elif isinstance(exp, datetime.timedelta):
-            d = datetime.datetime.now() + exp
+            d = datetime.datetime.utcnow() + exp
         else:
             raise TypeError('Invalid expiration date type')
 
-        self.root.set('validUntil', d.isoformat())
+        self.root.set('validUntil', d.isoformat() + 'Z')
 
     def add_cert(self, certdata, use):
         desc = mdElement(self.role, 'KeyDescriptor')