Author: kaushalye
Date: Mon Oct 29 05:17:37 2007
New Revision: 589596
URL: http://svn.apache.org/viewvc?rev=589596&view=rev
Log:
modification to take length and offset inside derived key
Modified:
webservices/rampart/trunk/c/include/openssl_hmac.h
webservices/rampart/trunk/c/src/omxmlsec/derivation.c
webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c
Modified: webservices/rampart/trunk/c/include/openssl_hmac.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/openssl_hmac.h?rev=589596&r1=589595&r2=589596&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/openssl_hmac.h (original)
+++ webservices/rampart/trunk/c/include/openssl_hmac.h Mon Oct 29 05:17:37 2007
@@ -50,8 +50,6 @@
oxs_key_t *secret,
oxs_buffer_t *label,
oxs_buffer_t *seed,
- unsigned int length,
- unsigned int offset,
oxs_key_t *derived_key);
/* @} */
Modified: webservices/rampart/trunk/c/src/omxmlsec/derivation.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/derivation.c?rev=589596&r1=589595&r2=589596&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/derivation.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/derivation.c Mon Oct 29 05:17:37
2007
@@ -135,8 +135,7 @@
axis2_status_t status = AXIS2_FAILURE;
/*TODO check for derivation algorithm*/
- status = openssl_p_sha1(env, secret, label, seed,
oxs_key_get_length(derived_key, env),
- oxs_key_get_offset(derived_key, env),
derived_key);
+ status = openssl_p_sha1(env, secret, label, seed, derived_key);
return status;
}
Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c?rev=589596&r1=589595&r2=589596&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c (original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/hmac.c Mon Oct 29 05:17:37
2007
@@ -144,8 +144,6 @@
oxs_key_t *secret,
oxs_buffer_t *label,
oxs_buffer_t *seed,
- unsigned int length,
- unsigned int offset,
oxs_key_t *derived_key)
{
oxs_buffer_t *label_and_seed = NULL;
@@ -153,6 +151,8 @@
unsigned char *output = NULL;
axis2_char_t *dk_id = NULL;
axis2_status_t status = AXIS2_FAILURE;
+ unsigned int length;
+ unsigned int offset;
if(!derived_key)
{
@@ -165,6 +165,9 @@
oxs_error(env, ERROR_LOCATION,
OXS_ERROR_KEY_DERIVATION_FAILED,"[oxs][openssl] secret is not valid ");
return status;
}
+
+ length = oxs_key_get_length(derived_key, env);
+ offset = oxs_key_get_offset(derived_key, env);
if (!length)
{
