Changeset 1142 for TI12-security

Timestamp:

08/06/06 13:32:29 (14 years ago)

Author:

pjkersha

Message:

NDG/AttAuthority.py: use new AttCert? class vars for mapped/original provenance flags

NDG/AttCert.py:

• Fixed bug in setValidityTime - code to apply not before time offset was incorrectly indented so that it wasn't

applied.

• Added class vars for mapped/original provenance flags

Location:

TI12-security/trunk/python/NDG

Files:

• AttAuthority.py (modified) (2 diffs)
• AttCert.py (modified) (3 diffs)

TI12-security/trunk/python/NDG/AttAuthority.py

@@ -387 +387 @@
 
             # Mark new Attribute Certificate as an original
-            attCert['provenance'] = 'original'
+            attCert['provenance'] = AttCert.origProvenance
 
         else:            
@@ -465 +465 @@
             
             # Mark new Attribute Certificate as mapped
-            attCert['provenance'] = 'mapped'
+            attCert['provenance'] = AttCert.mappedProvenance
 
             # End set mapped certificate block

TI12-security/trunk/python/NDG/AttCert.py

@@ -52 +52 @@
     # Provenance of certificate may be original or mapped from another
     # certificate
-    __provenance = ('original', 'mapped')
+    mappedProvenance = 'mapped'
+    origProvenance = 'original'
+    __provenance = (origProvenance, mappedProvenance)
 
 
@@ -359 +361 @@
     def isOriginal(self):
         """Check for original provenance."""
-        return self.__dat['provenance'] == 'original'
+        return self.__dat['provenance'] == self.__class__.origProvenance
 
 
     def isMapped(self):
         """Check for mapped provenance."""
-        return self.__dat['provenance'] == 'mapped'
+        return self.__dat['provenance'] == self.__class__.mappedProvenance
 
 
@@ -604 +606 @@
             self.__dtNotBefore = datetime.utcnow()
             
-            if notBeforeOffset is not None:
-                self.__dtNotBefore += timedelta(seconds=notBeforeOffset)
+        if notBeforeOffset is not None:
+            self.__dtNotBefore += timedelta(seconds=notBeforeOffset)