You are viewing a plain text version of this content. The canonical link for it is here.
Posted to java-dev@axis.apache.org by ma...@apache.org on 2007/03/12 10:06:27 UTC
svn commit: r517139 - in /webservices/axis2/trunk/c/rampart: include/
samples/secpolicy/scenario3/ samples/secpolicy/scenario4/
samples/secpolicy/scenario5/ samples/secpolicy/scenario6/
samples/secpolicy/scenario7/ src/secpolicy/builder/ src/secpolicy/...
Author: manjula
Date: Mon Mar 12 02:06:25 2007
New Revision: 517139
URL: http://svn.apache.org/viewvc?view=rev&rev=517139
Log:
changing rampart_config to keep sender and receiver public keys
in the configurations.
Modified:
webservices/axis2/trunk/c/rampart/include/rampart_context.h
webservices/axis2/trunk/c/rampart/include/rp_defines.h
webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/trunk/c/rampart/src/secpolicy/model/rampart_config.c
webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c
Modified: webservices/axis2/trunk/c/rampart/include/rampart_context.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_context.h?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_context.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_context.h Mon Mar 12 02:06:25 2007
@@ -82,12 +82,22 @@
axis2_key_type_t type);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- rampart_context_set_pub_key(rampart_context_t *rampart_context,
+ rampart_context_set_certificate(rampart_context_t *rampart_context,
const axis2_env_t *env,
- void *pub_key);
+ void *certificate);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- rampart_context_set_pub_key_type(rampart_context_t *rampart_context,
+ rampart_context_set_certificate_type(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_key_type_t type);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_receiver_certificate(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ void *receiver_certificate);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rampart_context_set_receiver_certificate_type(rampart_context_t *rampart_context,
const axis2_env_t *env,
axis2_key_type_t type);
@@ -142,15 +152,25 @@
const axis2_env_t *env);
AXIS2_EXTERN void *AXIS2_CALL
- rampart_context_get_pub_key(
+ rampart_context_get_certificate(
rampart_context_t *rampart_context,
const axis2_env_t *env);
AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
- rampart_context_get_pub_key_type(
+ rampart_context_get_certificate_type(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN void *AXIS2_CALL
+ rampart_context_get_receiver_certificate(
rampart_context_t *rampart_context,
const axis2_env_t *env);
+ AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
+ rampart_context_get_receiver_certificate_type(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_user(
rampart_context_t *rampart_context,
@@ -349,7 +369,12 @@
const axis2_env_t *env);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- rampart_context_get_public_key_file(
+ rampart_context_get_certificate_file(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rampart_context_get_receiver_certificate_file(
rampart_context_t *rampart_context,
const axis2_env_t *env);
Modified: webservices/axis2/trunk/c/rampart/include/rp_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rp_defines.h?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rp_defines.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rp_defines.h Mon Mar 12 02:06:25 2007
@@ -192,7 +192,8 @@
#define RP_PASSWORD_TYPE "PasswordType"
#define RP_PLAINTEXT "plainText"
#define RP_DIGEST "Digest"
- #define RP_PUBLIC_KEY "PublicKey"
+ #define RP_RECEIVER_CERTIFICATE "ReceiverCertificate"
+ #define RP_CERTIFICATE "Certificate"
#define RP_PRIVATE_KEY "PrivateKey"
#define RP_TIME_TO_LIVE "TimeToLive"
Modified: webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rp_rampart_config.h Mon Mar 12 02:06:25 2007
@@ -99,14 +99,24 @@
axis2_char_t *private_key_file);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
- rp_rampart_config_get_public_key_file(
+ rp_rampart_config_get_receiver_certificate_file(
rp_rampart_config_t *rampart_config,
const axis2_env_t *env);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
- rp_rampart_config_set_public_key_file(rp_rampart_config_t *rampart_config,
+ rp_rampart_config_set_receiver_certificate_file(rp_rampart_config_t *rampart_config,
const axis2_env_t *env,
- axis2_char_t *public_key_file);
+ axis2_char_t *receiver_certificate_file);
+
+ AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+ rp_rampart_config_get_certificate_file(
+ rp_rampart_config_t *rampart_config,
+ const axis2_env_t *env);
+
+ AXIS2_EXTERN axis2_status_t AXIS2_CALL
+ rp_rampart_config_set_certificate_file(rp_rampart_config_t *rampart_config,
+ const axis2_env_t *env,
+ axis2_char_t *certificate_file);
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rp_rampart_config_get_time_to_live(
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/client-outgoing-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario3/service-incoming-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/client-outgoing-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario4/service-incoming-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/client-outgoing-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario5/service-incoming-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/client-outgoing-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -49,7 +49,8 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario6/service-incoming-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -49,7 +49,8 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-incoming-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/client-outgoing-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>a</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/b_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/ahome/a_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-incoming-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml (original)
+++ webservices/axis2/trunk/c/rampart/samples/secpolicy/scenario7/service-outgoing-secpolicy.xml Mon Mar 12 02:06:25 2007
@@ -54,7 +54,8 @@
<rampc:EncryptionUser>b</rampc:EncryptionUser>
<rampc:PasswordType>Digest</rampc:PasswordType>
<rampc:PasswordCallbackClass>/home/AXIS2_USER/axis2/c/deploy/bin/samples/rampart/callback/libpwcb.so</rampc:PasswordCallbackClass>
- <rampc:PublicKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:PublicKey>
+ <rampc:ReceiverCertificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/a_cert.cert</rampc:ReceiverCertificate>
+ <rampc:Certificate>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_cert.cert</rampc:Certificate>
<rampc:PrivateKey>/home/AXIS2_USER/axis2/c/rampart/samples/keys/bhome/b_store.pfx</rampc:PrivateKey>
</rampc:RampartConfig>
</wsp:All>
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/builder/rampart_config_builder.c Mon Mar 12 02:06:25 2007
@@ -146,17 +146,30 @@
return AXIS2_FAILURE;
}
- else if(AXIS2_STRCMP(local_name,RP_PUBLIC_KEY)==0)
+ else if(AXIS2_STRCMP(local_name,RP_CERTIFICATE)==0)
{
- if(rp_match_rampart_config_qname(env,RP_PUBLIC_KEY,node,element))
+ if(rp_match_rampart_config_qname(env,RP_CERTIFICATE,node,element))
{
- axis2_char_t *public_key_file = NULL;
- public_key_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
- return rp_rampart_config_set_public_key_file(rampart_config,env,public_key_file);
+ axis2_char_t *certificate_file = NULL;
+ certificate_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ return rp_rampart_config_set_certificate_file(rampart_config,env,certificate_file);
}
else
return AXIS2_FAILURE;
}
+
+ else if(AXIS2_STRCMP(local_name,RP_RECEIVER_CERTIFICATE)==0)
+ {
+ if(rp_match_rampart_config_qname(env,RP_RECEIVER_CERTIFICATE,node,element))
+ {
+ axis2_char_t *receiver_certificate_file = NULL;
+ receiver_certificate_file = AXIOM_ELEMENT_GET_TEXT(element,env,node);
+ return rp_rampart_config_set_receiver_certificate_file(rampart_config,env,receiver_certificate_file);
+ }
+ else
+ return AXIS2_FAILURE;
+ }
+
else if(AXIS2_STRCMP(local_name,RP_PRIVATE_KEY)==0)
{
if(rp_match_rampart_config_qname(env,RP_PRIVATE_KEY,node,element))
Modified: webservices/axis2/trunk/c/rampart/src/secpolicy/model/rampart_config.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/secpolicy/model/rampart_config.c?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/secpolicy/model/rampart_config.c (original)
+++ webservices/axis2/trunk/c/rampart/src/secpolicy/model/rampart_config.c Mon Mar 12 02:06:25 2007
@@ -26,7 +26,8 @@
axis2_char_t *authenticate_module;
axis2_char_t *password_type;
axis2_char_t *time_to_live;
- axis2_char_t *public_key_file;
+ axis2_char_t *receiver_certificate_file;
+ axis2_char_t *certificate_file;
axis2_char_t *private_key_file;
};
@@ -49,7 +50,8 @@
rampart_config->encryption_user = NULL;
rampart_config->password_callback_class = NULL;
rampart_config->private_key_file = NULL;
- rampart_config->public_key_file = NULL;
+ rampart_config->receiver_certificate_file = NULL;
+ rampart_config->certificate_file = NULL;
rampart_config->authenticate_module = NULL;
rampart_config->password_type = NULL;
rampart_config->time_to_live = NULL;
@@ -208,24 +210,46 @@
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-rp_rampart_config_get_public_key_file(
+rp_rampart_config_get_receiver_certificate_file(
rp_rampart_config_t *rampart_config,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return rampart_config->public_key_file;
+ return rampart_config->receiver_certificate_file;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rp_rampart_config_set_public_key_file(rp_rampart_config_t *rampart_config,
+rp_rampart_config_set_receiver_certificate_file(rp_rampart_config_t *rampart_config,
const axis2_env_t *env,
- axis2_char_t *public_key_file)
+ axis2_char_t *receiver_certificate_file)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error,public_key_file,AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error,receiver_certificate_file,AXIS2_FAILURE);
- rampart_config->public_key_file = public_key_file;
+ rampart_config->receiver_certificate_file = receiver_certificate_file;
+ return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+rp_rampart_config_get_certificate_file(
+ rp_rampart_config_t *rampart_config,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ return rampart_config->certificate_file;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+rp_rampart_config_set_certificate_file(rp_rampart_config_t *rampart_config,
+ const axis2_env_t *env,
+ axis2_char_t *certificate_file)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error,certificate_file,AXIS2_FAILURE);
+
+ rampart_config->certificate_file = certificate_file;
return AXIS2_SUCCESS;
}
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_context.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_context.c?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_context.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_context.c Mon Mar 12 02:06:25 2007
@@ -25,8 +25,10 @@
axiom_node_t *policy_node;
void *prv_key;
axis2_key_type_t prv_key_type;
- void *pub_key;
- axis2_key_type_t pub_key_type;
+ void *certificate;
+ axis2_key_type_t certificate_type;
+ void *receiver_certificate;
+ axis2_key_type_t receiver_certificate_type;
axis2_char_t *user;
axis2_char_t *password;
axis2_char_t *prv_key_password;
@@ -123,8 +125,10 @@
rampart_context->policy_node = NULL;
rampart_context->prv_key = NULL;
rampart_context->prv_key_type = 0;
- rampart_context->pub_key = NULL;
- rampart_context->pub_key_type = 0;
+ rampart_context->certificate = NULL;
+ rampart_context->certificate_type = 0;
+ rampart_context->receiver_certificate = NULL;
+ rampart_context->receiver_certificate_type = 0;
rampart_context->user = 0;
rampart_context->password = NULL;
rampart_context->prv_key_password = NULL;
@@ -203,26 +207,50 @@
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rampart_context_set_pub_key(rampart_context_t *rampart_context,
+rampart_context_set_certificate(rampart_context_t *rampart_context,
const axis2_env_t *env,
- void *pub_key)
+ void *certificate)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- AXIS2_PARAM_CHECK(env->error,pub_key,AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error,certificate,AXIS2_FAILURE);
- rampart_context->pub_key = pub_key;
+ rampart_context->certificate = certificate;
return AXIS2_SUCCESS;
}
AXIS2_EXTERN axis2_status_t AXIS2_CALL
-rampart_context_set_pub_key_type(rampart_context_t *rampart_context,
+rampart_context_set_certificate_type(rampart_context_t *rampart_context,
const axis2_env_t *env,
axis2_key_type_t type)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
AXIS2_PARAM_CHECK(env->error,type,AXIS2_FAILURE);
- rampart_context->pub_key_type = type;
+ rampart_context->certificate_type = type;
+ return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+rampart_context_set_receiver_certificate(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ void *receiver_certificate)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error,receiver_certificate,AXIS2_FAILURE);
+
+ rampart_context->receiver_certificate = receiver_certificate;
+ return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+rampart_context_set_receiver_certificate_type(rampart_context_t *rampart_context,
+ const axis2_env_t *env,
+ axis2_key_type_t type)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_PARAM_CHECK(env->error,type,AXIS2_FAILURE);
+
+ rampart_context->receiver_certificate_type = type;
return AXIS2_SUCCESS;
}
@@ -342,25 +370,48 @@
}
AXIS2_EXTERN void *AXIS2_CALL
-rampart_context_get_pub_key(
+rampart_context_get_certificate(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, NULL);
+
+ return rampart_context->certificate;
+}
+
+AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
+rampart_context_get_certificate_type(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env)
+{
+ AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+
+ return rampart_context->certificate_type;
+}
+
+
+AXIS2_EXTERN void *AXIS2_CALL
+rampart_context_get_receiver_certificate(
rampart_context_t *rampart_context,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, NULL);
- return rampart_context->pub_key;
+ return rampart_context->receiver_certificate;
}
AXIS2_EXTERN axis2_key_type_t AXIS2_CALL
-rampart_context_get_pub_key_type(
+rampart_context_get_receiver_certificate_type(
rampart_context_t *rampart_context,
const axis2_env_t *env)
{
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
- return rampart_context->pub_key_type;
+ return rampart_context->receiver_certificate_type;
}
+
+
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_user(
rampart_context_t *rampart_context,
@@ -1497,8 +1548,6 @@
return NULL;
}
-
-
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_digest_mtd(
rampart_context_t *rampart_context,
@@ -1517,7 +1566,7 @@
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
-rampart_context_get_public_key_file(
+rampart_context_get_certificate_file(
rampart_context_t *rampart_context,
const axis2_env_t *env)
{
@@ -1526,11 +1575,28 @@
rampart_config = rp_secpolicy_get_rampart_config(rampart_context->secpolicy,env);
if(rampart_config)
{
- return rp_rampart_config_get_public_key_file(rampart_config,env);
+ return rp_rampart_config_get_certificate_file(rampart_config,env);
}
else
return NULL;
}
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+rampart_context_get_receiver_certificate_file(
+ rampart_context_t *rampart_context,
+ const axis2_env_t *env)
+{
+ rp_rampart_config_t *rampart_config = NULL;
+
+ rampart_config = rp_secpolicy_get_rampart_config(rampart_context->secpolicy,env);
+ if(rampart_config)
+ {
+ return rp_rampart_config_get_receiver_certificate_file(rampart_config,env);
+ }
+ else
+ return NULL;
+}
+
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
rampart_context_get_private_key_file(
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_encryption.c Mon Mar 12 02:06:25 2007
@@ -219,11 +219,11 @@
oxs_asym_ctx_set_algorithm(asym_ctx, env, enc_asym_algo);
/*First check whether the public key is set*/
- key_buf = rampart_context_get_pub_key(rampart_context,env);
+ key_buf = rampart_context_get_receiver_certificate(rampart_context,env);
if(key_buf)
{
axis2_key_type_t type = 0;
- type = rampart_context_get_pub_key_type(rampart_context,env);
+ type = rampart_context_get_receiver_certificate_type(rampart_context,env);
if(type == AXIS2_KEY_TYPE_PEM)
{
oxs_asym_ctx_set_format(asym_ctx, env, OXS_ASYM_CTX_FORMAT_PEM);
@@ -234,7 +234,7 @@
/*Buffer is null load from the file*/
else
{
- certificate_file = rampart_context_get_public_key_file(rampart_context,env);
+ certificate_file = rampart_context_get_receiver_certificate_file(rampart_context,env);
oxs_asym_ctx_set_file_name(asym_ctx, env, certificate_file);
oxs_asym_ctx_set_format(asym_ctx, env, oxs_util_get_format_by_file_extension(env, certificate_file));
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c?view=diff&rev=517139&r1=517138&r2=517139
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_signature.c Mon Mar 12 02:06:25 2007
@@ -56,10 +56,10 @@
oxs_x509_cert_t *cert = NULL;
axis2_char_t *certificate_file = NULL;
- key_buf = rampart_context_get_pub_key(rampart_context,env);
+ key_buf = rampart_context_get_certificate(rampart_context,env);
if(key_buf)
{
- type = rampart_context_get_pub_key_type(rampart_context,env);
+ type = rampart_context_get_certificate_type(rampart_context,env);
if(type == AXIS2_KEY_TYPE_PEM)
{
cert = oxs_key_mgr_load_x509_cert_from_string(env,(axis2_char_t *)key_buf);
@@ -78,7 +78,7 @@
}
else
{
- certificate_file = rampart_context_get_public_key_file(rampart_context,env);
+ certificate_file = rampart_context_get_certificate_file(rampart_context,env);
if(certificate_file)
{
cert = oxs_key_mgr_load_x509_cert_from_pem_file(env,certificate_file);
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org