axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From kausha...@apache.org
Subject svn commit: r474652 - in /webservices/axis2/trunk/c/rampart: include/ src/omxmlsec/ src/util/ test/omxmlsec/
Date Tue, 14 Nov 2006 04:46:12 GMT
Author: kaushalye
Date: Mon Nov 13 20:46:11 2006
New Revision: 474652

URL: http://svn.apache.org/viewvc?view=rev&rev=474652
Log:
Changed constant varaible names from MixedCase to UPPER_CASE.
Modified all files that is effected by this change.

Modified:
    webservices/axis2/trunk/c/rampart/include/oxs_constants.h
    webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am
    webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_data.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_data_reference.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_key.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encryption_method.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_info.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_name.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_reference_list.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
    webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c

Modified: webservices/axis2/trunk/c/rampart/include/oxs_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_constants.h?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_constants.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_constants.h Mon Nov 13 20:46:11 2006
@@ -25,262 +25,283 @@
 
 /*Default values*/
 /*Key transfer algo*/
-#define OXS_DEFAULT_KT_ALGO_HREF OXS_HrefRsaPkcs1
+#define OXS_DEFAULT_KT_ALGO_HREF OXS_HREF_RSA_PKCS1
 
 
-/*Global prefixes**********************/
-
-#define OXS_xenc "xenc"
-#define OXS_ds "ds"
+/****************************************************************
+   Global prefixes 
+****************************************************************/
+#define OXS_XENC "xenc"
+#define OXS_DS "ds"
 #define OXS_WSSE "wsse"
 
-
-/*ID Prefixes*/
+/****************************************************************
+    ID Prefixes
+****************************************************************/
 #define OXS_ENCDATA_ID "EncDataID"
 #define OXS_ENCKEY_ID "EncKeyID"
 
-/* Global namespaces *******************/
-
-#define OXS_DSigNs                "http://www.w3.org/2000/09/xmldsig#"
-#define OXS_EncNs                 "http://www.w3.org/2001/04/xmlenc#"
-#define OXS_WSSENS                "http://schemas.xmlsoap.org/ws/2002/04/secext"
-
-/* DSig Nodes  **************************/
-
-#define OXS_NodeSignature         "Signature" 
-#define OXS_NodeSignedInfo        "SignedInfo" 
-#define OXS_NodeCanonicalizationMethod "CanonicalizationMethod" 
-#define OXS_NodeSignatureMethod    "SignatureMethod" 
-#define OXS_NodeSignatureValue     "SignatureValue" 
-#define OXS_NodeDigestMethod       "DigestMethod" 
-#define OXS_NodeDigestValue        "DigestValue" 
-#define OXS_NodeObject             "Object" 
-#define OXS_NodeManifest           "Manifest" 
-#define OXS_NodeSignatureProperties "SignatureProperties" 
-
-
-/* Encryption Nodes ************************/
-
-#define OXS_NodeEncryptedData             "EncryptedData" 
-#define OXS_NodeEncryptionMethod          "EncryptionMethod" 
-#define OXS_NodeEncryptionProperties      "EncryptionProperties"
-#define OXS_NodeEncryptionProperty        "EncryptionProperty"
-#define OXS_NodeCipherData                "CipherData"
-#define OXS_NodeCipherValue               "CipherValue"
-#define OXS_NodeCipherReference           "CipherReference"
-#define OXS_NodeReferenceList             "ReferenceList"
-#define OXS_NodeDataReference             "DataReference"
-#define OXS_NodeKeyReference              "KeyReference"
-#define OXS_NodeCarriedKeyName            "CarriedKeyName"
-#define OXS_TypeEncContent                "http://www.w3.org/2001/04/xmlenc#Content"
-#define OXS_TypeEncElement                "http://www.w3.org/2001/04/xmlenc#Element"
-
-/* KeyInfo Nodes*****************************/
-
-#define OXS_NodeKeyInfo               "KeyInfo" 
-#define OXS_NodeReference             "Reference" 
-#define OXS_NodeTransforms            "Transforms" 
-#define OXS_NodeTransform             "Transform" 
-
-/* KeyInfo Nodes*****************************/
-#define OXS_NodeBinarySecurityToken     "BinarySecurityToken"
-
-
-/* Attributes********************************/
-
-#define OXS_AttrId            "Id"
-#define OXS_AttrURI           "URI"
-#define OXS_AttrType          "Type"
-#define OXS_AttrMimeType      "MimeType"
-#define OXS_AttrEncoding      "Encoding"
-#define OXS_AttrAlgorithm     "Algorithm"
-#define OXS_AttrFilter        "Filter"
-#define OXS_AttrRecipient     "Recipient"
-#define OXS_AttrTarget        "Target"
-#define OXS_AttrEncodingType  "EncodingType"
-#define OXS_AttrValueType     "ValueType"
-
-
-/*************************************************************************
- *
- * AES strings
- *
- ************************************************************************/
-#define OXS_NameAESKeyValue          "aes" 
-#define OXS_NodeAESKeyValue          "AESKeyValue" 
-#define OXS_HrefAESKeyValue          "http://www.aleksey.com/xmlsec/2002#AESKeyValue" 
-
-#define OXS_NameAes128Cbc        "aes128-cbc" 
-#define OXS_HrefAes128Cbc        "http://www.w3.org/2001/04/xmlenc#aes128-cbc" 
-
-#define OXS_NameAes192Cbc        "aes192-cbc" 
-#define OXS_HrefAes192Cbc        "http://www.w3.org/2001/04/xmlenc#aes192-cbc" 
-
-#define OXS_NameAes256Cbc        "aes256-cbc" 
-#define OXS_HrefAes256Cbc        "http://www.w3.org/2001/04/xmlenc#aes256-cbc" 
-
-#define OXS_NameKWAes128         "kw-aes128" 
-#define OXS_HrefKWAes128         "http://www.w3.org/2001/04/xmlenc#kw-aes128" 
-
-#define OXS_NameKWAes192         "kw-aes192" 
-#define OXS_HrefKWAes192         "http://www.w3.org/2001/04/xmlenc#kw-aes192" 
-
-#define OXS_NameKWAes256         "kw-aes256" 
-#define OXS_HrefKWAes256         "http://www.w3.org/2001/04/xmlenc#kw-aes256" 
-
-/*************************************************************************
- *
- * BASE64 strings
- *
- ************************************************************************/
-#define OXS_NameBase64           "base64" 
-#define OXS_HrefBase64           "http://www.w3.org/2000/09/xmldsig#base64" 
-
-
-/* DES strings*****************************/
-
-#define OXS_NameDESKeyValue       "des" 
-#define OXS_NodeDESKeyValue       "DESKeyValue" 
-#define OXS_HrefDESKeyValue       "http://www.aleksey.com/xmlsec/2002#DESKeyValue" 
-
-#define OXS_NameDes3Cbc           "tripledes-cbc" 
-#define OXS_HrefDes3Cbc           "http://www.w3.org/2001/04/xmlenc#tripledes-cbc" 
-
-#define OXS_NameKWDes3            "kw-tripledes" 
-#define OXS_HrefKWDes3            "http://www.w3.org/2001/04/xmlenc#kw-tripledes" 
-
-
-
-/**DSA strings ********************************/
-#define OXS_NameDSAKeyValue          "dsa" 
-#define OXS_NodeDSAKeyValue          "DSAKeyValue" 
-#define OXS_HrefDSAKeyValue          "http://www.w3.org/2000/09/xmldsig#DSAKeyValue" 
-
-#define OXS_NameDsaSha1          "dsa-sha1" 
-#define OXS_HrefDsaSha1          "http://www.w3.org/2000/09/xmldsig#dsa-sha1" 
-
-/*************************************************************************
- *
- * EncryptedKey
- *
- ************************************************************************/
-#define OXS_NameEncryptedKey         "enc-key" 
-#define OXS_NodeEncryptedKey         "EncryptedKey" 
-#define OXS_HrefEncryptedKey         "http://www.w3.org/2001/04/xmlenc#EncryptedKey" 
-
-
-/*KeyName strings*********************************************************/
-#define OXS_NameKeyName          "key-name" 
-#define OXS_NodeKeyName          "KeyName" 
-
-
-/* KeyValue strings*******************************************************/
-#define OXS_NameKeyValue         "key-value" 
-#define OXS_NodeKeyValue         "KeyValue" 
-
-
-/* MD5 strings************************************************************/
-#define OXS_NameMd5              "md5" 
-#define OXS_HrefMd5              "http://www.w3.org/2001/04/xmldsig-more#md5" 
-
-/* RetrievalMethod********************************************************/
-#define OXS_NameRetrievalMethod      "retrieval-method" 
-#define OXS_NodeRetrievalMethod      "RetrievalMethod" 
-
-/* RSA strings************************************************************/
-#define OXS_NameRSAKeyValue          "rsa" 
-#define OXS_NodeRSAKeyValue          "RSAKeyValue" 
-#define OXS_HrefRSAKeyValue          "http://www.w3.org/2000/09/xmldsig#RSAKeyValue" 
-
-#define OXS_NameRsaMd5           "rsa-md5" 
-#define OXS_HrefRsaMd5           "http://www.w3.org/2001/04/xmldsig-more#rsa-md5" 
-
-#define OXS_NameRsaRipemd160         "rsa-ripemd160" 
-#define OXS_HrefRsaRipemd160         "http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"

