axis-java-dev mailing list archives

Site index · List index
Message view « Date » · « Thread »
Top « Date » · « Thread »
From nand...@apache.org
Subject svn commit: r437673 - in /webservices/axis2/trunk/c/rampart/src/omxmlsec: axiom.c cipher.c ctx.c enc_engine.c key.c openssl/cipher_ctx.c openssl/cipher_property.c openssl/crypt.c openssl/pkey.c openssl/rsa.c token_cipher_value.c
Date Mon, 28 Aug 2006 11:40:22 GMT
Author: nandika
Date: Mon Aug 28 04:40:19 2006
New Revision: 437673

URL: http://svn.apache.org/viewvc?rev=437673&view=rev
Log:
warnings fixed 

Modified:
    webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c
    webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/axiom.c Mon Aug 28 04:40:19 2006
@@ -87,7 +87,7 @@
     if(!buffer){
         oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
                      "buffer is NULL");
-        return AXIS2_FAILURE;
+        return NULL;
     }
     reader = axiom_xml_reader_create_for_memory(env,
                 (void*)buffer, AXIS2_STRLEN(buffer), "utf-8", AXIS2_XML_PARSER_TYPE_BUFFER);
@@ -95,27 +95,27 @@
     if(!reader){
         oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
                      "axiom_xml_reader is NULL");
-        return AXIS2_FAILURE;
+        return NULL;
     }
 
     builder = axiom_stax_builder_create(env, reader);
     if(!builder){
         oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
                      "axiom_stax_builder is NULL");
-        return AXIS2_FAILURE;
+        return NULL;
     }
     
     doc = axiom_document_create(env, NULL, builder);
     if(!doc){
         oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
                      "axiom_document is NULL");
-        return AXIS2_FAILURE;
+        return NULL;
     }
     node = AXIOM_DOCUMENT_BUILD_ALL(doc, env);
     if(!node){
         oxs_error(ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
                      "Building node failed");
-        return AXIS2_FAILURE;
+        return NULL;
     }
 
     return node;

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?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/cipher.c Mon Aug 28 04:40:19 2006
@@ -19,6 +19,7 @@
 #include <oxs_error.h>
 #include <oxs_cipher.h>
 #include <openssl_constants.h>
