You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ka...@apache.org on 2007/03/05 11:50:34 UTC

svn commit: r514643 - in /webservices/axis2/trunk/c/rampart: include/oxs_xml_key_processor.h src/omxmlsec/xml_key_processor.c test/omxmlsec/test.c

Author: kaushalye
Date: Mon Mar  5 02:50:33 2007
New Revision: 514643

URL: http://svn.apache.org/viewvc?view=rev&rev=514643
Log:
Key info processing in OMXMLSecurity

Modified:
    webservices/axis2/trunk/c/rampart/include/oxs_xml_key_processor.h
    webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c
    webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c

Modified: webservices/axis2/trunk/c/rampart/include/oxs_xml_key_processor.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_xml_key_processor.h?view=diff&rev=514643&r1=514642&r2=514643
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_xml_key_processor.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_xml_key_processor.h Mon Mar  5 02:50:33 2007
@@ -15,13 +15,13 @@
  * limitations under the License.
  */
 
-#ifndef OXS_KEY_PROCESSOR_H
-#define OXS_KEY_PROCESSOR_H
+#ifndef OXS_XML_KEY_PROCESSOR_H
+#define OXS_XML_KEY_PROCESSOR_H
 
 
 /**
-  * @file oxs_xml_signature.h
-  * @brief Does the XML Signature for OMXMLSecurity  
+  * @file oxs_xml_key_processor.h
+  * @brief Process elements available under ds:KeyInfo  
   */
 
 #include <axis2_defines.h>
@@ -38,12 +38,12 @@
 
 /*Process data in a ds:X509Certificate and returns a certificate*/
 AXIS2_EXTERN oxs_x509_cert_t *AXIS2_CALL