-
-#define OXS_NameRsaSha1          "rsa-sha1" 
-#define OXS_HrefRsaSha1          "http://www.w3.org/2000/09/xmldsig#rsa-sha1" 
-
-#define OXS_NameRsaSha224        "rsa-sha224" 
-#define OXS_HrefRsaSha224        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" 
-
-#define OXS_NameRsaSha256        "rsa-sha256" 
-#define OXS_HrefRsaSha256        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" 
-
-#define OXS_NameRsaSha384        "rsa-sha384" 
-#define OXS_HrefRsaSha384        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" 
-
-#define OXS_NameRsaSha512        "rsa-sha512" 
-#define OXS_HrefRsaSha512        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" 
-
-#define OXS_NameRsaPkcs1         "rsa-1_5" 
-#define OXS_HrefRsaPkcs1         "http://www.w3.org/2001/04/xmlenc#rsa-1_5" 
-
-#define OXS_NameRsaOaep          "rsa-oaep-mgf1p" 
-#define OXS_HrefRsaOaep          "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" 
-#define OXS_NodeRsaOAEPparams        "OAEPparams" 
-
-
-/* SHA1 strings **********************************************************/
-#define OXS_NameSha1             "sha1" 
-#define OXS_HrefSha1             "http://www.w3.org/2000/09/xmldsig#sha1" 
-
-#define OXS_NameSha224           "sha224" 
-#define OXS_HrefSha224           "http://www.w3.org/2001/04/xmldsig-more#sha224" 
-
-#define OXS_NameSha256           "sha256" 
-#define OXS_HrefSha256           "http://www.w3.org/2001/04/xmlenc#sha256" 
-
-#define OXS_NameSha384           "sha384" 
-#define OXS_HrefSha384           "http://www.w3.org/2001/04/xmldsig-more#sha384" 
-
-#define OXS_NameSha512           "sha512" 
-#define OXS_HrefSha512           "http://www.w3.org/2001/04/xmlenc#sha512" 
-
-/* X509 strings**********************************************************/
-#define OXS_NameX509Data         "x509" 
-#define OXS_NodeX509Data         "X509Data" 
-#define OXS_HrefX509Data         "http://www.w3.org/2000/09/xmldsig#X509Data" 
-
-#define OXS_NodeX509Certificate      "X509Certificate" 
-#define OXS_NodeX509CRL          "X509CRL" 
-#define OXS_NodeX509SubjectName      "X509SubjectName" 
-#define OXS_NodeX509IssuerSerial     "X509IssuerSerial" 
-#define OXS_NodeX509IssuerName       "X509IssuerName" 
-#define OXS_NodeX509SerialNumber     "X509SerialNumber" 
-#define OXS_NodeX509SKI          "X509SKI" 
-
-#define OXS_NameRawX509Cert          "raw-x509-cert" 
-#define OXS_HrefRawX509Cert          "http://www.w3.org/2000/09/xmldsig#rawX509Certificate"

