Modified: webservices/rampart/scratch/c/trust/c/src/trust/util.c URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/trust/c/src/trust/util.c?rev=600787&r1=600786&r2=600787&view=diff ============================================================================== --- webservices/rampart/scratch/c/trust/c/src/trust/util.c (original) +++ webservices/rampart/scratch/c/trust/c/src/trust/util.c Mon Dec 3 20:19:02 2007 @@ -20,20 +20,18 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_rst_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, + axiom_node_t *parent, axis2_char_t * context) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *rst_node = NULL; axiom_element_t *rst_ele = NULL; axiom_namespace_t *wst_ns = NULL; axiom_attribute_t *context_attr = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); - wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); - rst_ele = axiom_element_create(env, NULL, TRUST_REQUEST_SECURITY_TOKEN, wst_ns, &rst_node); + rst_ele = axiom_element_create(env, parent, TRUST_REQUEST_SECURITY_TOKEN, wst_ns, &rst_node); if (!rst_ele) { @@ -60,18 +58,15 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_rstr_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axis2_char_t * context) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *rstr_node = NULL; axiom_element_t *rstr_ele = NULL; axiom_namespace_t *wst_ns = NULL; axiom_attribute_t *context_attr = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); - wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); rstr_ele = axiom_element_create(env, NULL, TRUST_REQUEST_SECURITY_TOKEN_RESPONSE, wst_ns, &rstr_node); @@ -101,15 +96,12 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_rstr_collection_element( const axutil_env_t * env, - int wst_version) + axis2_char_t *wst_ns_uri) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *rstrc_node = NULL; axiom_element_t *rstrc_ele = NULL; axiom_namespace_t *wst_ns = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); - wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); rstrc_ele = axiom_element_create(env, NULL, TRUST_REQUEST_SECURITY_TOKEN_RESPONSE_COLLECTION, wst_ns, @@ -127,21 +119,16 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_request_type_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axis2_char_t * request_type) { - axis2_char_t *wst_ns_uri = NULL; axis2_char_t *req_type_str = NULL; axiom_node_t *request_type_node = NULL; axiom_element_t *request_type_ele = NULL; axiom_namespace_t *wst_ns = NULL; axis2_status_t status = AXIS2_SUCCESS; - AXIS2_ENV_CHECK(env, NULL); - - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); - wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); request_type_ele = axiom_element_create(env, parent_node, TRUST_REQUEST_TYPE, wst_ns, &request_type_node); @@ -178,20 +165,15 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_token_type_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axis2_char_t * token_type) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *token_type_node = NULL; axiom_element_t *token_type_ele = NULL; axiom_namespace_t *wst_ns = NULL; axis2_status_t status = AXIS2_SUCCESS; - AXIS2_ENV_CHECK(env, NULL); - - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); - wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); token_type_ele = axiom_element_create(env, parent_node, TRUST_TOKEN_TYPE, wst_ns, &token_type_node); @@ -270,19 +252,17 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_claims_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axiom_node_t * claims_content, axis2_char_t * dialect_uri) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *claims_node = NULL; axiom_element_t *claims_ele = NULL; axiom_namespace_t *wst_ns = NULL; axiom_attribute_t *dialect_attr = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); claims_ele = axiom_element_create(env, parent_node, TRUST_CLAIMS, wst_ns, &claims_node); @@ -333,15 +313,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_requested_security_token_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *requested_token_node = NULL; axiom_element_t *requested_token_ele = NULL; axiom_namespace_t *wst_ns = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); requested_token_ele = @@ -360,15 +338,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_requsted_proof_token_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node) { - axis2_char_t *wst_ns_uri = NULL; axiom_namespace_t *wst_ns = NULL; axiom_node_t *requested_prooft_node = NULL; axiom_element_t *requested_prooft_ele = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); requested_prooft_ele = @@ -387,15 +363,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_entropy_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node) { - axis2_char_t *wst_ns_uri = NULL; axiom_namespace_t *wst_ns = NULL; axiom_node_t *entropy_node = NULL; axiom_element_t *entropy_ele = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); entropy_ele = axiom_element_create(env, parent_node, TRUST_ENTROPY, wst_ns, &entropy_node); @@ -411,15 +385,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_computed_key_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node) { - axis2_char_t *wst_ns_uri = NULL; axiom_namespace_t *wst_ns = NULL; axiom_node_t *computed_key_node = NULL; axiom_element_t *computed_key_ele = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); computed_key_ele = @@ -436,12 +408,11 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_binary_secret_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axis2_char_t * enc_secret, axis2_char_t * bin_sec_type) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *bin_sec_node = NULL; axiom_element_t *bin_sec_ele = NULL; axiom_attribute_t *bin_sec_type_attr = NULL; @@ -449,7 +420,6 @@ axis2_char_t *type_str = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); bin_sec_ele = @@ -499,18 +469,16 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_computed_key_algo_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axis2_char_t * algo_id) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *comp_key_algo_node = NULL; axiom_element_t *comp_key_algo_ele = NULL; axiom_namespace_t *wst_ns = NULL; /*axis2_char_t *algo = NULL;*/ axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); if (algo_id) @@ -543,17 +511,15 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_key_size_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axis2_char_t * key_size) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *key_size_node = NULL; axiom_element_t *key_size_ele = NULL; axiom_namespace_t *wst_ns = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); key_size_ele = axiom_element_create(env, parent_node, TRUST_KEY_SIZE, wst_ns, &key_size_node); @@ -581,18 +547,16 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_key_type_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axis2_char_t * key_type) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *key_type_node = NULL; axiom_element_t *key_type_ele = NULL; axiom_namespace_t *wst_ns = NULL; axis2_char_t *type = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); key_type_ele = axiom_element_create(env, parent_node, TRUST_KEY_TYPE, wst_ns, &key_type_node); @@ -626,10 +590,9 @@ trust_util_create_life_time_element( const axutil_env_t * env, axiom_node_t * parent_node, - int wst_version, + axis2_char_t *wst_ns_uri, int ttl) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *life_time_node = NULL; axiom_node_t *created_node = NULL; axiom_node_t *expires_node = NULL; @@ -643,8 +606,7 @@ axutil_date_time_t *dt = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); - wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WSU); + wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); wsu_ns = axiom_namespace_create(env, TRUST_WSU_XMLNS, TRUST_WSU); life_time_ele = @@ -723,15 +685,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_req_attached_reference_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *attached_ref_node = NULL; axiom_element_t *attached_ref_ele = NULL; axiom_namespace_t *wst_ns = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); attached_ref_ele = @@ -750,15 +710,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_req_unattached_reference_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *unattached_ref_node = NULL; axiom_element_t *unattached_ref_ele = NULL; axiom_namespace_t *wst_ns = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); unattached_ref_ele = @@ -777,7 +735,7 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_encrypted_data_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axis2_char_t * enc_data) { @@ -811,17 +769,15 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_renew_traget_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axiom_node_t * renew_pending_node) { axiom_node_t *renew_target_node = NULL; axiom_element_t *renew_target_ele = NULL; - axis2_char_t *wst_ns_uri = NULL; axiom_namespace_t *wst_ns = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); renew_target_ele = @@ -852,15 +808,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_allow_postdating_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *allow_postdating_node = NULL; axiom_element_t *allow_postdating_ele = NULL; axiom_namespace_t *wst_ns = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); allow_postdating_ele = @@ -878,14 +832,13 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_renewing_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, trust_allow_t allow_flag, trust_ok_t ok_flag) { axiom_node_t *renewing_node = NULL; axiom_element_t *renewing_ele = NULL; - axis2_char_t *wst_ns_uri = NULL; axiom_namespace_t *wst_ns = NULL; axiom_attribute_t *allow_attr = NULL; axiom_attribute_t *ok_attr = NULL; @@ -893,7 +846,6 @@ axis2_char_t *allow = NULL; axis2_char_t *ok = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); renewing_ele = axiom_element_create(env, parent_node, TRUST_RENEWING, wst_ns, &renewing_node); @@ -921,16 +873,14 @@ AXIS2_EXTERN axiom_node_t *AXIS2_CALL trust_util_create_cancel_target_element( const axutil_env_t * env, - int wst_version, + axis2_char_t *wst_ns_uri, axiom_node_t * parent_node, axiom_node_t * token_cancel_pending_node) { axiom_node_t *cancel_target_node = NULL; axiom_element_t *cancel_target_ele = NULL; - axis2_char_t *wst_ns_uri = NULL; axiom_namespace_t *wst_ns = NULL; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); cancel_target_ele = @@ -958,11 +908,10 @@ trust_util_create_validation_response_element( const axutil_env_t * env, axiom_node_t * parent_node, - int wst_version, + axis2_char_t *wst_ns_uri, axis2_char_t * code, axis2_char_t * reason) { - axis2_char_t *wst_ns_uri = NULL; axiom_node_t *status_node = NULL; axiom_node_t *code_node = NULL; axiom_node_t *reason_node = NULL; @@ -972,7 +921,6 @@ axiom_namespace_t *wst_ns = NULL; axis2_status_t status = AXIS2_SUCCESS; - wst_ns_uri = trust_util_get_wst_ns(env, wst_version); wst_ns = axiom_namespace_create(env, wst_ns_uri, TRUST_WST); status_ele = @@ -1038,9 +986,9 @@ switch (wst_version) { case TRUST_VERSION_05_02: - return TRUST_WST_XMLNS_05_02; + return axutil_strdup(env, TRUST_WST_XMLNS_05_02); case TRUST_VERSION_05_12: - return TRUST_WST_XMLNS_05_12; + return axutil_strdup(env, TRUST_WST_XMLNS_05_12); default: return NULL; }
