Mailing-List: contact axis-cvs-help@ws.apache.org; run by ezmlm
Precedence: bulk
Content-Type: text/plain; charset="utf-8"
MIME-Version: 1.0
Content-Transfer-Encoding: 7bit
Subject: svn commit: r518509 - in /webservices/axis2/trunk/c/rampart: include/
 src/omxmlsec/ src/util/ test/omxmlsec/ test/openssl/sign/
Date: Thu, 15 Mar 2007 08:18:19 -0000
To: axis2-cvs@ws.apache.org
From: kaushalye@apache.org
Message-Id: <20070315081820.2995D1A9838@eris.apache.org>

Author: kaushalye
Date: Thu Mar 15 01:18:19 2007
New Revision: 518509

URL: http://svn.apache.org/viewvc?view=rev&rev=518509
Log:
Code improvement in Rampart

Modified:
    webservices/axis2/trunk/c/rampart/include/oxs_key_mgr.h
    webservices/axis2/trunk/c/rampart/include/oxs_xml_encryption.h
    webservices/axis2/trunk/c/rampart/include/oxs_xml_signature.h
    webservices/axis2/trunk/c/rampart/include/rampart_credentials.h
    webservices/axis2/trunk/c/rampart/src/omxmlsec/key_mgr.c
    webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c
    webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c
    webservices/axis2/trunk/c/rampart/test/openssl/sign/test.c

Modified: webservices/axis2/trunk/c/rampart/include/oxs_key_mgr.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_key_mgr.h?view=diff&rev=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_key_mgr.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_key_mgr.h Thu Mar 15 01:18:19 2007
@@ -57,7 +57,7 @@
     axis2_char_t *password);
 
 AXIS2_EXTERN openssl_pkey_t* AXIS2_CALL
-oxs_key_mgr_load_private_key_from_file(const axis2_env_t *env,
+oxs_key_mgr_load_private_key_from_pem_file(const axis2_env_t *env,
     axis2_char_t *file_name,
     axis2_char_t *password);
 

Modified: webservices/axis2/trunk/c/rampart/include/oxs_xml_encryption.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_xml_encryption.h?view=diff&rev=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_xml_encryption.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_xml_encryption.h Thu Mar 15 01:18:19 2007
@@ -20,7 +20,7 @@
 
 
 /**
-  * @file oxs_xml_enc.h
+  * @file oxs_xml_encryption.h
   * @brief Does the XML encryption for OMXMLSecurity  
   */
 

Modified: webservices/axis2/trunk/c/rampart/include/oxs_xml_signature.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_xml_signature.h?view=diff&rev=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_xml_signature.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_xml_signature.h Thu Mar 15 01:18:19 2007
@@ -51,7 +51,19 @@
     axiom_node_t *parent,
     axiom_node_t **sig_node);
 
-
+/**
+ * Verify a complete xml document
+ * @env pointer to environment struct
+ * @sign_ctx the signature context
+ * @signature_node the ds:Signature node
+ * @scope_node the root node in which the referenced are found
+ * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
+ */
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_xml_sig_verify(const axis2_env_t *env,
+    oxs_sign_ctx_t *sign_ctx,
+    axiom_node_t *signature_node,
+    axiom_node_t *scope_node);
 
 /**
  * Verify a single signature part @sign_part.
@@ -74,19 +86,6 @@
 oxs_xml_sig_verify_digests(const axis2_env_t *env,
     oxs_sign_ctx_t *sign_ctx);
 
-/**
- * Verify a complete xml document
- * @env pointer to environment struct
- * @sign_ctx the signature context
- * @signature_node the ds:Signature node
- * @scope_node the root node in which the referenced are found
- * @return AXIS2_SUCCESS on success, else AXIS2_FAILURE
- */
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
-oxs_xml_sig_verify(const axis2_env_t *env,
-    oxs_sign_ctx_t *sign_ctx,
-    axiom_node_t *signature_node,
-    axiom_node_t *scope_node);
 
 /**
  * Process the ds:Reference node. Populate a signature part

Modified: webservices/axis2/trunk/c/rampart/include/rampart_credentials.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_credentials.h?view=diff&rev=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_credentials.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_credentials.h Thu Mar 15 01:18:19 2007
@@ -98,6 +98,7 @@
       ((credentials)->ops->rampart_credentials_username_get(credentials, env, msg_ctx, username, password))
 
 
+
     /** @} */
 #ifdef __cplusplus
 }

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/key_mgr.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/key_mgr.c?view=diff&rev=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/key_mgr.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/key_mgr.c Thu Mar 15 01:18:19 2007
@@ -182,7 +182,7 @@
 }
 
 AXIS2_EXTERN openssl_pkey_t* AXIS2_CALL
-oxs_key_mgr_load_private_key_from_file(const axis2_env_t *env, 
+oxs_key_mgr_load_private_key_from_pem_file(const axis2_env_t *env, 
     axis2_char_t *filename,
     axis2_char_t *password)
 {

Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c?view=diff&rev=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c Thu Mar 15 01:18:19 2007
@@ -288,7 +288,7 @@
                 }
             }
         }
-        prvkey = oxs_key_mgr_load_private_key_from_file(env, prv_key_file,password);
+        prvkey = oxs_key_mgr_load_private_key_from_pem_file(env, prv_key_file,password);
         if(!prvkey)
         {
             AXIS2_LOG_INFO(env->log, "[rampart][rampart_signature] Cannot load the private key from file.");

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=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/omxmlsec/test.c Thu Mar 15 01:18:19 2007
@@ -226,7 +226,7 @@
     printf("--Testing started--------------------------------------------\n");
     
     /*Load private key*/
-    prvkey = oxs_key_mgr_load_private_key_from_file(env, prvkeyfile, "");
+    prvkey = oxs_key_mgr_load_private_key_from_pem_file(env, prvkeyfile, "");
     if(!prvkey){
             printf("Cannot load private key");
     }

Modified: webservices/axis2/trunk/c/rampart/test/openssl/sign/test.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/test/openssl/sign/test.c?view=diff&rev=518509&r1=518508&r2=518509
==============================================================================
--- webservices/axis2/trunk/c/rampart/test/openssl/sign/test.c (original)
+++ webservices/axis2/trunk/c/rampart/test/openssl/sign/test.c Thu Mar 15 01:18:19 2007
@@ -45,7 +45,7 @@
     env = axis2_env_create_all("./openssl.log", AXIS2_LOG_LEVEL_TRACE);
     
     /*Load private key*/
-    prvkey = oxs_key_mgr_load_private_key_from_file(env, "key.pem", "");
+    prvkey = oxs_key_mgr_load_private_key_from_pem_file(env, "key.pem", "");
     if(!prvkey){
             printf("Cannot load private key");
             return 0;


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