-
-#define OXS_NameX509Store        "x509-store" 
-
-/* SOAP 1.1/1.2 strings*****************************************************/
-#define OXS_NodeEnvelope         "Envelope" 
-#define OXS_NodeHeader           "Header" 
-#define OXS_NodeBody                 "Body" 
-#define OXS_NodeFault                "Fault" 
-#define OXS_NodeFaultCode        "faultcode" 
-#define OXS_NodeFaultString              "faultstring" 
-#define OXS_NodeFaultActor               "faultactor" 
-#define OXS_NodeFaultDetail              "detail" 
-#define OXS_NodeCode             "Code" 
-#define OXS_NodeReason           "Reason" 
-#define OXS_NodeNode             "Node" 
-#define OXS_NodeRole             "Role" 
-#define OXS_NodeDetail           "Detail" 
-#define OXS_NodeValue            "Value" 
-#define OXS_NodeSubcode          "Subcode" 
-#define OXS_NodeText             "Text" 
-
-
-#define OXS_SoapFaultCodeVersionMismatch     "VersionMismatch" 
-#define OXS_SoapFaultCodeMustUnderstand      "MustUnderstand" 
-#define OXS_SoapFaultCodeClient          "Client" 
-#define OXS_SoapFaultCodeServer          "Server" 
-#define OXS_SoapFaultCodeReceiver        "Receiver" 
-#define OXS_SoapFaultCodeSender          "Sender" 
-#define OXS_SoapFaultDataEncodningUnknown    "DataEncodingUnknown" 
+/****************************************************************
+   Global namespaces 
+****************************************************************/
+#define OXS_DSIG_NS                "http://www.w3.org/2000/09/xmldsig#"
+#define OXS_ENC_NS                 "http://www.w3.org/2001/04/xmlenc#"
+#define OXS_WSSE_NS                "http://schemas.xmlsoap.org/ws/2002/04/secext"
+
+/****************************************************************
+    DSig Nodes  
+****************************************************************/
+#define OXS_NODE_SIGNATURE         "Signature" 
+#define OXS_NODE_SIGNEDINFO        "SignedInfo" 
+#define OXS_NODE_CANONICALIZATION_METHOD "CanonicalizationMethod" 
+#define OXS_NODE_SIGNATURE_METHOD    "SignatureMethod" 
+#define OXS_NODE_SIGNATURE_VALUE     "SignatureValue" 
+#define OXS_NODE_DIGEST_METHOD       "DigestMethod" 
+#define OXS_NODE_DIGEST_VALUE        "DigestValue" 
+#define OXS_NODE_OBJECT             "Object" 
+#define OXS_NODE_MANIFEST           "Manifest" 
+#define OXS_NODE_SIGNATUREPROPERTIES "SignatureProperties" 
+
+/****************************************************************
+   Encryption Nodes 
+****************************************************************/
+#define OXS_NODE_ENCRYPTED_DATA             "EncryptedData" 
+#define OXS_NODE_ENCRYPTION_METHOD          "EncryptionMethod" 
+#define OXS_NODE_ENCRYPTION_PROPERTIES      "EncryptionProperties"
+#define OXS_NODE_ENCRYPTION_PROPERTY        "EncryptionProperty"
+#define OXS_NODE_CIPHER_DATA                "CipherData"
+#define OXS_NODE_CIPHER_VALUE               "CipherValue"
+#define OXS_NODE_CIPHER_REFERENCE           "CipherReference"
+#define OXS_NODE_REFERENCE_LIST             "ReferenceList"
+#define OXS_NODE_DATA_REFERENCE             "DataReference"
+#define OXS_NODE_KEY_REFERENCE              "KeyReference"
+#define OXS_NODE_CARRIED_KEYNAME            "CarriedKeyName"
+#define OXS_TYPE_ENC_CONTENT                "http://www.w3.org/2001/04/xmlenc#Content"
+#define OXS_TYPE_ENC_ELEMENT                "http://www.w3.org/2001/04/xmlenc#Element"
+
+/****************************************************************
+   KeyInfo Nodes
+****************************************************************/
+#define OXS_NODE_KEY_INFO               "KeyInfo" 
+#define OXS_NODE_REFERENCE             "Reference" 
+#define OXS_NODE_TRANSFORMS            "Transforms" 
+#define OXS_NODE_TRANSFORM             "Transform" 
+
+/****************************************************************
+    KeyInfo Nodes
+****************************************************************/
+#define OXS_NODE_BINARY_SECURITY_TOKEN     "BinarySecurityToken"
+
+
+/****************************************************************
+    Attributes
+****************************************************************/
+#define OXS_ATTR_ID            "Id"
+#define OXS_ATTR_URI           "URI"
+#define OXS_ATTR_TYPE          "Type"
+#define OXS_ATTR_MIMETYPE      "MimeType"
+#define OXS_ATTR_ENCODING      "Encoding"
+#define OXS_ATTR_ALGORITHM     "Algorithm"
+#define OXS_ATTR_FILTER        "Filter"
+#define OXS_ATTR_RECIPIENT     "Recipient"
+#define OXS_ATTR_TARGET        "Target"
+#define OXS_ATTR_ENCODING_TYPE  "EncodingType"
+#define OXS_ATTR_VALUE_TYPE     "ValueType"
+
+
+/****************************************************************
+   AES 
+****************************************************************/
+#define OXS_NAME_AES_KEY_VALUE          "aes" 
+#define OXS_NODE_AES_KEY_VALUE          "AESKeyValue" 
+#define OXS_HREF_AES_KEY_VALUE          "http://www.aleksey.com/xmlsec/2002#AESKeyValue"

