You are viewing a plain text version of this content. The canonical link for it is here.
Posted to axis-cvs@ws.apache.org by ma...@apache.org on 2007/06/04 06:18:07 UTC
svn commit: r544042 - in /webservices/axis2/trunk/c/neethi:
include/rp_defines.h src/secpolicy/builder/x509_token_builder.c
Author: manjula
Date: Sun Jun 3 21:18:06 2007
New Revision: 544042
URL: http://svn.apache.org/viewvc?view=rev&rev=544042
Log:
Handling assertions in x509_builder.
Modified:
webservices/axis2/trunk/c/neethi/include/rp_defines.h
webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.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?view=diff&rev=544042&r1=544041&r2=544042
==============================================================================
--- webservices/axis2/trunk/c/neethi/include/rp_defines.h (original)
+++ webservices/axis2/trunk/c/neethi/include/rp_defines.h Sun Jun 3 21:18:06 2007
@@ -166,7 +166,7 @@
#define RP_INCLUDE_ALWAYS_TO_RECIPIENT "http://schemas.xmlsoap.org/ws/2005/07/securitypolicy/IncludeToken/AlwaysToRecipient"
#define RP_REQUIRE_KEY_IDENTIFIRE_REFERENCE "RequireKeyIdentifireReference"
-#define RP_REQUIRE_ISSUER_SERIAL_REFERENCE "RequireIssuerSerializerReference"
+#define RP_REQUIRE_ISSUER_SERIAL_REFERENCE "RequireIssuerSerialReference"
#define RP_REQUIRE_EMBEDDED_TOKEN_REFERENCE "RequireEmbeddedTokenReference"
#define RP_REQUIRE_THUMBPRINT_REFERENCE "RequireThumbprintReference"
#define RP_REQUIRE_DERIVED_KEYS "RequireDerivedKeys"
Modified: webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c?view=diff&rev=544042&r1=544041&r2=544042
==============================================================================
--- webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c (original)
+++ webservices/axis2/trunk/c/neethi/src/secpolicy/builder/x509_token_builder.c Sun Jun 3 21:18:06 2007
@@ -99,7 +99,6 @@
axutil_array_list_t *arraylist = NULL;
neethi_assertion_t *assertion = NULL;
neethi_assertion_type_t type;
- void *value = NULL;
int i = 0;
@@ -109,37 +108,32 @@
{
operator = (neethi_operator_t *)axutil_array_list_get(arraylist, env, i);
assertion = (neethi_assertion_t *)neethi_operator_get_value(operator, env);
- value = neethi_assertion_get_value(assertion, env);
type = neethi_assertion_get_type(assertion, env);
- if(value)
+ if(type == ASSERTION_TYPE_REQUIRE_KEY_IDENTIFIRE_REFERENCE)
{
- if(type == ASSERTION_TYPE_REQUIRE_KEY_IDENTIFIRE_REFERENCE)
- {
- rp_x509_token_set_require_key_identifier_reference(x509_token, env, AXIS2_TRUE);
- }
- else if(type == ASSERTION_TYPE_REQUIRE_ISSUER_SERIAL_REFERENCE)
- {
- rp_x509_token_set_require_issuer_serial_reference(x509_token, env, AXIS2_TRUE);
- }
- if(type == ASSERTION_TYPE_REQUIRE_EMBEDDED_TOKEN_REFERENCE)
- {
- rp_x509_token_set_require_embedded_token_reference(x509_token, env, AXIS2_TRUE);
- }
- else if(type == ASSERTION_TYPE_REQUIRE_THUMBPRINT_REFERENCE)
- {
- rp_x509_token_set_require_thumb_print_reference(x509_token, env, AXIS2_TRUE);
- }
- else if(type == ASSERTION_TYPE_WSS_X509_V1_TOKEN_10)
- {
- rp_x509_token_set_token_version_and_type(x509_token, env, RP_WSS_X509_V1_TOKEN_10);
- }
- else if(type == ASSERTION_TYPE_WSS_X509_V3_TOKEN_10)
- {
- rp_x509_token_set_token_version_and_type(x509_token, env, RP_WSS_X509_V3_TOKEN_10);
- }
- else return AXIS2_FAILURE;
- }
+ rp_x509_token_set_require_key_identifier_reference(x509_token, env, AXIS2_TRUE);
+ }
+ else if(type == ASSERTION_TYPE_REQUIRE_ISSUER_SERIAL_REFERENCE)
+ {
+ rp_x509_token_set_require_issuer_serial_reference(x509_token, env, AXIS2_TRUE);
+ }
+ if(type == ASSERTION_TYPE_REQUIRE_EMBEDDED_TOKEN_REFERENCE)
+ {
+ rp_x509_token_set_require_embedded_token_reference(x509_token, env, AXIS2_TRUE);
+ }
+ else if(type == ASSERTION_TYPE_REQUIRE_THUMBPRINT_REFERENCE)
+ {
+ rp_x509_token_set_require_thumb_print_reference(x509_token, env, AXIS2_TRUE);
+ }
+ else if(type == ASSERTION_TYPE_WSS_X509_V1_TOKEN_10)
+ {
+ rp_x509_token_set_token_version_and_type(x509_token, env, RP_WSS_X509_V1_TOKEN_10);
+ }
+ else if(type == ASSERTION_TYPE_WSS_X509_V3_TOKEN_10)
+ {
+ rp_x509_token_set_token_version_and_type(x509_token, env, RP_WSS_X509_V3_TOKEN_10);
+ }
else return AXIS2_FAILURE;
}
return AXIS2_SUCCESS;
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org