diff options
| author | Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com> | 2012-06-14 07:57:17 +0200 |
|---|---|---|
| committer | Lorenzo Gil Sanchez <lorenzo.gil.sanchez@gmail.com> | 2012-06-14 07:57:17 +0200 |
| commit | d92fa8683a5ae5541df43031f61b9284715206b1 (patch) | |
| tree | 4a88698ab849432a647431991aafd02dff5d4b90 /src/xmldsig | |
| parent | 5e6968d0f24a554d1caf62f115e051e2e8faa80a (diff) | |
| parent | 90f2f673a8da76727dcad76049c1ee7a0f325d00 (diff) | |
| download | pysaml2-clean-client-api.tar.gz | |
Merge branch 'master' into clean-client-apiclean-client-api
Diffstat (limited to 'src/xmldsig')
| -rw-r--r-- | src/xmldsig/__init__.py | 14 |
1 files changed, 11 insertions, 3 deletions
diff --git a/src/xmldsig/__init__.py b/src/xmldsig/__init__.py index 16bffeae..df81b8f1 100644 --- a/src/xmldsig/__init__.py +++ b/src/xmldsig/__init__.py @@ -7,10 +7,8 @@ import saml2 from saml2 import SamlBase - NAMESPACE = 'http://www.w3.org/2000/09/xmldsig#' - ENCODING_BASE64 = 'http://www.w3.org/2000/09/xmldsig#base64' DIGEST_SHA1 = 'http://www.w3.org/2000/09/xmldsig#sha1' ALG_EXC_C14N = 'http://www.w3.org/2001/10/xml-exc-c14n#' @@ -1255,6 +1253,7 @@ class Reference(ReferenceType_): def reference_from_string(xml_string): return saml2.create_class_from_xml_string(Reference, xml_string) +#import xmlenc as enc class KeyInfoType_(SamlBase): """The http://www.w3.org/2000/09/xmldsig#:KeyInfoType element """ @@ -1279,8 +1278,15 @@ class KeyInfoType_(SamlBase): c_cardinality['spki_data'] = {"min":0} c_children['{http://www.w3.org/2000/09/xmldsig#}MgmtData'] = ('mgmt_data', [MgmtData]) c_cardinality['mgmt_data'] = {"min":0} + c_children['{http://www.w3.org/2000/09/xmlenc#}EncryptedKey'] = ( + 'encrypted_key', + None) + c_cardinality['key_info'] = {"min":0, "max":1} + c_attributes['Id'] = ('id', 'ID', False) - c_child_order.extend(['key_name', 'key_value', 'retrieval_method', 'x509_data', 'pgp_data', 'spki_data', 'mgmt_data']) + c_child_order.extend(['key_name', 'key_value', 'retrieval_method', + 'x509_data', 'pgp_data', 'spki_data', 'mgmt_data', + 'encrypted_key']) def __init__(self, key_name=None, @@ -1290,6 +1296,7 @@ class KeyInfoType_(SamlBase): pgp_data=None, spki_data=None, mgmt_data=None, + encrypted_key=None, id=None, text=None, extension_elements=None, @@ -1307,6 +1314,7 @@ class KeyInfoType_(SamlBase): self.pgp_data=pgp_data or [] self.spki_data=spki_data or [] self.mgmt_data=mgmt_data or [] + self.encrypted_key=encrypted_key self.id=id def key_info_type__from_string(xml_string): |