+
+#define OXS_NAME_AES_128_CBC        "aes128-cbc" 
+#define OXS_HREF_AES_128_CBC        "http://www.w3.org/2001/04/xmlenc#aes128-cbc" 
+
+#define OXS_NAME_AES_192_CBC        "aes192-cbc" 
+#define OXS_HREF_AES_192_CBC        "http://www.w3.org/2001/04/xmlenc#aes192-cbc" 
+
+#define OXS_NAME_AES_256_CBC        "aes256-cbc" 
+#define OXS_HREF_AES_256_CBC        "http://www.w3.org/2001/04/xmlenc#aes256-cbc" 
+
+#define OXS_NAME_KW_AES_128         "kw-aes128" 
+#define OXS_HREF_KW_AES_128         "http://www.w3.org/2001/04/xmlenc#kw-aes128" 
+
+#define OXS_NAME_KW_AES_192         "kw-aes192" 
+#define OXS_HREF_KW_AES_192         "http://www.w3.org/2001/04/xmlenc#kw-aes192" 
+
+#define OXS_NAME_KW_AES_256         "kw-aes256" 
+#define OXS_HREF_KW_AES_256         "http://www.w3.org/2001/04/xmlenc#kw-aes256" 
+
+/****************************************************************
+  BASE64 
+****************************************************************/
+#define OXS_NAME_BASE64           "base64" 
+#define OXS_HREF_BASE64           "http://www.w3.org/2000/09/xmldsig#base64" 
+
+
+/****************************************************************
+ DES 
+****************************************************************/
+#define OXS_NAME_DES_KEY_VALUE       "des" 
+#define OXS_NODE_DES_KEY_VALUE       "DESKeyValue" 
+#define OXS_HREF_DES_KEY_VALUE       "http://www.aleksey.com/xmlsec/2002#DESKeyValue" 
+
+#define OXS_NAME_DES3_CBC           "tripledes-cbc" 
+#define OXS_HREF_DES3_CBC           "http://www.w3.org/2001/04/xmlenc#tripledes-cbc" 
+
+#define OXS_NAME_KW_DES3            "kw-tripledes" 
+#define OXS_HREF_KW_DES3            "http://www.w3.org/2001/04/xmlenc#kw-tripledes" 
+
+
+
+/****************************************************************
+    DSA 
+****************************************************************/
+#define OXS_NAME_DSA_KEY_VALUE          "dsa" 
+#define OXS_NODE_DSA_KEY_VALUE          "DSAKeyValue" 
+#define OXS_HREF_DSA_KEY_VALUE          "http://www.w3.org/2000/09/xmldsig#DSAKeyValue" 
+
+#define OXS_NAME_DSA_SHA1          "dsa-sha1" 
+#define OXS_HREF_DSA_SHA1          "http://www.w3.org/2000/09/xmldsig#dsa-sha1" 
+
+/****************************************************************
+   EncryptedKey
+****************************************************************/
+#define OXS_NAME_ENCRYPTED_KEY         "enc-key" 
+#define OXS_NODE_ENCRYPTED_KEY         "EncryptedKey" 
+#define OXS_HREF_ENCRYPTED_KEY         "http://www.w3.org/2001/04/xmlenc#EncryptedKey" 
+
+
+/****************************************************************
+    KeyNAME
+****************************************************************/
+#define OXS_NAME_KEY_NAME          "key-name" 
+#define OXS_NODE_KEY_NAME          "KeyName" 
+
+
+/****************************************************************
+    KeyValue 
+****************************************************************/
+#define OXS_NAME_KEY_VALUE         "key-value" 
+#define OXS_NODE_KEY_VALUE         "KeyValue" 
+
+
+/****************************************************************
+    MD5 
+****************************************************************/
+#define OXS_NAME_MD5              "md5" 
+#define OXS_HREF_MD5              "http://www.w3.org/2001/04/xmldsig-more#md5" 
+
+/****************************************************************
+    RetrievalMethod
+****************************************************************/
+#define OXS_NAME_RETRIEVAL_METHOD      "retrieval-method" 
+#define OXS_NODE_RETRIEVAL_METHOD      "RetrievalMethod" 
+
+/****************************************************************
+    RSA 
+****************************************************************/
+#define OXS_NAME_RSAKEY_VALUE          "rsa" 
+#define OXS_NODE_RSAKEY_VALUE          "RSAKeyValue" 
+#define OXS_HREF_RSAKEY_VALUE          "http://www.w3.org/2000/09/xmldsig#RSAKeyValue" 
+
+#define OXS_NAME_RSA_MD5           "rsa-md5" 
+#define OXS_HREF_RSA_MD5           "http://www.w3.org/2001/04/xmldsig-more#rsa-md5" 
+
+#define OXS_NAME_RSA_RIPEMD160         "rsa-ripemd160" 
+#define OXS_HREF_RSA_RIPEMD160         "http://www.w3.org/2001/04/xmldsig-more#rsa-ripemd160"

