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 su...@apache.org on 2008/04/06 13:46:27 UTC
svn commit: r645228 - in /webservices/rampart/scratch/c/pkcs/c:
build/win32/makefile src/omxmlsec/key_mgr.c
Author: supun
Date: Sun Apr 6 04:46:22 2008
New Revision: 645228
URL: http://svn.apache.org/viewvc?rev=645228&view=rev
Log: (empty)
Modified:
webservices/rampart/scratch/c/pkcs/c/build/win32/makefile
webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/key_mgr.c
Modified: webservices/rampart/scratch/c/pkcs/c/build/win32/makefile
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/pkcs/c/build/win32/makefile?rev=645228&r1=645227&r2=645228&view=diff
==============================================================================
--- webservices/rampart/scratch/c/pkcs/c/build/win32/makefile (original)
+++ webservices/rampart/scratch/c/pkcs/c/build/win32/makefile Sun Apr 6 04:46:22 2008
@@ -43,7 +43,7 @@
CC = @cl.exe
CFLAGS = /D "WIN32" /D "_WINDOWS" /D "_MBCS" /D "AXIS2_DECLARE_EXPORT" \
- /D "AXIS2_SVR_MULTI_THREADED" /w /nologo $(AXIS2_INCLUDE_PATH)
+ /D "AXIS2_SVR_MULTI_THREADED" /W4 /nologo $(AXIS2_INCLUDE_PATH)
################### linker options
Modified: webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/key_mgr.c
URL: http://svn.apache.org/viewvc/webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/key_mgr.c?rev=645228&r1=645227&r2=645228&view=diff
==============================================================================
--- webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/key_mgr.c (original)
+++ webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/key_mgr.c Sun Apr 6 04:46:22 2008
@@ -238,7 +238,7 @@
}
else
{ /*Buffer is null load from the file*/
- prv_key_file = key_mgr->private_key_file;
+ prv_key_file = axutil_strdup(env, oxs_key_mgr_get_private_key_file(key_mgr, env));
if(!prv_key_file)
{
AXIS2_LOG_ERROR(env->log, AXIS2_LOG_SI,
@@ -247,7 +247,7 @@
}
/*Get the password to retrieve the key from key store*/
- password = key_mgr->prv_key_password;
+ password = axutil_strdup(env, oxs_key_mgr_get_prv_key_password(key_mgr, env));
if(oxs_util_get_format_by_file_extension(env, prv_key_file) ==
OXS_ASYM_CTX_FORMAT_PKCS12)
@@ -630,7 +630,7 @@
EVP_PKEY *prvkey = NULL;
/*Read EVP_PKEY*/
- status = openssl_pem_read_pkey(env, password, filename, OPENSSL_PEM_PKEY_TYPE_PRIVATE_KEY, &prvkey);
+ status = openssl_pem_read_pkey(env, filename, password, OPENSSL_PEM_PKEY_TYPE_PRIVATE_KEY, &prvkey);
/*Populate*/
if(prvkey){