+#include <openssl_util.h>
 
 
 AXIS2_EXTERN openssl_cipher_property_t *AXIS2_CALL

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/ctx.c Mon Aug 28 04:40:19 2006
@@ -270,9 +270,9 @@
 AXIS2_EXTERN oxs_ctx_t *AXIS2_CALL
 oxs_ctx_create(const axis2_env_t *env)
 {
+    oxs_ctx_impl_t *ctx_impl= NULL;
     AXIS2_ENV_CHECK(env, NULL);
 
-    oxs_ctx_impl_t * ctx_impl= NULL;
     ctx_impl = AXIS2_MALLOC(env->allocator,sizeof(oxs_ctx_impl_t));
     if (!ctx_impl)
     {
@@ -441,7 +441,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->key ;
@@ -455,7 +455,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->id ;
@@ -469,7 +469,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->type ;
@@ -483,7 +483,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->mime_type ;
@@ -497,7 +497,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->encoding ;
@@ -511,7 +511,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->recipient ;
@@ -525,7 +525,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->carried_key_name ;
@@ -539,7 +539,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->enc_mtd_algorithm ;
@@ -553,7 +553,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->input_data ;
@@ -567,7 +567,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->enc_data_node ;
@@ -581,7 +581,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->enc_method_node ;
@@ -595,7 +595,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->key_info_node ;
@@ -609,7 +609,7 @@
                     )
 {
     oxs_ctx_impl_t * ctx_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
 
     return ctx_impl->cipher_value_node ;

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c Mon Aug 28 04:40:19 2006
@@ -33,6 +33,9 @@
 #include <openssl_crypt.h>
 #include <openssl_constants.h>
 #include <openssl_rsa.h>
+#include <oxs_token_cipher_value.h>
+#include <oxs_iv.h>
+
 
 typedef struct oxs_enc_engine_impl
 {
@@ -693,7 +696,7 @@
     
 }
 
-static axis2_status_t AXIS2_CALL
+static axis2_status_t 
 oxs_enc_engine_cipher_data_node_read(const axis2_env_t *env, 
                                 oxs_ctx_t * enc_ctx, axiom_node_t* node_cipher_data)
 {
@@ -732,7 +735,7 @@
 * We have EncryptedData of EncryptedKey node by now. 
 * So process it and populate the ctx.
 */
-static axis2_status_t AXIS2_CALL
+static axis2_status_t 
 oxs_enc_engine_encrypted_data_node_read(const axis2_env_t *env,
             oxs_ctx_t * enc_ctx, axiom_node_t* node)
 {

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c Mon Aug 28 04:40:19 2006
@@ -21,7 +21,7 @@
 #include <oxs_cipher.h>
 #include <oxs_error.h>
 #include <openssl_cipher_property.h>
-
+#include <openssl_util.h>
 
 typedef struct oxs_key_impl{
     oxs_key_t key;
@@ -122,7 +122,7 @@
     const axis2_env_t *env)
 {
     oxs_key_impl_t *key_impl = NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     key_impl = AXIS2_INTF_TO_IMPL(key);
 
     return key_impl->data;
@@ -135,7 +135,7 @@
     const axis2_env_t *env)
 {
     oxs_key_impl_t *key_impl = NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     key_impl = AXIS2_INTF_TO_IMPL(key);
 
     return key_impl->name;
@@ -295,7 +295,8 @@
 
 }
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+
+axis2_status_t AXIS2_CALL
 oxs_key_free(oxs_key_t *key,
     const axis2_env_t *env )
 {
@@ -314,7 +315,7 @@
     return AXIS2_SUCCESS;
 }
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
 oxs_key_populate(oxs_key_t *key,
         const axis2_env_t *env,
         axis2_char_t *data,
@@ -333,7 +334,7 @@
 }
 
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
 oxs_key_read_from_file(oxs_key_t *key,
         const axis2_env_t *env,
         axis2_char_t *file_name)
@@ -351,7 +352,7 @@
     
 }
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
 oxs_key_for_algo(oxs_key_t *key,
         const axis2_env_t *env,
         axis2_char_t *key_algo)

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c Mon Aug 28 04:40:19
2006
@@ -22,6 +22,7 @@
 #include <oxs_error.h>
 #include <openssl/evp.h>
 #include <openssl/rand.h>
+#include <openssl_util.h>
 
 
 

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_property.c Mon Aug 28 04:40:19
2006
@@ -121,7 +121,7 @@
     const axis2_env_t *env)
 {
     openssl_cipher_property_impl_t *cprop_impl = NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     cprop_impl = AXIS2_INTF_TO_IMPL(cprop);
 
     return cprop_impl->cipher;
@@ -133,7 +133,7 @@
     const axis2_env_t *env)
 {
     openssl_cipher_property_impl_t *cprop_impl = NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     cprop_impl = AXIS2_INTF_TO_IMPL(cprop);
 
     return cprop_impl->name;
@@ -145,7 +145,7 @@
     const axis2_env_t *env)
 {
     openssl_cipher_property_impl_t *cprop_impl = NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     cprop_impl = AXIS2_INTF_TO_IMPL(cprop);
 
     return cprop_impl->url;
@@ -345,7 +345,7 @@
 }
 
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
 openssl_cipher_property_free(openssl_cipher_property_t * cprop, const axis2_env_t *env)
 {
     openssl_cipher_property_impl_t *cprop_impl= NULL;

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/crypt.c Mon Aug 28 04:40:19 2006
@@ -36,7 +36,7 @@
     int do_encrypt)
 {
     EVP_CIPHER_CTX ctx ;
-    ctx = bc_ctx->cipher_ctx;
+ 
 
         unsigned char inbuf[BUFSIZE + 1 ], outbuf[BUFSIZE + EVP_MAX_BLOCK_LENGTH]; /*EVP_MAX_BLOCK_LENGTH
= 32 in evp.h*/
         unsigned char *tempbuf = NULL;
@@ -47,7 +47,7 @@
 
         i = 0;
         out_buf_index = 0;
-
+        ctx = bc_ctx->cipher_ctx;
 
         for(;;)
         {

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/pkey.c Mon Aug 28 04:40:19 2006
@@ -121,9 +121,8 @@
 AXIS2_EXTERN openssl_pkey_t *AXIS2_CALL
 openssl_pkey_create(const axis2_env_t *env)
 {
-    AXIS2_ENV_CHECK(env, NULL);
-
     openssl_pkey_impl_t * pkey_impl= NULL;
+    AXIS2_ENV_CHECK(env, NULL);
     pkey_impl = AXIS2_MALLOC(env->allocator,sizeof(openssl_pkey_impl_t));
     if (!pkey_impl)
     {
@@ -173,7 +172,7 @@
                     )
 {
     openssl_pkey_impl_t * pkey_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     pkey_impl = AXIS2_INTF_TO_IMPL(pkey);
 
     return pkey_impl->key ;
@@ -186,7 +185,7 @@
                     )
 {
     openssl_pkey_impl_t * pkey_impl= NULL;
-    AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+    AXIS2_ENV_CHECK(env, NULL);
     pkey_impl = AXIS2_INTF_TO_IMPL(pkey);
 
     return pkey_impl->name ;

Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/rsa.c Mon Aug 28 04:40:19 2006
@@ -113,7 +113,7 @@
 
 }
 
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
 openssl_rsa_free( openssl_rsa_t * rsa, 
     const axis2_env_t *env)
 {

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?rev=437673&r1=437672&r2=437673&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/token_cipher_value.c Mon Aug 28 04:40:19
2006
@@ -19,6 +19,7 @@
 #include <oxs_error.h>
 #include <oxs_token_cipher_value.h>
 #include <axiom_element.h>
+#include <oxs_axiom.h>
 
 
 AXIS2_EXTERN axis2_char_t* AXIS2_CALL



---------------------------------------------------------------------
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