+
+#define OXS_NAME_RSA_SHA1          "rsa-sha1" 
+#define OXS_HREF_RSA_SHA1          "http://www.w3.org/2000/09/xmldsig#rsa-sha1" 
+
+#define OXS_NAME_RSA_SHA224        "rsa-sha224" 
+#define OXS_HREF_RSA_SHA224        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha224" 
+
+#define OXS_NAME_RSA_SHA256        "rsa-sha256" 
+#define OXS_HREF_RSA_SHA256        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha256" 
+
+#define OXS_NAME_RSA_SHA384        "rsa-sha384" 
+#define OXS_HREF_RSA_SHA384        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha384" 
+
+#define OXS_NAME_RSA_SHA512        "rsa-sha512" 
+#define OXS_HREF_RSA_SHA512        "http://www.w3.org/2001/04/xmldsig-more#rsa-sha512" 
+
+#define OXS_NAME_RSA_PKCS1         "rsa-1_5" 
+#define OXS_HREF_RSA_PKCS1         "http://www.w3.org/2001/04/xmlenc#rsa-1_5" 
+
+#define OXS_NAME_RSA_OAEP          "rsa-oaep-mgf1p" 
+#define OXS_HREF_RSA_OAEP          "http://www.w3.org/2001/04/xmlenc#rsa-oaep-mgf1p" 
+#define OXS_NODE_RSA_OAEP_PARAMS        "OAEPparams" 
+
+
+/****************************************************************
+    SHA1 
+****************************************************************/
+#define OXS_NAME_SHA1             "sha1" 
+#define OXS_HREF_SHA1             "http://www.w3.org/2000/09/xmldsig#sha1" 
+
+#define OXS_NAME_SHA224           "sha224" 
+#define OXS_HREF_SHA224           "http://www.w3.org/2001/04/xmldsig-more#sha224" 
+
+#define OXS_NAME_SHA256           "sha256" 
+#define OXS_HREF_SHA256           "http://www.w3.org/2001/04/xmlenc#sha256" 
+
+#define OXS_NAME_SHA384           "sha384" 
+#define OXS_HREF_SHA384           "http://www.w3.org/2001/04/xmldsig-more#sha384" 
+
+#define OXS_NAME_SHA512           "sha512" 
+#define OXS_HREF_SHA512           "http://www.w3.org/2001/04/xmlenc#sha512" 
+
+/****************************************************************
+    X509 
+****************************************************************/
+#define OXS_NAME_X509_DATA         "x509" 
+#define OXS_NODE_X509_DATA         "X509Data" 
+#define OXS_HREF_X509_DATA         "http://www.w3.org/2000/09/xmldsig#X509Data" 
+
+#define OXS_NODE_X509_CERTIFICATE      "X509Certificate" 
+#define OXS_NODE_X509_CRL          "X509CRL" 
+#define OXS_NODE_X509_SUBJECT_NAME      "X509SubjectName" 
+#define OXS_NODE_X509_ISSUER_SERIAL     "X509IssuerSerial" 
+#define OXS_NODE_X509_ISSUER_NAME       "X509IssuerName" 
+#define OXS_NODE_X509_SERIAL_NUMBER     "X509SerialNumber" 
+#define OXS_NODE_X509_SKI          "X509SKI" 
+
+#define OXS_NAME_RAW_X509_CERT          "raw-x509-cert" 
+#define OXS_HREF_RAW_X509_CERT          "http://www.w3.org/2000/09/xmldsig#rawX509Certificate"

+
+#define OXS_NAME_X509_STORE        "x509-store" 
+
+/****************************************************************
+    SOAP 1.1/1.2
+****************************************************************/
+#define OXS_NODE_ENVELOPE         "Envelope" 
+#define OXS_NODE_HEADER           "Header" 
+#define OXS_NODE_BODY                 "Body" 
+#define OXS_NODE_FAULT                "Fault" 
+#define OXS_NODE_FAULT_CODE        "faultcode" 
+#define OXS_NODE_FAULT_STRING              "faultstring" 
+#define OXS_NODE_FAULT_ACTOR               "faultactor" 
+#define OXS_NODE_FAULT_DETAIL              "detail" 
+#define OXS_NODE_CODE             "Code" 
+#define OXS_NODE_REASON           "Reason" 
+#define OXS_NODE_NODE             "Node" 
+#define OXS_NODE_ROLE             "Role" 
+#define OXS_NODE_DETAIL           "Detail" 
+#define OXS_NODE_VALUE            "Value" 
+#define OXS_NODE_SUBCODE          "Subcode" 
+#define OXS_NODE_TEXT             "Text" 
+
+
+#define OXS_SOAP_FAULT_CODE_VERSION_MISMATCH     "VersionMismatch" 
+#define OXS_SOAP_FAULT_CODE_MUST_UNDERSTAND      "MustUnderstand" 
+#define OXS_SOAP_FAULT_CODE_CLIENT          "Client" 
+#define OXS_SOAP_FAULT_CODE_SERVER          "Server" 
+#define OXS_SOAP_FAULT_CODE_RECEIVER        "Receiver" 
+#define OXS_SOAP_FAULT_CODE_SENDER          "Sender" 
+#define OXS_SOAP_FAULT_DATA_ENCODNING_UNKNOWN    "DataEncodingUnknown" 
 
 
 /*************************************************************************/

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/Makefile.am Mon Nov 13 20:46:11 2006
@@ -1,7 +1,7 @@
 SUBDIRS = openssl
 noinst_LTLIBRARIES = libomxmlsec.la
 
-libomxmlsec_la_SOURCES = ctx.c  enc_engine.c buffer.c key.c cipher.c error.c axis2_utils.c
axiom.c \
+libomxmlsec_la_SOURCES = ctx.c  buffer.c key.c cipher.c error.c axis2_utils.c axiom.c \
                         token_encrypted_data.c token_encryption_method.c token_cipher_value.c
