Changeset 5564


Ignore:
Timestamp:
05/08/09 15:22:32 (10 years ago)
Author:
pjkersha
Message:

NDG Security New Release

rc2 fixes bug in ndg.security.common.AttCert? due to change in M2Crypto 0.20 M2Crypto.X509.X509.get_serial_number() now returns a long type intead of int.

Location:
TI12-security/trunk/python
Files:
7 edited

Legend:

Unmodified
Added
Removed
  • TI12-security/trunk/python/ndg.security.client/setup.cfg

    r5465 r5564  
    1616 
    1717[egg_info] 
    18 tag_build = rc1 
     18tag_build = rc2 
    1919tag_svn_revision = true 
    2020 
  • TI12-security/trunk/python/ndg.security.common/ndg/security/common/AttCert.py

    r5436 r5564  
    371371        """Set holder's Distinguished Name string.""" 
    372372        if not isinstance(holder, basestring): 
    373             raise AttributeError, "holder DN must be a string" 
     373            raise TypeError("holder DN must be a string") 
    374374 
    375375        self.__dat['holder'] = holder 
     
    396396        """Set issuer's Distinguished Name.""" 
    397397        if not isinstance(issuer, basestring): 
    398             raise AttributeError, "issuer DN must be a string" 
     398            raise TypeError("issuer DN must be a string") 
    399399         
    400400        self.__dat['issuer'] = issuer 
     
    421421        """Set the name of the issuer""" 
    422422        if not isinstance(issuerName, basestring): 
    423             raise AttributeError, "issuerName must be a string" 
     423            raise TypeError("issuerName must be a string") 
    424424         
    425425        self.__dat['issuerName'] = issuerName 
     
    438438    def __setIssuerSerialNumber(self, serialNumber): 
    439439        """@param serialNumber: the issuer serial number""" 
    440         if not isinstance(serialNumber, int): 
    441             raise AttributeError, "issuerSerialNumber must be an integer" 
     440        if not isinstance(serialNumber, (int, long)): 
     441            raise TypeError("issuerSerialNumber must be an integer or a long") 
    442442 
    443443        self.__dat['issuerSerialNumber'] = serialNumber 
     
    460460        @param userId: user identifier""" 
    461461        if not isinstance(userId, basestring): 
    462             raise AttributeError, "userId must be a string" 
     462            raise TypeError("userId must be a string") 
    463463         
    464464        self.__dat['userId'] = userId 
  • TI12-security/trunk/python/ndg.security.common/setup.cfg

    r5465 r5564  
    1616 
    1717[egg_info] 
    18 tag_build = rc1 
     18tag_build = rc2 
    1919tag_svn_revision = true 
    2020 
  • TI12-security/trunk/python/ndg.security.server/setup.cfg

    r5465 r5564  
    1515 
    1616[egg_info] 
    17 tag_build = rc1 
     17tag_build = rc2 
    1818tag_svn_revision = true 
    1919 
  • TI12-security/trunk/python/ndg.security.test/ndg/security/test/unit/attCert/ac.xml

    r5362 r5564  
    99        <userId>/O=NDG/OU=BADC/CN=pjkershaw</userId> 
    1010        <validity> 
    11             <notBefore>2009 06 05 12 36 58</notBefore>  
    12             <notAfter>2009 06 05 20 36 58</notAfter>  
     11            <notBefore>2009 08 05 14 20 00</notBefore>  
     12            <notAfter>2009 08 05 22 20 00</notAfter>  
    1313        </validity> 
    1414        <attributes> 
     
    2727        <provenance>original</provenance>  
    2828    </acInfo> 
    29 <ds:Signature><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="ds"></ec:InclusiveNamespaces></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod><ds:Reference URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="xmlns"></ec:InclusiveNamespaces></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod><ds:DigestValue>zBQyG8WewEY2RBAsBnbQ5EvTXxo=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>jfUUeFSgTkPCV/M2Grh1TQfVN0a9mEeAS6sGu1BdOUlzC0BxX+3p/0WGrczQNl8ANV/0D1iivo+H 
    30 IiPNlS0gFXBB/MLY0dL2+Kis4IzTux6WLavj5XxeIMbhfRS6ikXRJOWlpVYIDCV0PNMy9wrjA6Ll 
    31 +ZWGT/Dx/FYokl9FuMEISVLoXNDF37TPoGoJ0PCuowTbBUsqMuUgIYJHo8g9hkTYOJazyx3QVFWw 
    32 H6nUWd1R/XoLROb0rNRKmlEKEjptXWYVi0ZzbbnZ/ZlAo7+6JwwmAMuh21dRAhb1ogiJZyG5WTNt 
    33 J0kf6FsXOFvNZEs+U+Jo3NPvJoPEM+VIffclIA==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIICazCCAdSgAwIBAgICAQEwDQYJKoZIhvcNAQEEBQAwLzEMMAoGA1UEChMDTkRH 
     29<ds:Signature><ds:SignedInfo><ds:CanonicalizationMethod Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="ds"></ec:InclusiveNamespaces></ds:CanonicalizationMethod><ds:SignatureMethod Algorithm="http://www.w3.org/2000/09/xmldsig#rsa-sha1"></ds:SignatureMethod><ds:Reference URI=""><ds:Transforms><ds:Transform Algorithm="http://www.w3.org/2000/09/xmldsig#enveloped-signature"></ds:Transform><ds:Transform Algorithm="http://www.w3.org/2001/10/xml-exc-c14n#"><ec:InclusiveNamespaces PrefixList="xmlns"></ec:InclusiveNamespaces></ds:Transform></ds:Transforms><ds:DigestMethod Algorithm="http://www.w3.org/2000/09/xmldsig#sha1"></ds:DigestMethod><ds:DigestValue>b8UAMEjlV2O5zDyqPQ7rwoY069Y=</ds:DigestValue></ds:Reference></ds:SignedInfo><ds:SignatureValue>nCUJjwGRUjSFrpoBn4UAUa86lg2187LoYmGt7gFNjJQtjN9sCslxymMZDxTPRYQXxVHpUSFI/QBp 
     30GmN4fiurc7feOBxW8sfoa3/4sIAPB9DY49PTuC9O5f11v62LPxuwFzjkUsyXn0NRaDIZfDN2alzS 
     31NSs19BhGTvGg2v5RqtfRFC3xEyluOxo/ViEbG9VMOvagySCMiFQCzBw0dFFBV22LFEYrfIShCsFS 
     32jPiaY2w4cHNcU0mPolrz/Z+bE9KHOkJe3iqj24gdDNmeBIhowB99/kMvYuO6nkVlaJKjbivCZv0l 
     33bNcTAmorB3naol8DhGbM2UASLLrZecMImaTOrg==</ds:SignatureValue><ds:KeyInfo><ds:X509Data><ds:X509Certificate>MIICazCCAdSgAwIBAgICAQEwDQYJKoZIhvcNAQEEBQAwLzEMMAoGA1UEChMDTkRH 
    3434MQ0wCwYDVQQLEwRCQURDMRAwDgYDVQQDEwdUZXN0IENBMB4XDTA4MTIxNjE1MTE0 
    3535OFoXDTEzMTIxNTE1MTE0OFowLDEMMAoGA1UEChMDTkRHMQ0wCwYDVQQLEwRCQURD 
  • TI12-security/trunk/python/ndg.security.test/setup.cfg

    r5465 r5564  
    99# BSD - See LICENCE file for details 
    1010[egg_info] 
    11 tag_build = rc1 
     11tag_build = rc2 
    1212tag_svn_revision = true 
    1313 
  • TI12-security/trunk/python/ndg.security/setup.cfg

    r5465 r5564  
    1818 
    1919[egg_info] 
    20 tag_build = rc1 
     20tag_build = rc2 
    2121tag_svn_revision = true 
    2222 
Note: See TracChangeset for help on using the changeset viewer.