Author: kaushalye
Date: Wed Mar 28 02:43:46 2007
New Revision: 523250
URL: http://svn.apache.org/viewvc?view=rev&rev=523250
Log:
Formatting code in openssl wrappers in OMXMLSecurity
Modified:
webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/crypt.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12.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/util.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_ctx.c Wed Mar 28
02:43:46 2007
@@ -61,7 +61,7 @@
/* public functions*/
axis2_status_t AXIS2_CALL
openssl_cipher_ctx_free(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env
+ const axis2_env_t *env
)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -86,7 +86,7 @@
const EVP_CIPHER* AXIS2_CALL
openssl_cipher_ctx_get_cipher(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env)
+ const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -95,7 +95,7 @@
oxs_key_t *AXIS2_CALL
openssl_cipher_ctx_get_key(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env
+ const axis2_env_t *env
)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -105,7 +105,7 @@
axis2_char_t *AXIS2_CALL
openssl_cipher_ctx_get_iv(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env
+ const axis2_env_t *env
)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -115,7 +115,7 @@
axis2_char_t *AXIS2_CALL
openssl_cipher_ctx_get_pad(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env
+ const axis2_env_t *env
)
{
AXIS2_ENV_CHECK(env, NULL);
@@ -125,8 +125,8 @@
axis2_status_t AXIS2_CALL
openssl_cipher_ctx_set_cipher(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env,
- const EVP_CIPHER *cipher
+ const axis2_env_t *env,
+ const EVP_CIPHER *cipher
)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -143,8 +143,8 @@
axis2_status_t AXIS2_CALL
openssl_cipher_ctx_set_key(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env,
- oxs_key_t *key
+ const axis2_env_t *env,
+ oxs_key_t *key
)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -162,8 +162,8 @@
axis2_status_t AXIS2_CALL
openssl_cipher_ctx_set_iv(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env,
- axis2_char_t *iv
+ const axis2_env_t *env,
+ axis2_char_t *iv
)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -182,8 +182,8 @@
axis2_status_t AXIS2_CALL
openssl_cipher_ctx_set_pad(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env,
- axis2_char_t *pad
+ const axis2_env_t *env,
+ axis2_char_t *pad
)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
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?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c
(original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/cipher_property.c Wed Mar
28 02:43:46 2007
@@ -25,7 +25,7 @@
struct openssl_cipher_property_t
-{
+{
EVP_CIPHER *cipher;
axis2_char_t *name;
axis2_char_t *url;
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/crypt.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/crypt.c?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/crypt.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/crypt.c Wed Mar 28
02:43:46 2007
@@ -28,14 +28,14 @@
AXIS2_EXTERN int AXIS2_CALL
openssl_bc_crypt(const axis2_env_t *env,
- openssl_cipher_ctx_t *oc_ctx,
- oxs_buffer_t *input_buf,
- oxs_buffer_t *output_buf,
- int encrypt)
+ openssl_cipher_ctx_t *oc_ctx,
+ oxs_buffer_t *input_buf,
+ oxs_buffer_t *output_buf,
+ int encrypt)
{
EVP_CIPHER_CTX ctx ;
oxs_key_t *okey = NULL;
-
+
unsigned char iv[EVP_MAX_IV_LENGTH];
unsigned char key[EVP_MAX_KEY_LENGTH];
int ret =0, iv_length =0, block_length =0;
@@ -80,11 +80,11 @@
unsigned char *out_buf = NULL;
int in_size =0, out_size =0, fixed=0, out_length = 0;
- if (0 == oxs_buffer_get_size(input_buf, env)) {
- last = 1;
+ if (0 == oxs_buffer_get_size(input_buf, env)) {
+ last = 1;
break; /*Quit loop if NO DATA!!! */
}
-
+
/*If the amnt of data available is greater than the buffer size, we
limit it to buffer size */
if(oxs_buffer_get_size(input_buf, env) > BUFSIZE){
in_size = BUFSIZE;
@@ -93,12 +93,12 @@
}
out_size = oxs_buffer_get_size(output_buf, env);
-
+
/*Set the output buffer size*/
status = oxs_buffer_set_max_size(output_buf, env, out_size + in_size +
block_length);
out_buf = oxs_buffer_get_data(output_buf, env) + out_size;
/*position to write*/
-
+
#ifndef OXS_OPENSSL_096
/*If decrypt, we copy the final data to the out_buf of size
block_length*/
if(!ctx.encrypt) {
@@ -106,15 +106,15 @@
memcpy(out_buf, ctx.final, block_length);
out_buf += block_length;
fixed = 1;
- }else {
- fixed = 0;
- }
+ }else {
+ fixed = 0;
}
+ }
#endif
- /* encrypt or decrypt */
- ret = EVP_CipherUpdate(&ctx, out_buf, &out_length,
oxs_buffer_get_data(input_buf, env), in_size);
+ /* encrypt or decrypt */
+ ret = EVP_CipherUpdate(&ctx, out_buf, &out_length,
oxs_buffer_get_data(input_buf, env), in_size);
-#ifndef OXS_OPENSSL_096
+#ifndef OXS_OPENSSL_096
/*If decrypt, we copy data from the out_buf to the ctx.final*/
if(!ctx.encrypt) {
if (block_length > 1 && !ctx.buf_len) {
@@ -130,7 +130,7 @@
}
#endif
/* set correct output buffer size */
- status = oxs_buffer_set_size(output_buf, env, out_size + out_length);
+ status = oxs_buffer_set_size(output_buf, env, out_size + out_length);
if(AXIS2_FAILURE == status){
return -1;
}
@@ -139,7 +139,7 @@
if(AXIS2_FAILURE == status){
return -1;
}
-
+
}/*End of for loop*/
/********************************Finalize*****************************************************/
@@ -149,7 +149,7 @@
unsigned char pad[EVP_MAX_BLOCK_LENGTH];
unsigned char *out_buf = NULL;
int out_size = 0, out_length = 0, out_length2 = 0;
-
+
out_size = oxs_buffer_get_size(output_buf, env);
status = oxs_buffer_set_max_size(output_buf, env, out_size + 2 *
block_length);
out_buf = oxs_buffer_get_data(output_buf, env) + out_size;/*position
to write*/
@@ -166,7 +166,7 @@
ret = EVP_CipherUpdate(&ctx, out_buf, &out_length, pad,
pad_length);
out_buf += out_length;
}
-#endif
+#endif
/* finalize */
ret = EVP_CipherFinal(&ctx, out_buf, &out_length2);
#ifndef OXS_OPENSSL_096
@@ -183,13 +183,13 @@
#endif
/* set correct output buffer size */
status = oxs_buffer_set_size(output_buf, env, out_size + out_length +
out_length2);
-
+
EVP_CIPHER_CTX_cleanup(&ctx);
/*return the length of the outputbuf*/
return out_size + out_length + out_length2;
}else{
return -1;
}
-
+
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/digest.c Wed Mar 28
02:43:46 2007
@@ -26,8 +26,8 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
openssl_sha1(const axis2_env_t *env,
- axis2_char_t *input,
- int length)
+ axis2_char_t *input,
+ int length)
{
SHA_CTX c ;
unsigned char md[SHA_DIGEST_LENGTH];
@@ -50,13 +50,13 @@
int length)
{
MD5_CTX ctx;
- unsigned char md[MD5_DIGEST_LENGTH];
+ unsigned char md[MD5_DIGEST_LENGTH];
axis2_char_t* encoded_str = NULL;
-
+
MD5_Init(&ctx);
MD5_Update(&ctx, (unsigned char*)input,length);
- MD5_Final(md, &ctx);
-
+ MD5_Final(md, &ctx);
+
encoded_str = AXIS2_MALLOC(env->allocator, MD5_DIGEST_LENGTH);
axis2_base64_encode(encoded_str, (char*)md, MD5_DIGEST_LENGTH);
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pem.c Wed Mar 28 02:43:46
2007
@@ -30,10 +30,10 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_pem_buf_read_pkey(const axis2_env_t *env,
- axis2_char_t *b64_encoded_buf,
- axis2_char_t *password,
- openssl_pem_pkey_type_t type,
- EVP_PKEY **pkey)
+ axis2_char_t *b64_encoded_buf,
+ axis2_char_t *password,
+ openssl_pem_pkey_type_t type,
+ EVP_PKEY **pkey)
{
unsigned char *buff = NULL;
BIO *bio = NULL;
@@ -51,13 +51,13 @@
ilen = axis2_strlen(b64_encoded_buf);
EVP_DecodeInit(&ctx);
EVP_DecodeUpdate(&ctx, (unsigned char*)buff, &len,
- (unsigned char*)b64_encoded_buf, ilen);
+ (unsigned char*)b64_encoded_buf, ilen);
EVP_DecodeFinal(&ctx, (unsigned char*)buff, &ret);
ret += len;
if ((bio = BIO_new_mem_buf(buff, ilen)) == NULL)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
- "BIO memeory allocation failure");
+ "BIO memeory allocation failure");
return AXIS2_FAILURE;
}
/*Load*/
@@ -66,7 +66,7 @@
}else{
*pkey = d2i_PrivateKey_bio(bio, NULL);
}
-
+
/*Free*/
BIO_free(bio);
bio = NULL;
@@ -75,7 +75,7 @@
if(!*pkey){
oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
- "private key is NULL");
+ "private key is NULL");
return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
@@ -83,19 +83,19 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_pem_read_pkey(const axis2_env_t *env,
- axis2_char_t *filename,
- axis2_char_t *password,
- openssl_pem_pkey_type_t type,
- EVP_PKEY **pkey)
+ axis2_char_t *filename,
+ axis2_char_t *password,
+ openssl_pem_pkey_type_t type,
+ EVP_PKEY **pkey)
{
BIO *bio;
- int ret;
+ int ret;
bio = BIO_new_file(filename, "r");
if(type == OPENSSL_PEM_PKEY_TYPE_PRIVATE_KEY){
*pkey = PEM_read_bio_PrivateKey(bio, NULL, 0 , password);
- }else if(type == OPENSSL_PEM_PKEY_TYPE_PUBLIC_KEY){
+ }else if(type == OPENSSL_PEM_PKEY_TYPE_PUBLIC_KEY){
*pkey = PEM_read_bio_PUBKEY(bio, NULL, 0 , password);
}else{/*Type unknown*/
/*Try to read the prv key first*/
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12.c?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12.c Wed Mar 28
02:43:46 2007
@@ -28,8 +28,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_pkcs12_load(const axis2_env_t *env,
- axis2_char_t *filename,
- PKCS12 **p12)
+ axis2_char_t *filename,
+ PKCS12 **p12)
{
FILE *fp = NULL;
@@ -53,11 +53,11 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_pkcs12_parse(const axis2_env_t *env,
- axis2_char_t *password ,
- PKCS12 *p12,
- EVP_PKEY **prvkey,
- X509 **cert,
- STACK_OF(X509) **ca)
+ axis2_char_t *password ,
+ PKCS12 *p12,
+ EVP_PKEY **prvkey,
+ X509 **cert,
+ STACK_OF(X509) **ca)
{
/*Parse the pkcs store*/
if (!PKCS12_parse(p12, password, prvkey, cert, ca)) {
@@ -70,7 +70,7 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_pkcs12_free(const axis2_env_t *env,
- PKCS12 *p12)
+ PKCS12 *p12)
{
PKCS12_free(p12);
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?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkey.c Wed Mar 28 02:43:46
2007
@@ -188,7 +188,7 @@
{
/*If there is no key by now its an error*/
oxs_error(env, ERROR_LOCATION, OXS_ERROR_ENCRYPT_FAILED,
- "Cannot load key from %s", filename);
+ "Cannot load key from %s", filename);
return AXIS2_FAILURE;
}
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?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/rsa.c Wed Mar 28 02:43:46
2007
@@ -59,15 +59,15 @@
encrypted = AXIS2_MALLOC(env->allocator, RSA_size(key->pkey.rsa));
ret = RSA_public_encrypt(oxs_buffer_get_size(in, env),
- oxs_buffer_get_data(in, env),
- encrypted,
- key->pkey.rsa ,
- pad);
-
+ oxs_buffer_get_data(in, env),
+ encrypted,
+ key->pkey.rsa ,
+ pad);
+
if (ret < 0)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
- "RSA encryption failed");
+ "RSA encryption failed");
return (-1);
}
oxs_buffer_populate(out, env, encrypted, ret);
@@ -87,7 +87,7 @@
EVP_PKEY *key = NULL;
int pad = RSA_PKCS1_PADDING;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
key = (EVP_PKEY *)openssl_pkey_get_key(pkey, env);
if(0 == axis2_strcmp(padding, OPENSSL_RSA_PKCS1_OAEP_PADDING ) ){
@@ -98,20 +98,20 @@
decrypted = AXIS2_MALLOC(env->allocator, RSA_size(key->pkey.rsa));
ret = RSA_public_decrypt(oxs_buffer_get_size(in, env),
- oxs_buffer_get_data(in, env),
- decrypted,
- key->pkey.rsa ,
- pad);
-
+ oxs_buffer_get_data(in, env),
+ decrypted,
+ key->pkey.rsa ,
+ pad);
+
if (ret < 0)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
- "PUBKEY decrypt (signature verification) failed");
+ "PUBKEY decrypt (signature verification) failed");
return (-1);
}
oxs_buffer_populate(out, env, decrypted, ret);
return ret;
- }
+}
int AXIS2_CALL
@@ -140,15 +140,15 @@
decrypted = AXIS2_MALLOC(env->allocator, RSA_size(key->pkey.rsa));
ret = RSA_private_decrypt(RSA_size(key->pkey.rsa),
- oxs_buffer_get_data(in, env),
- decrypted,
- key->pkey.rsa,
- pad);
-
+ oxs_buffer_get_data(in, env),
+ decrypted,
+ key->pkey.rsa,
+ pad);
+
if (ret < 0)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
- "RSA decryption failed");
+ "RSA decryption failed");
return (-1);
}
oxs_buffer_populate(out, env, decrypted, ret);
@@ -182,15 +182,15 @@
encrypted = AXIS2_MALLOC(env->allocator, RSA_size(key->pkey.rsa));
ret = RSA_private_encrypt(RSA_size(key->pkey.rsa),
- oxs_buffer_get_data(in, env),
- encrypted,
- key->pkey.rsa,
- pad);
+ oxs_buffer_get_data(in, env),
+ encrypted,
+ key->pkey.rsa,
+ pad);
if (ret < 0)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_OPENSSL_FUNC_FAILED,
- "RSA private encryption(Signing) failed. Error
code %d: %s",ERR_get_error(), ERR_reason_error_string(ERR_get_error()));
+ "RSA private encryption(Signing) failed. Error code %d:
%s",ERR_get_error(), ERR_reason_error_string(ERR_get_error()));
return (-1);
}
oxs_buffer_populate(out, env, encrypted, ret);
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?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/sign.c Wed Mar 28 02:43:46
2007
@@ -34,9 +34,9 @@
AXIS2_EXTERN int AXIS2_CALL
openssl_sig_sign(const axis2_env_t *env,
- openssl_pkey_t *prvkey,
- oxs_buffer_t *input_buf,
- oxs_buffer_t *output_buf)
+ openssl_pkey_t *prvkey,
+ oxs_buffer_t *input_buf,
+ oxs_buffer_t *output_buf)
{
unsigned char sig_buf[4096]; /*Enough for the signature*/
unsigned int sig_len;
@@ -48,7 +48,7 @@
/*open_pkey = oxs_sign_ctx_get_private_key(sign_ctx, env);*/
pkey = openssl_pkey_get_key(prvkey, env);
if(!pkey){
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Cannot load the
private key" );
+ oxs_error(env, ERROR_LOCATION, OXS_ERROR_SIGN_FAILED,"Cannot load the
private key" );
}
/*TODO: Set the digest according to the signature method*/
@@ -59,15 +59,15 @@
/*Sign init*/
ret = EVP_SignInit(&md_ctx, digest);
- AXIS2_LOG_INFO(env->log, "[openssl][sig] Signing content %s",
oxs_buffer_get_data(input_buf, env) );
+ AXIS2_LOG_INFO(env->log, "[openssl][sig] Signing content %s",
oxs_buffer_get_data(input_buf, env) );
EVP_SignUpdate (&md_ctx, oxs_buffer_get_data(input_buf, env),
oxs_buffer_get_size(input_buf, env));
sig_len = sizeof(sig_buf);
err = EVP_SignFinal (&md_ctx,
- sig_buf,
- &sig_len,
- pkey);
- if (err != 1) {
- ERR_print_errors_fp (stderr);
+ sig_buf,
+ &sig_len,
+ pkey);
+ if (err != 1) {
+ ERR_print_errors_fp (stderr);
}
/*Fill the output buffer*/
oxs_buffer_populate(output_buf, env, sig_buf, sig_len);
@@ -77,9 +77,9 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_sig_verify(const axis2_env_t *env,
- openssl_pkey_t *pubkey,
- oxs_buffer_t *input_buf,
- oxs_buffer_t *sig_buf)
+ openssl_pkey_t *pubkey,
+ oxs_buffer_t *input_buf,
+ oxs_buffer_t *sig_buf)
{
axis2_status_t status = AXIS2_FAILURE;
const EVP_MD* digest;
@@ -92,19 +92,19 @@
open_pubkey = oxs_x509_cert_get_public_key(cert, env);*/
pkey = openssl_pkey_get_key(pubkey, env);
if(!pkey){
- oxs_error(env, ERROR_LOCATION,
OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot load the public key" );
+ oxs_error(env, ERROR_LOCATION,
OXS_ERROR_SIG_VERIFICATION_FAILED,"Cannot load the public key" );
}
/*TODO Set the digest according to the signature method*/
digest = EVP_sha1();
/*Init MD Ctx*/
EVP_MD_CTX_init(&md_ctx);
-
+
/*Intialize verification*/
ret = EVP_VerifyInit(&md_ctx, digest);
if(ret != 1) {
/*Error*/
- oxs_error(env, ERROR_LOCATION,
OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyInit failed" );
+ 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));
@@ -113,10 +113,10 @@
oxs_error(env, ERROR_LOCATION,
OXS_ERROR_SIG_VERIFICATION_FAILED,"EVP_VerifyUpdate failed" );
return AXIS2_FAILURE;
}
-
- ret = EVP_VerifyFinal(&md_ctx, oxs_buffer_get_data(sig_buf, env),
- oxs_buffer_get_size(sig_buf, env),
- pkey);
+
+ ret = EVP_VerifyFinal(&md_ctx, oxs_buffer_get_data(sig_buf, env),
+ oxs_buffer_get_size(sig_buf, env),
+ pkey);
if(ret == 0){
/*Error. Signature verification FAILED */
oxs_error(env, ERROR_LOCATION,
OXS_ERROR_SIG_VERIFICATION_FAILED,"Signature verification FAILED." );
@@ -126,12 +126,12 @@
oxs_error(env, ERROR_LOCATION,
OXS_ERROR_SIG_VERIFICATION_FAILED,"Error occured while verifying the
signature." );
status = AXIS2_FAILURE;
}else{
- /*SUCCESS. Det ar bra :-)*/
+ /*SUCCESS. Det ar bra :-)*/
AXIS2_LOG_INFO(env->log, "[openssl][sig] Signature verification
SUCCESS " );
status = AXIS2_SUCCESS;
}
- return status;
-
+ return status;
+
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/util.c Wed Mar 28 02:43:46
2007
@@ -37,14 +37,14 @@
if (ret < 0)
{
oxs_error(env, ERROR_LOCATION,
- OXS_ERROR_DEFAULT, "RAND_bytes failed %d", size);
+ OXS_ERROR_DEFAULT, "RAND_bytes failed %d", size);
return AXIS2_FAILURE;
}
/*Encoding make it easier to handle random data*/
-#if 0
+#if 0
int encodedlen;
axis2_char_t *encoded_str = NULL;
-
+
encodedlen = axis2_base64_encode_len(size);
encoded_str = AXIS2_MALLOC(env->allocator, encodedlen);
ret = axis2_base64_encode(encoded_str, (const char *)temp_buffer, size);
@@ -70,7 +70,7 @@
if (!cprop)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
- "openssl_cipher_property is NULL");
+ "openssl_cipher_property is NULL");
return AXIS2_FAILURE;
@@ -80,7 +80,7 @@
if (!cipher_name)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
- "openssl_cipher_property name is NULL");
+ "openssl_cipher_property name is NULL");
return AXIS2_FAILURE;
@@ -90,7 +90,7 @@
if (!cipher)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_INVALID_DATA,
- "openssl_get_evp_cipher_by_name failed");
+ "openssl_get_evp_cipher_by_name failed");
return AXIS2_FAILURE;
}
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?view=diff&rev=523250&r1=523249&r2=523250
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/x509.c Wed Mar 28 02:43:46
2007
@@ -32,8 +32,8 @@
/*Usefull when we have BinarySecurityTokn*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_x509_load_from_buffer(const axis2_env_t *env,
- axis2_char_t *b64_encoded_buf,
- X509 **cert)
+ axis2_char_t *b64_encoded_buf,
+ X509 **cert)
{
unsigned char *buff = NULL;
BIO *mem = NULL;
@@ -54,13 +54,13 @@
else
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_DECRYPT_FAILED,
- "New line removed buffer creation failed.");
- return AXIS2_FAILURE;
+ "New line removed buffer creation failed.");
+ return AXIS2_FAILURE;
}
/*First we need to base64 decode*/
-/* EVP_ENCODE_CTX ctx;*/
-/* int len = 0;*/
-/* int ret = 0;*/
+ /* EVP_ENCODE_CTX ctx;*/
+ /* int len = 0;*/
+ /* int ret = 0;*/
decode_len = axis2_base64_decode_len(formatted_buf );
buff = AXIS2_MALLOC(env->allocator, decode_len);
@@ -71,16 +71,16 @@
if (decoded_len < 0)
{
oxs_error(env, ERROR_LOCATION, OXS_ERROR_DECRYPT_FAILED,
- "axis2_base64_decode_binary failed");
- return AXIS2_FAILURE;
+ "axis2_base64_decode_binary failed");
+ return AXIS2_FAILURE;
}
-
-/* EVP_DecodeInit(&ctx);
- EVP_DecodeUpdate(&ctx, (unsigned char*)buff, &len,
- (unsigned char*)b64_encoded_buf, ilen);
- EVP_DecodeFinal(&ctx, (unsigned char*)buff, &ret);
- ret += len;
-*/
+
+ /* EVP_DecodeInit(&ctx);
+ EVP_DecodeUpdate(&ctx, (unsigned char*)buff, &len,
+ (unsigned char*)b64_encoded_buf, ilen);
+ EVP_DecodeFinal(&ctx, (unsigned char*)buff, &ret);
+ ret += len;
+ */
if ((mem = BIO_new_mem_buf(buff, ilen)) == NULL)
{
/*oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
@@ -100,15 +100,15 @@
"Certificate is NULL");*/
return AXIS2_FAILURE;
}
-
- return AXIS2_SUCCESS;
+
+ return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_x509_load_from_pem(const axis2_env_t *env,
- axis2_char_t *filename,
- X509 **cert)
+ axis2_char_t *filename,
+ X509 **cert)
{
BIO *in;
@@ -124,9 +124,9 @@
{
return AXIS2_FAILURE;
}
-
+
if (-1 == BIO_reset(in) ){
- return AXIS2_FAILURE;
+ return AXIS2_FAILURE;
}
if (-1 == BIO_free(in) ){
@@ -138,11 +138,11 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_x509_load_from_pkcs12(const axis2_env_t *env,
- axis2_char_t *filename,
- axis2_char_t *password,
- X509 **cert,
- EVP_PKEY **pkey,
- STACK_OF(X509) **ca)
+ axis2_char_t *filename,
+ axis2_char_t *password,
+ X509 **cert,
+ EVP_PKEY **pkey,
+ STACK_OF(X509) **ca)
{
PKCS12 *p12 = NULL;
axis2_status_t status = AXIS2_FAILURE;
@@ -154,8 +154,8 @@
}
/*Parse*/
status = openssl_pkcs12_parse(env, password, p12, pkey,
- cert,
- ca);
+ cert,
+ ca);
if(AXIS2_FAILURE == status){
return AXIS2_FAILURE;
}
@@ -164,16 +164,16 @@
if(AXIS2_FAILURE == status){
return AXIS2_FAILURE;
}
-
+
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_x509_load_certificate(const axis2_env_t *env,
- openssl_x509_format_t format,
- axis2_char_t *filename,
- axis2_char_t *password,
- X509 **cert)
+ openssl_x509_format_t format,
+ axis2_char_t *filename,
+ axis2_char_t *password,
+ X509 **cert)
{
axis2_status_t status = AXIS2_FAILURE;
@@ -181,19 +181,19 @@
/*Load from PEM*/
status = openssl_x509_load_from_pem(env, filename, cert);
if(AXIS2_FAILURE == status){
- return AXIS2_FAILURE;
+ return AXIS2_FAILURE;
}
}else if(OPENSSL_X509_FORMAT_PKCS12 == format){
/*Load from PKCS12*/
EVP_PKEY *pkey = NULL;
STACK_OF(X509) *ca = NULL;
- status = openssl_x509_load_from_pkcs12(env, filename, password, cert,
&pkey, &ca);
- if(AXIS2_FAILURE == status){
- return AXIS2_FAILURE;
- }
+ status = openssl_x509_load_from_pkcs12(env, filename, password, cert,
&pkey, &ca);
+ if(AXIS2_FAILURE == status){
+ return AXIS2_FAILURE;
+ }
}else if(OPENSSL_X509_FORMAT_DER == format){
/*Load from DER*/
-
+
}else{
/*Unspported*/
}
@@ -209,7 +209,7 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
openssl_x509_get_cert_data(const axis2_env_t *env,
- X509 *cert)
+ X509 *cert)
{
axis2_char_t *unformatted = NULL;
axis2_char_t *core_tail = NULL;
@@ -236,7 +236,7 @@
AXIS2_EXTERN int AXIS2_CALL
openssl_x509_get_serial(const axis2_env_t *env,
- X509 *cert)
+ X509 *cert)
{
axis2_char_t *serial = NULL;
int no = 0;
@@ -249,7 +249,7 @@
AXIS2_EXTERN unsigned long AXIS2_CALL
openssl_x509_get_subject_name_hash(const axis2_env_t *env,
- X509 *cert)
+ X509 *cert)
{
unsigned long l = 0;
l=X509_subject_name_hash(cert);
@@ -258,8 +258,8 @@
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_x509_get_pubkey(const axis2_env_t *env,
- X509 *cert,
- EVP_PKEY **pubkey)
+ X509 *cert,
+ EVP_PKEY **pubkey)
{
*pubkey = X509_get_pubkey(cert);
return AXIS2_SUCCESS;
@@ -267,7 +267,7 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
openssl_x509_get_subject_key_identifier(const axis2_env_t *env,
- X509 *cert)
+ X509 *cert)
{
X509_EXTENSION *ext;
ASN1_OCTET_STRING *keyId = NULL;
@@ -281,22 +281,22 @@
/*Get ext by ID*/
index = X509_get_ext_by_NID(cert, NID_subject_key_identifier, -1);
if (index < 0) {
- oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
- "The extenension index of NID_subject_key_identifier is not
valid");
- return NULL;
+ oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
+ "The extenension index of NID_subject_key_identifier is not
valid");
+ return NULL;
}
/*Get the extension*/
ext = X509_get_ext(cert, index);
if (ext == NULL) {
oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
- "The extension for NID_subject_key_identifier is NULL");
+ "The extension for NID_subject_key_identifier is NULL");
return NULL;
}
/*Subject Key Identifier*/
keyId = (ASN1_OCTET_STRING *)X509V3_EXT_d2i(ext);
if (keyId == NULL) {
oxs_error(env, ERROR_LOCATION, OXS_ERROR_DEFAULT,
- "The SubjectKeyIdentifier is NULL");
+ "The SubjectKeyIdentifier is NULL");
return NULL;
}
memcpy(buf, keyId->data, keyId->length);
@@ -307,14 +307,14 @@
EVP_EncodeFinal(&ctx, (unsigned char*)(output+len), &ret);
ret += len;
- ski = axis2_strdup(output, env);
- return ski;
+ ski = axis2_strdup(output, env);
+ return ski;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
openssl_x509_get_info(const axis2_env_t *env,
- openssl_x509_info_type_t type,
- X509 *cert)
+ openssl_x509_info_type_t type,
+ X509 *cert)
{
BIO *out = NULL;
unsigned char *data= NULL;
@@ -325,9 +325,9 @@
if(OPENSSL_X509_INFO_SUBJECT==type){
X509_NAME_print_ex(out, X509_get_subject_name(cert), 0, 0);
}else if(OPENSSL_X509_INFO_ISSUER == type){
- X509_NAME_print_ex(out, X509_get_issuer_name(cert), 0, 0);
+ X509_NAME_print_ex(out, X509_get_issuer_name(cert), 0, 0);
}else if(OPENSSL_X509_INFO_VALID_FROM == type){
- ASN1_TIME_print(out, X509_get_notBefore(cert));
+ ASN1_TIME_print(out, X509_get_notBefore(cert));
}else if(OPENSSL_X509_INFO_VALID_TO == type){
ASN1_TIME_print(out, X509_get_notAfter(cert));
}else if(OPENSSL_X509_INFO_DATA_CERT == type){
@@ -339,7 +339,7 @@
const EVP_MD *digest = NULL;
unsigned char md[EVP_MAX_MD_SIZE];
unsigned int _n = 0;
-
+
digest = EVP_sha1();/*If we use EVP_md5(); here we can get the digest
from md5. */
if(X509_digest(cert,digest,md,&_n))
{
@@ -358,10 +358,10 @@
s=cert->signature->data;
for (i=0; i<n; i++)
{
- if ( ((i%18) == 0) && (i!=0) ) BIO_printf(out,"\n");
- BIO_printf(out,"%02x%s",s[i], (((i+1)%18) == 0)?"":":");
+ if ( ((i%18) == 0) && (i!=0) ) BIO_printf(out,"\n");
+ BIO_printf(out,"%02x%s",s[i], (((i+1)%18) == 0)?"":":");
}
-
+
}else if(OPENSSL_X509_INFO_VERSION == type){
long l = 0.0;
@@ -381,37 +381,37 @@
EVP_PKEY_free(pkey);
}
}else if(OPENSSL_X509_INFO_PUBKEY_ALGO == type){
- X509_CINF *ci = NULL;
+ X509_CINF *ci = NULL;
- ci = cert->cert_info;
- i2a_ASN1_OBJECT(out, ci->key->algor->algorithm);
+ ci = cert->cert_info;
+ i2a_ASN1_OBJECT(out, ci->key->algor->algorithm);
}
n = BIO_get_mem_data(out, &data);
result = axis2_strndup( data, n, env );
BIO_free(out);
out = NULL;
-
+
return result;
}
AXIS2_EXTERN void AXIS2_CALL
openssl_x509_print(const axis2_env_t *env,
- X509 *cert)
+ X509 *cert)
{
- printf("\n*************START PRINTING*****************\n");
- printf("OPENSSL_X509_INFO_SUBJECT : %s\n", openssl_x509_get_info(env,
OPENSSL_X509_INFO_SUBJECT,cert));
- printf("OPENSSL_X509_INFO_ISSUER : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_ISSUER ,cert));
- printf("OPENSSL_X509_INFO_VALID_FROM : %s\n",
openssl_x509_get_info(env, OPENSSL_X509_INFO_VALID_FROM,cert));
- printf("OPENSSL_X509_INFO_VALID_TO : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_VALID_TO ,cert));
- printf("OPENSSL_X509_INFO_FINGER : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_FINGER ,cert));
- printf("OPENSSL_X509_INFO_SIGNATURE : %s\n",
openssl_x509_get_info(env, OPENSSL_X509_INFO_SIGNATURE,cert));
- printf("OPENSSL_X509_INFO_VERSION : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_VERSION ,cert));
- printf("OPENSSL_X509_INFO_PUBKEY : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_PUBKEY ,cert));
- printf("OPENSSL_X509_INFO_PUBKEY_ALGO : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_PUBKEY_ALGO ,cert));
- printf("SERIAL : %u\n", openssl_x509_get_serial(env,cert));
- printf("PUBKEY : %s\n", openssl_x509_get_cert_data(env,cert));
+ printf("\n*************START PRINTING*****************\n");
+ printf("OPENSSL_X509_INFO_SUBJECT : %s\n", openssl_x509_get_info(env,
OPENSSL_X509_INFO_SUBJECT,cert));
+ printf("OPENSSL_X509_INFO_ISSUER : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_ISSUER ,cert));
+ printf("OPENSSL_X509_INFO_VALID_FROM : %s\n", openssl_x509_get_info(env,
OPENSSL_X509_INFO_VALID_FROM,cert));
+ printf("OPENSSL_X509_INFO_VALID_TO : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_VALID_TO ,cert));
+ printf("OPENSSL_X509_INFO_FINGER : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_FINGER ,cert));
+ printf("OPENSSL_X509_INFO_SIGNATURE : %s\n", openssl_x509_get_info(env,
OPENSSL_X509_INFO_SIGNATURE,cert));
+ printf("OPENSSL_X509_INFO_VERSION : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_VERSION ,cert));
+ printf("OPENSSL_X509_INFO_PUBKEY : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_PUBKEY ,cert));
+ printf("OPENSSL_X509_INFO_PUBKEY_ALGO : %s\n",
openssl_x509_get_info(env,OPENSSL_X509_INFO_PUBKEY_ALGO ,cert));
+ printf("SERIAL : %u\n", openssl_x509_get_serial(env,cert));
+ printf("PUBKEY : %s\n", openssl_x509_get_cert_data(env,cert));
- printf("\n*************END PRINTING********************\n");
+ printf("\n*************END PRINTING********************\n");
}