\
                         token_cipher_data.c token_key_name.c token_key_info.c token_binary_security_token.c
\
                         token_reference_list.c token_data_reference.c token_encrypted_key.c
iv.c xml_encryption.c encryption.c\

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c Mon Nov 13 20:46:11 2006
@@ -51,22 +51,22 @@
 
     axis2_char_t *cipher_name = NULL;
 
-    if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HrefDes3Cbc))
+    if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_DES3_CBC))
     {
         cipher_name = OPENSSL_EVP_des_ede3_cbc;
 
     }
-    else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HrefAes128Cbc))
+    else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_AES_128_CBC))
     {
         cipher_name = OPENSSL_EVP_aes_128_cbc;
 
     }
-    else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HrefAes192Cbc))
+    else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_AES_192_CBC))
     {
         cipher_name = OPENSSL_EVP_aes_192_cbc;
 
     }
-    else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HrefAes256Cbc))
+    else if (0 == AXIS2_STRCMP(url, (axis2_char_t*)OXS_HREF_AES_256_CBC))
     {
         cipher_name = OPENSSL_EVP_aes_256_cbc;
 
@@ -90,22 +90,22 @@
 
     if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_des_ede3_cbc))
     {
-        cipher_url = OXS_HrefDes3Cbc;
+        cipher_url = OXS_HREF_DES3_CBC;
 
     }
     else if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_aes_128_cbc))
     {
-        cipher_url = OXS_HrefAes128Cbc;
+        cipher_url = OXS_HREF_AES_128_CBC;
 
     }
     else if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_aes_192_cbc))
     {
-        cipher_url = OXS_HrefAes192Cbc;
+        cipher_url = OXS_HREF_AES_192_CBC;
 
     }
     else if (0 == AXIS2_STRCMP(name, (axis2_char_t*)OPENSSL_EVP_aes_256_cbc))
     {
-        cipher_url = OXS_HrefAes256Cbc;
+        cipher_url = OXS_HREF_AES_256_CBC;
 
     }
     else

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_binary_security_token.c Mon Nov 13
20:46:11 2006
@@ -38,10 +38,10 @@
     int ret;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_WSSENS,
+    ns_obj = axiom_namespace_create(env, OXS_WSSE_NS,
             OXS_WSSE);
 
-    binary_security_token_ele = axiom_element_create(env, parent, OXS_NodeBinarySecurityToken,
ns_obj, &binary_security_token_node);
+    binary_security_token_ele = axiom_element_create(env, parent, OXS_NODE_BINARY_SECURITY_TOKEN,
ns_obj, &binary_security_token_node);
     if (!binary_security_token_ele)
     {
         oxs_error(ERROR_LOCATION,
@@ -49,9 +49,9 @@
         return NULL;
     }
 
-    id_attr = axiom_attribute_create(env, OXS_AttrId, id, NULL);
-    encoding_type_att =  axiom_attribute_create(env, OXS_AttrEncodingType, encoding_type,
NULL);
-    value_type_att =  axiom_attribute_create(env, OXS_AttrValueType, value_type, NULL);
+    id_attr = axiom_attribute_create(env, OXS_ATTR_ID, id, NULL);
+    encoding_type_att =  axiom_attribute_create(env, OXS_ATTR_ENCODING_TYPE, encoding_type,
NULL);
+    value_type_att =  axiom_attribute_create(env, OXS_ATTR_VALUE_TYPE, value_type, NULL);
 
     ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(binary_security_token_ele, env, id_attr, binary_security_token_node);
     ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(binary_security_token_ele, env, encoding_type_att,
binary_security_token_node);

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_data.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_data.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_data.c Mon Nov 13 20:46:11
2006
@@ -30,10 +30,10 @@
     axiom_element_t *cipher_data_ele = NULL;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
-            OXS_xenc);
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
+            OXS_XENC);
 
-    cipher_data_ele = axiom_element_create(env, parent, OXS_NodeCipherData, ns_obj, &cipher_data_node);
+    cipher_data_ele = axiom_element_create(env, parent, OXS_NODE_CIPHER_DATA, ns_obj, &cipher_data_node);
     if (!cipher_data_ele)
     {
         oxs_error(ERROR_LOCATION,

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c Mon Nov 13 20:46:11
2006
@@ -44,11 +44,10 @@
     axis2_status_t ret;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
-            OXS_xenc);
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
+            OXS_XENC);
 
-
-    cipher_value_ele = axiom_element_create(env, parent, OXS_NodeCipherValue, ns_obj, &cipher_value_node);
+    cipher_value_ele = axiom_element_create(env, parent, OXS_NODE_CIPHER_VALUE, ns_obj, &cipher_value_node);
     if (!cipher_value_ele)
     {
         oxs_error(ERROR_LOCATION,

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_data_reference.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_data_reference.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_data_reference.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_data_reference.c Mon Nov 13 20:46:11
2006
@@ -33,10 +33,10 @@
     int ret;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
-            OXS_xenc);
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
+            OXS_XENC);
 
-    data_reference_ele = axiom_element_create(env, parent, OXS_NodeDataReference, ns_obj,
&data_reference_node);
+    data_reference_ele = axiom_element_create(env, parent, OXS_NODE_DATA_REFERENCE, ns_obj,
&data_reference_node);
     if (!data_reference_ele)
     {
         oxs_error(ERROR_LOCATION,
@@ -49,7 +49,7 @@
         data_ref = "";
     }
 
-    data_ref_attr =  axiom_attribute_create(env, OXS_AttrURI , data_ref, NULL);
+    data_ref_attr =  axiom_attribute_create(env, OXS_ATTR_URI , data_ref, NULL);
 
     ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(data_reference_ele, env, data_ref_attr, data_reference_node);
 
@@ -70,7 +70,7 @@
         return NULL;
     }
 
