Author: supun
Date: Sun Apr 27 23:33:39 2008
New Revision: 652069
URL: http://svn.apache.org/viewvc?rev=652069&view=rev
Log:
PKCS12 integration fixing the bugs.
Modified:
webservices/rampart/scratch/c/pkcs/c/include/oxs_key_mgr.h
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/client-policy.xml
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/services.xml
webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/openssl/pkcs12_keystore.c
Modified: webservices/rampart/scratch/c/pkcs/c/include/oxs_key_mgr.h
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/pkcs/c/include/oxs_key_mgr.h?rev=652069&r1=652068&r2=652069&view=diff
==============================================================================
--- webservices/rampart/scratch/c/pkcs/c/include/oxs_key_mgr.h (original)
+++ webservices/rampart/scratch/c/pkcs/c/include/oxs_key_mgr.h Sun Apr 27
23:33:39 2008
@@ -279,6 +279,12 @@
oxs_key_mgr_t *key_mgr,
const axutil_env_t *env);
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ oxs_key_mgr_set_key_store(
+ oxs_key_mgr_t *key_mgr,
+ const axutil_env_t *env,
+ pkcs12_keystore_t *key_store);
+
/** @} */
#ifdef __cplusplus
}
Modified:
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/client-policy.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/client-policy.xml?rev=652069&r1=652068&r2=652069&view=diff
==============================================================================
---
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/client-policy.xml
(original)
+++
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/client-policy.xml
Sun Apr 27 23:33:39 2008
@@ -48,7 +48,7 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_kstore.p12</rampc:PKCS12KeyStore>
+
<rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/ahome/alice_keystore.p12</rampc:PKCS12KeyStore>
</rampc:RampartConfig>
</wsp:All>
</wsp:ExactlyOne>
Modified:
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/services.xml
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/services.xml?rev=652069&r1=652068&r2=652069&view=diff
==============================================================================
---
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/services.xml
(original)
+++
webservices/rampart/scratch/c/pkcs/c/samples/secpolicy/scenario3/services.xml
Sun Apr 27 23:33:39 2008
@@ -60,7 +60,7 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>AXIS2C_HOME/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
-
<rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_kstore.p12</rampc:PKCS12KeyStore>
+
<rampc:PKCS12KeyStore>AXIS2C_HOME/bin/samples/rampart/keys/bhome/bob_keystore.p12</rampc:PKCS12KeyStore>
</wsp:All>
</wsp:ExactlyOne>
</wsp:Policy>
Modified:
webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/openssl/pkcs12_keystore.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/openssl/pkcs12_keystore.c?rev=652069&r1=652068&r2=652069&view=diff
==============================================================================
--- webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/openssl/pkcs12_keystore.c
(original)
+++ webservices/rampart/scratch/c/pkcs/c/src/omxmlsec/openssl/pkcs12_keystore.c
Sun Apr 27 23:33:39 2008
@@ -82,7 +82,7 @@
if(own_cert)
{
- pkcs12_keystore_populate_oxs_cert(env, own_cert);
+ keystore->cert = pkcs12_keystore_populate_oxs_cert(env, own_cert);
}
if(other_certs)
