New EncryptedHeader node to the token base

NEWS

@@ -63,7 +63,6 @@ Un-Implemented Architecture Features
 1. SAML support 
 2. WS-Secure conversation
 3. WS-Trust
-4. Some WS-Security 1.1 features
 
 
 We welcome your early feedback on this implementation.

include/oxs_constants.h

@@ -386,7 +386,7 @@ extern "C"
         WS Security 1.1
     ****************************************************************/
 #define OXS_WSS_11_VALUE_TYPE_ENCRYPTED_KEY "http://docs.oasis-open.org/wss/oasis-wss-soap-message-security-1.1#EncryptedKey"
-
+#define OXS_NODE_ENCRYPTED_HEADER "EncryptedHeader"
     /*************************************************************************/
 
 

include/oxs_tokens.h

@@ -322,6 +322,15 @@ extern "C"
 		axiom_node_t * parent,
 		axis2_char_t * id);
 
+    /**
+    * Creates <wss11:EncryptedHeader> element
+    */
+    AXIS2_EXTERN axiom_node_t * AXIS2_CALL
+    oxs_token_build_enc_header_element(
+		const axutil_env_t * env,
+		axiom_node_t * parent,
+		axis2_char_t * id);
+
 	/**
 	 * Creates <ds:SignatureMethod> element
 	 */

src/omxmlsec/tokens/Makefile.am

@@ -9,7 +9,8 @@ liboxstokens_la_SOURCES =  token_encrypted_data.c token_encryption_method.c toke
 						token_c14n_method.c token_signature_method.c token_digest_method.c token_digest_value.c \
 						token_transform.c token_transforms.c token_signature.c token_ds_reference.c \
 						token_x509_certificate.c token_signature_confirmation.c token_derived_key_token.c \
-						token_properties.c token_generation.c token_length.c token_nonce.c token_offset.c token_label.c
+						token_properties.c token_generation.c token_length.c token_nonce.c token_offset.c token_label.c \
+						token_encrypted_header.c
 
 
 INCLUDES = -I$(top_builddir)/include \

src/omxmlsec/tokens/token_encrypted_header.c

@@ -0,0 +1,59 @@
+/*
+ * Licensed to the Apache Software Foundation (ASF) under one or more
+ * contributor license agreements.  See the NOTICE file distributed with
+ * this work for additional information regarding copyright ownership.
+ * The ASF licenses this file to You under the Apache License, Version 2.0
+ * (the "License"); you may not use this file except in compliance with
+ * the License.  You may obtain a copy of the License at
+ *
+ *      http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#include <stdio.h>
+#include <oxs_constants.h>
+#include <oxs_error.h>
+#include <oxs_tokens.h>
+#include <axiom_attribute.h>
+#include <axiom_element.h>
+
+
+
+AXIS2_EXTERN axiom_node_t* AXIS2_CALL
+oxs_token_build_enc_header_element(const axutil_env_t *env,
+                                  axiom_node_t *parent,
+                                  axis2_char_t* id)
+{
+    axiom_node_t *enc_header_node = NULL;
+    axiom_element_t *enc_header_ele = NULL;
+    axiom_attribute_t *id_attr = NULL;
+    axiom_namespace_t *ns_obj = NULL;
+    int ret;
+
+    ns_obj = axiom_namespace_create(env, OXS_WSSE_11_XMLNS,
+                                    OXS_WSSE_11);
+
+    enc_header_ele = axiom_element_create(env, parent, OXS_NODE_SIGNATURE, ns_obj, &enc_header_node);
+    if (!enc_header_ele)
+    {
+        oxs_error(env, ERROR_LOCATION,
+                  OXS_ERROR_ELEMENT_FAILED, "Error creating wss11:EncryptedHeader element");
+        return NULL;
+    }
+
+    /*If id is not NULL then add it as an attribute*/
+    if (id)
+    {
+        id_attr = axiom_attribute_create(env, OXS_ATTR_ID, id, NULL);
+        ret = axiom_element_add_attribute(enc_header_ele, env, id_attr, enc_header_node);
+    }
+
+    return enc_header_node;
+
+}
+

src/util/rampart_handler_util.c

@@ -135,8 +135,9 @@ rampart_get_security_token(const axutil_env_t *env,
         {
             /*Set mustUnderstand = 0*/
             axiom_soap_header_block_set_must_understand_with_bool(header_block, env, AXIS2_FALSE);
-            if (env)
+            if (env){
                 AXIS2_FREE(env->allocator, hash_index);
+            }
             return header_block_node;
         }