-    data_ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(data_reference_ele, env, OXS_AttrURI);
+    data_ref = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(data_reference_ele, env, OXS_ATTR_URI);
     return data_ref;
 
 }

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_data.c Mon Nov 13 20:46:11
2006
@@ -37,10 +37,10 @@
     axiom_namespace_t *ns_obj = NULL;
     int ret;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
-            OXS_xenc);
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
+            OXS_XENC);
 
-    encrypted_data_ele = axiom_element_create(env, parent, OXS_NodeEncryptedData, ns_obj,
&encrypted_data_node);
+    encrypted_data_ele = axiom_element_create(env, parent, OXS_NODE_ENCRYPTED_DATA, ns_obj,
&encrypted_data_node);
     if (!encrypted_data_ele)
     {
         oxs_error(ERROR_LOCATION,
@@ -50,19 +50,19 @@
 
     if (type_attribute)
     {
-        type_attr =  axiom_attribute_create(env, OXS_AttrType, type_attribute, NULL);
+        type_attr =  axiom_attribute_create(env, OXS_ATTR_TYPE, type_attribute, NULL);
         ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encrypted_data_ele, env, type_attr, encrypted_data_node);
     }
 
     if (id)
     {
-        id_attr = axiom_attribute_create(env, OXS_AttrId, id, NULL);
+        id_attr = axiom_attribute_create(env, OXS_ATTR_ID, id, NULL);
         ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encrypted_data_ele, env, id_attr, encrypted_data_node);
     }
     else
     {
         /*TODO Get a unique value for this*/
-        id_attr = axiom_attribute_create(env, OXS_AttrId, "EncDataId-54321", NULL);
+        id_attr = axiom_attribute_create(env, OXS_ATTR_ID, "EncDataId-54321", NULL);
         ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encrypted_data_ele, env, id_attr, encrypted_data_node);
     }
 

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_key.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_key.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_key.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_key.c Mon Nov 13 20:46:11
2006
@@ -31,10 +31,10 @@
     axiom_element_t *encrypted_key_ele = NULL;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
-            OXS_xenc);
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
+            OXS_XENC);
 
-    encrypted_key_ele = axiom_element_create(env, parent, OXS_NodeEncryptedKey, ns_obj, &encrypted_key_node);
+    encrypted_key_ele = axiom_element_create(env, parent, OXS_NODE_ENCRYPTED_KEY, ns_obj,
&encrypted_key_node);
     if (!encrypted_key_ele)
     {
         oxs_error(ERROR_LOCATION,

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encrypted_type.c Mon Nov 13 20:46:11
2006
@@ -38,7 +38,7 @@
     int ret;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
             OXS_xenc);
 
     encrypted_type_ele = axiom_element_create(env, parent, encrypted_type, ns_obj, &encrypted_type_node);

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encryption_method.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encryption_method.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encryption_method.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_encryption_method.c Mon Nov 13 20:46:11
2006
@@ -34,10 +34,10 @@
     int ret;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
-            OXS_xenc);
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
+            OXS_XENC);
 
-    encryption_method_ele = axiom_element_create(env, parent, OXS_NodeEncryptionMethod, ns_obj,
&encryption_method_node);
+    encryption_method_ele = axiom_element_create(env, parent, OXS_NODE_ENCRYPTION_METHOD,
ns_obj, &encryption_method_node);
     if (!encryption_method_ele)
     {
         oxs_error(ERROR_LOCATION,
@@ -50,7 +50,7 @@
         algorithm = (axis2_char_t*)OXS_DEFAULT_KT_ALGO_HREF;
     }
 
-    algo_attr =  axiom_attribute_create(env, OXS_AttrAlgorithm, algorithm, NULL);
+    algo_attr =  axiom_attribute_create(env, OXS_ATTR_ALGORITHM, algorithm, NULL);
 
     ret = AXIOM_ELEMENT_ADD_ATTRIBUTE(encryption_method_ele, env, algo_attr, encryption_method_node);
 
@@ -74,7 +74,7 @@
         return NULL;
     }
 
-    enc_mtd = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(enc_mtd_ele, env, OXS_AttrAlgorithm);
+    enc_mtd = AXIOM_ELEMENT_GET_ATTRIBUTE_VALUE_BY_NAME(enc_mtd_ele, env, OXS_ATTR_ALGORITHM);
     return enc_mtd;
 
 }

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_info.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_info.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_info.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_info.c Mon Nov 13 20:46:11 2006
@@ -30,11 +30,11 @@
     axiom_element_t *key_info_ele = NULL;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_DSigNs,
