You are viewing a plain text version of this content. The canonical link for it is here.
Posted to rampart-dev@ws.apache.org by ka...@apache.org on 2007/09/06 11:53:48 UTC
svn commit: r573205 - in /webservices/rampart/trunk/c/src/omxmlsec/openssl:
cipher_property.c pkey.c rsa.c sign.c x509.c
Author: kaushalye
Date: Thu Sep 6 02:53:47 2007
New Revision: 573205
URL: http://svn.apache.org/viewvc?rev=573205&view=rev
Log:
Code cleaning
Modified:
webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c?rev=573205&r1=573204&r2=573205&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c Thu Sep 6 02:53:47 2007
@@ -218,7 +218,7 @@
axis2_status_t AXIS2_CALL
openssl_cipher_property_free(
- openssl_cipher_property_t * cprop,
+ openssl_cipher_property_t * cprop,
const axutil_env_t *env)
{
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c?rev=573205&r1=573204&r2=573205&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c Thu Sep 6 02:53:47 2007
@@ -115,7 +115,7 @@
if (pkey->key)
{
- /* AXIS2_FREE(env->allocator, pkey->key);*/
+ /* AXIS2_FREE(env->allocator, pkey->key);*/
EVP_PKEY_free(pkey->key);
pkey->key = NULL;
}
@@ -223,7 +223,7 @@
return AXIS2_SUCCESS;
}
-AXIS2_EXTERN axis2_status_t AXIS2_CALL
+axis2_status_t AXIS2_CALL
openssl_pkey_increment_ref(
openssl_pkey_t *pkey,
const axutil_env_t *env)
@@ -242,11 +242,11 @@
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
-
+
/*We do not FREE. If somebody still need this*/
if(--(pkey->ref) > 0){
return AXIS2_SUCCESS ;
- }
+ }
if (pkey->key)
{
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c?rev=573205&r1=573204&r2=573205&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c Thu Sep 6 02:53:47 2007
@@ -158,7 +158,7 @@
return (-1);
}
oxs_buffer_populate(out, env, decrypted, ret);
-
+
/*Free*/
AXIS2_FREE(env->allocator, decrypted);
decrypted = NULL;
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c?rev=573205&r1=573204&r2=573205&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c Thu Sep 6 02:53:47 2007
@@ -73,7 +73,7 @@
oxs_buffer_populate(output_buf, env, sig_buf, sig_len);
EVP_MD_CTX_cleanup(&md_ctx);
-
+
return sig_len;
}
@@ -107,16 +107,16 @@
oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyInit failed" );
return AXIS2_FAILURE;
}
- ret = EVP_VerifyUpdate(&md_ctx,
- oxs_buffer_get_data(input_buf, env),
- oxs_buffer_get_size(input_buf, env));
+ ret = EVP_VerifyUpdate(&md_ctx,
+ oxs_buffer_get_data(input_buf, env),
+ oxs_buffer_get_size(input_buf, env));
if(ret != 1) {
/*Error*/
oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyUpdate failed" );
return AXIS2_FAILURE;
}
- ret = EVP_VerifyFinal(&md_ctx,
+ ret = EVP_VerifyFinal(&md_ctx,
oxs_buffer_get_data(sig_buf, env),
oxs_buffer_get_size(sig_buf, env),
pkey);
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
URL: http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c?rev=573205&r1=573204&r2=573205&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c Thu Sep 6 02:53:47 2007
@@ -82,7 +82,7 @@
/*Free*/
BIO_free(mem);
mem = NULL;
-
+
AXIS2_FREE(env->allocator, buff);
buff = NULL;
@@ -99,9 +99,9 @@
X509 **cert)
{
BIO *in = NULL;
-
+
in = BIO_new_file(filename,"r");
-
+
if (!in)
{
return AXIS2_FAILURE;
@@ -116,7 +116,7 @@
if (-1 == BIO_free(in) ){
return AXIS2_FAILURE;
}
-
+
if(!*cert)
{
return AXIS2_FAILURE;
@@ -222,7 +222,7 @@
return buffer;
}else{
return NULL;
- }
+ }
}
@@ -236,13 +236,13 @@
serial = (axis2_char_t*)i2s_ASN1_INTEGER(NULL, X509_get_serialNumber(cert));
if(serial){
no = atoi(serial);
-
+
AXIS2_FREE(env->allocator, serial);
serial = NULL;
return no;
- }else{
+ }else{
return -1;
- }
+ }
}
AXIS2_EXTERN unsigned long AXIS2_CALL
@@ -307,7 +307,7 @@
/*Free key_id*/
M_ASN1_OCTET_STRING_free(key_id);
key_id = NULL;
-
+
ret += len;
ski = axutil_strdup(env, output);
return ski;
@@ -391,10 +391,10 @@
}
n = BIO_get_mem_data(out, &data);
result = axutil_strndup( env, data, n);
-
+
BIO_free(out);
out = NULL;
-
+
return result;
}