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 mi...@apache.org on 2008/02/15 02:09:45 UTC
svn commit: r627924 - in /webservices/axis2/trunk/c/neethi:
include/rp_defines.h src/secpolicy/builder/rampart_config_builder.c
src/secpolicy/builder/token_identifier.c src/secpolicy/model/rampart_config.c
Author: milinda
Date: Thu Feb 14 17:09:44 2008
New Revision: 627924
URL: http://svn.apache.org/viewvc?rev=627924&view=rev
Log:
Added PKCS12 Key Store support to rampart_config. And fix missing return statement in token_identifier.c
Modified:
webservices/axis2/trunk/c/neethi/include/rp_defines.h
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c
webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c
Modified: webservices/axis2/trunk/c/neethi/include/rp_defines.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/include/rp_defines.h?rev=627924&r1=627923&r2=627924&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/include/rp_defines.h (original)
+++ webservices/axis2/trunk/c/neethi/include/rp_defines.h Thu Feb 14 17:09:44 2008
@@ -201,6 +201,7 @@
#define RP_RECEIVER_CERTIFICATE "ReceiverCertificate"
#define RP_CERTIFICATE "Certificate"
#define RP_PRIVATE_KEY "PrivateKey"
+#define RP_PKCS12_KEY_STORE "PKCS12KeyStore"
#define RP_TIME_TO_LIVE "TimeToLive"
#define RP_RD "ReplayDetection"
#define RP_RD_MODULE "ReplayDetectionModule"
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c?rev=627924&r1=627923&r2=627924&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/rampart_config_builder.c Thu Feb 14 17:09:44 2008
@@ -237,6 +237,18 @@
else
return AXIS2_FAILURE;
}
+ else if (axutil_strcmp(local_name, RP_PKCS12_KEY_STORE) == 0)
+ {
+ if (rp_match_rampart_config_qname(env, RP_PKCS12_KEY_STORE, node, element))
+ {
+ axis2_char_t *pkcs12_key_store = NULL;
+ pkcs12_key_store = axiom_element_get_text(element, env, node);
+ return rp_rampart_config_set_pkcs12_file(rampart_config, env,
+ pkcs12_key_store);
+ }
+ else
+ return AXIS2_FAILURE;
+ }
else if (axutil_strcmp(local_name, RP_TIME_TO_LIVE) == 0)
{
if (rp_match_rampart_config_qname(env, RP_TIME_TO_LIVE, node, element))
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c?rev=627924&r1=627923&r2=627924&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/token_identifier.c Thu Feb 14 17:09:44 2008
@@ -63,12 +63,14 @@
rp_saml_token_t *saml_token = NULL;
saml_token = (rp_saml_token_t *) value;
rp_property_set_value(token, env, saml_token, RP_PROPERTY_SAML_TOKEN);
+ return AXIS2_SUCCESS;
}
else if (type == ASSERTION_TYPE_ISSUED_TOKEN)
{
rp_issued_token_t *issued_token = NULL;
issued_token = (rp_issued_token_t *) value;
rp_property_set_value(token, env, issued_token, RP_PROPERTY_ISSUED_TOKEN);
+ return AXIS2_SUCCESS;
}
else
return AXIS2_FAILURE;
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c?rev=627924&r1=627923&r2=627924&view=diff
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/model/rampart_config.c Thu Feb 14 17:09:44 2008
@@ -31,6 +31,7 @@
axis2_char_t *receiver_certificate_file;
axis2_char_t *certificate_file;
axis2_char_t *private_key_file;
+ axis2_char_t *pkcs12_file;
axis2_char_t *rd_val;
int ref;
};
@@ -342,6 +343,34 @@
rampart_config->time_to_live = time_to_live;
return AXIS2_SUCCESS;
+}
+
+AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+rp_rampart_config_get_pkcs12_file(
+ rp_rampart_config_t * rampart_config,
+ const axutil_env_t * env)
+{
+ return rampart_config->pkcs12_file;
+}
+
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+rp_rampart_config_set_pkcs12_file(
+ rp_rampart_config_t * rampart_config,
+ const axutil_env_t *env,
+ axis2_char_t * pkcs12_file)
+{
+ if(rampart_config)
+ {
+ if(pkcs12_file)
+ {
+ rampart_config->pkcs12_file = pkcs12_file;
+ return AXIS2_SUCCESS;
+ }
+
+ return AXIS2_FAILURE;
+ }
+
+ return AXIS2_FAILURE;
}
AXIS2_EXTERN axis2_char_t *AXIS2_CALL
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org