-            OXS_ds);
+    ns_obj = axiom_namespace_create(env, OXS_DSIG_NS,
+            OXS_DS);
 
 
-    key_info_ele = axiom_element_create(env, parent, OXS_NodeKeyInfo, ns_obj, &key_info_node);
+    key_info_ele = axiom_element_create(env, parent, OXS_NODE_KEY_INFO, ns_obj, &key_info_node);
     if (!key_info_ele)
     {
         oxs_error(ERROR_LOCATION,

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_name.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_name.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_name.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_key_name.c Mon Nov 13 20:46:11 2006
@@ -32,11 +32,11 @@
     axis2_status_t ret;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_DSigNs,
-            OXS_ds);
+    ns_obj = axiom_namespace_create(env, OXS_DSIG_NS,
+            OXS_DS);
 
 
-    key_name_ele = axiom_element_create(env, parent, OXS_NodeKeyName, ns_obj, &key_name_node);
+    key_name_ele = axiom_element_create(env, parent, OXS_NODE_KEY_NAME, ns_obj, &key_name_node);
     if (!key_name_ele)
     {
         oxs_error(ERROR_LOCATION,

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/token_reference_list.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/token_reference_list.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_reference_list.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_reference_list.c Mon Nov 13 20:46:11
2006
@@ -31,11 +31,11 @@
     axiom_element_t *reference_list_ele = NULL;
     axiom_namespace_t *ns_obj = NULL;
 
-    ns_obj = axiom_namespace_create(env, OXS_EncNs,
-            OXS_xenc);
+    ns_obj = axiom_namespace_create(env, OXS_ENC_NS,
+            OXS_XENC);
 
 
-    reference_list_ele = axiom_element_create(env, parent, OXS_NodeReferenceList, ns_obj,
&reference_list_node);
+    reference_list_ele = axiom_element_create(env, parent, OXS_NODE_REFERENCE_LIST, ns_obj,
&reference_list_node);
     if (!reference_list_ele)
     {
         oxs_error(ERROR_LOCATION,
@@ -63,7 +63,7 @@
     ref_list_ele = AXIOM_NODE_GET_DATA_ELEMENT(ref_list_node, env);
 
     /*Get children*/
-    qname = axis2_qname_create(env, OXS_NodeDataReference, NULL, NULL);
+    qname = axis2_qname_create(env, OXS_NODE_DATA_REFERENCE, NULL, NULL);
     iter = AXIOM_ELEMENT_GET_CHILDREN_WITH_QNAME(ref_list_ele, env, qname, ref_list_node);
     AXIS2_QNAME_FREE(qname, env);
     qname = NULL;

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_encryption.c Mon Nov 13 20:46:11 2006
@@ -158,12 +158,12 @@
     oxs_buffer_t *input_buf = NULL;
 
     /*Get the symmetric encryption algorithm*/
-    enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NodeEncryptionMethod,
NULL, NULL);
+    enc_mtd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NODE_ENCRYPTION_METHOD,
NULL, NULL);
     sym_algo = oxs_token_get_encryption_method(env, enc_mtd_node);
 
     /*Get ID, Type, MimeType attributes from the EncryptedDataNode*/
-    id = oxs_axiom_get_attribute_value_of_node_by_name(env, enc_type_node, OXS_AttrId);
-    type = oxs_axiom_get_attribute_value_of_node_by_name(env, enc_type_node, OXS_AttrType);
+    id = oxs_axiom_get_attribute_value_of_node_by_name(env, enc_type_node, OXS_ATTR_ID);
+    type = oxs_axiom_get_attribute_value_of_node_by_name(env, enc_type_node, OXS_ATTR_TYPE);
 
     /*Populate the context for future use*/
     OXS_CTX_SET_ENC_MTD_ALGORITHM(enc_ctx, env, sym_algo);
@@ -171,8 +171,8 @@
     OXS_CTX_SET_TYPE(enc_ctx, env, type);
     
     /*Get the cipher value*/
-    cd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NodeCipherData,
NULL, NULL);
-    cv_node = oxs_axiom_get_first_child_node_by_name(env, cd_node, OXS_NodeCipherValue, NULL,
NULL);
+    cd_node = oxs_axiom_get_first_child_node_by_name(env, enc_type_node, OXS_NODE_CIPHER_DATA,
NULL, NULL);
+    cv_node = oxs_axiom_get_first_child_node_by_name(env, cd_node, OXS_NODE_CIPHER_VALUE,
NULL, NULL);
     cipher_val = oxs_token_get_cipher_value(env, cv_node); 
     
     /*Create input buffer with cipher data obtained*/

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c Mon Nov 13 20:46:11 2006
@@ -101,7 +101,7 @@
         /*Create an empty EncryptedDataNode*/
         parent_of_node_to_enc = AXIOM_NODE_GET_PARENT(node_to_enc, env);
         id = oxs_util_generate_id(env,(axis2_char_t*)OXS_ENCDATA_ID);
-        enc_data_node = oxs_token_build_encrypted_data_element(env, parent_of_node_to_enc,
OXS_TypeEncElement, id );
+        enc_data_node = oxs_token_build_encrypted_data_element(env, parent_of_node_to_enc,
OXS_TYPE_ENC_ELEMENT, id );
         enc_status = oxs_xml_enc_encrypt_node(env, enc_ctx, node_to_enc, enc_data_node);
         AXIS2_ARRAY_LIST_ADD(id_list, env, id);
         if(AXIS2_FAILURE == enc_status){

Modified: webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c?view=diff&rev=474652&r1=474651&r2=474652
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c Mon Nov 13 20:46:11 2006
@@ -151,14 +151,14 @@
     OXS_CTX_SET_KEY(ctx, env, key);
 
     /*Set algorithm*/
-    OXS_CTX_SET_ENC_MTD_ALGORITHM(ctx, env, OXS_HrefAes256Cbc);
+    OXS_CTX_SET_ENC_MTD_ALGORITHM(ctx, env, OXS_HREF_AES_256_CBC);
 
     /*Get the node to be encrypted*/
     enc_node = AXIOM_NODE_GET_FIRST_CHILD(tmpl, env);
 
     /*Create a reference to encrypted node*/
     id =  oxs_util_generate_id(env, OXS_ENCDATA_ID);
-    enc_data_node =  oxs_token_build_encrypted_data_element(env, tmpl, OXS_TypeEncElement,
id); 
+    enc_data_node =  oxs_token_build_encrypted_data_element(env, tmpl, OXS_TYPE_ENC_ELEMENT,
id); 
     /*Encrypt***************************************************/
 
     temp_status = oxs_xml_enc_encrypt_node(env, ctx,  enc_node, &enc_data_node);



---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org


Mime
View raw message