-oxs_key_process_X509Certificate(const axis2_env_t *env,
+oxs_xml_key_process_X509Certificate(const axis2_env_t *env,
     axiom_node_t *X509_cert_node);
 
 /*Higher level function ot process an ds:X509Data element*/
 AXIS2_EXTERN oxs_x509_cert_t *AXIS2_CALL
-oxs_key_process_X509Data(const axis2_env_t *env,
+oxs_xml_key_process_X509Data(const axis2_env_t *env,
     axiom_node_t *X509_data_node);
 
 
@@ -52,4 +52,4 @@
 }
 #endif
 
-#endif                          /* OXS_KEY_PROCESSOR_H */
+#endif                          /* OXS_XML_KEY_PROCESSOR_H */

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c?view=diff&rev=514643&r1=514642&r2=514643
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/xml_key_processor.c Mon Mar  5 02:50:33 2007
@@ -36,12 +36,18 @@
 /*Public functions*/
 
 AXIS2_EXTERN oxs_x509_cert_t *AXIS2_CALL
-oxs_key_process_X509Certificate(const axis2_env_t *env,
+oxs_xml_key_process_X509Certificate(const axis2_env_t *env,
     axiom_node_t *X509_cert_node)
 {
     axis2_char_t *data = NULL;
+    axis2_char_t *node_name = NULL;
     oxs_x509_cert_t *cert = NULL;
-
+    
+    node_name = axiom_util_get_localname(X509_cert_node, env);
+    if(0 != axis2_strcmp(node_name, OXS_NODE_X509_CERTIFICATE)){
+        oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_CERTIFICATE, node_name);
+        return NULL;
+    }
     /*Get contents*/
     data = oxs_token_get_x509_certificate(env, X509_cert_node);
     cert = oxs_key_mgr_load_x509_cert_from_string(env, data);
@@ -51,19 +57,25 @@
 
 
 AXIS2_EXTERN oxs_x509_cert_t *AXIS2_CALL
-oxs_key_process_X509Data(const axis2_env_t *env,
+oxs_xml_key_process_X509Data(const axis2_env_t *env,
     axiom_node_t *X509_data_node)
 {
     oxs_x509_cert_t *cert = NULL;
     axiom_node_t *child_node = NULL;
     axis2_char_t *child_name = NULL;
+    axis2_char_t *node_name = NULL;
 
+    node_name = axiom_util_get_localname(X509_data_node, env);
+    if(0 != axis2_strcmp(node_name, OXS_NODE_X509_DATA)){
+        oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,"Invalid node. Expected %s. Found", OXS_NODE_X509_DATA, node_name);
+        return NULL;
+    }
     child_node = AXIOM_NODE_GET_FIRST_CHILD( X509_data_node, env);
     child_name = axiom_util_get_localname(child_node, env);
     
     /*Check wht is inside the <ds:X509Data>*/
     if(0 == axis2_strcmp(child_name, OXS_NODE_X509_CERTIFICATE)){
-        cert = oxs_key_process_X509Certificate(env, child_node);
+        cert = oxs_xml_key_process_X509Certificate(env, child_node);
     }else if(0 == axis2_strcmp(child_name,OXS_NODE_X509_SUBJECT_NAME )){
         /*TODO*/ 
     }else{

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=514643&r1=514642&r2=514643
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c Mon Mar  5 02:50:33 2007
@@ -34,7 +34,7 @@
 #include <oxs_xml_signature.h>
 #include <oxs_sign_ctx.h>
 #include <oxs_sign_part.h>
-
+#include <oxs_xml_key_processor.h>
 AXIS2_EXTERN axiom_node_t* AXIS2_CALL
 load_sample_xml(const axis2_env_t *env,
         axiom_node_t* tmpl,
@@ -149,8 +149,6 @@
     sign_ctx = oxs_sign_ctx_create(env);
     if(sign_ctx){
         axiom_node_t *sig_node = NULL;
-        oxs_sign_ctx_set_private_key(sign_ctx, env, prvkey);
-        oxs_sign_ctx_set_certificate(sign_ctx, env, cert);
         /*Set the operation*/
         oxs_sign_ctx_set_operation(sign_ctx, env, OXS_SIGN_OPERATION_VERIFY);
         
@@ -160,6 +158,23 @@
             printf("Verification : Cannot find ds:Signature node\n");
             return AXIS2_FAILURE;
         }
+       
+        /**If the certificate is not given check key information*/
+        if(!cert){
+            axiom_node_t *ki_node = NULL;
+            axiom_node_t *x509_node = NULL;
+            ki_node = oxs_axiom_get_first_child_node_by_name(env, sig_node, OXS_NODE_KEY_INFO, OXS_DSIG_NS, OXS_DS);
+            x509_node = oxs_axiom_get_first_child_node_by_name(env, ki_node, OXS_NODE_X509_DATA, OXS_DSIG_NS, OXS_DS);
+            cert = oxs_xml_key_process_X509Data(env, x509_node);
+            if(!cert){
+                printf("Error reading KeyInfo\n");
+                return AXIS2_FAILURE;
+            }
+        }            
+
+        
+        /*Set certificate*/
+        oxs_sign_ctx_set_certificate(sign_ctx, env, cert);
         /*Verify*/
         status = oxs_xml_sig_verify(env, sign_ctx, sig_node, tmpl);
         if(AXIS2_SUCCESS != status){
@@ -175,19 +190,19 @@
 int main(int argc, char *argv[])
 {
     axis2_env_t *env = NULL;
-    axis2_char_t *filename = "input.xml";
-    axis2_char_t *certfile = "rsacert.pem";
-    axis2_char_t *prvkeyfile = "rsakey.pem";
-    axis2_char_t *operation = "S";
+    axis2_char_t *filename = NULL;
+    axis2_char_t *certfile = NULL;
+    axis2_char_t *prvkeyfile = NULL;
+    axis2_char_t *operation = NULL;
     openssl_pkey_t *prvkey = NULL;
     oxs_x509_cert_t *cert = NULL;
 
 
-    if (argc > 4){
+    if (argc > 2){
         filename = argv[1];
-        prvkeyfile = argv[2];
+        operation = argv[2];
         certfile = argv[3];
-        operation = argv[4];
+        prvkeyfile = argv[4];
     }else{
         printf("Usage ./test inputfile prvkey certificate operation[S/V]\n");
         return -1;



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