Author: milinda
Date: Fri May 30 05:40:34 2008
New Revision: 661692
URL: http://svn.apache.org/viewvc?rev=661692&view=rev
Log:
Fixing wrong logic which caused secpolicy scenarion6 to fail.
Modified:
webservices/rampart/trunk/c/src/util/Makefile.am
webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
Modified: webservices/rampart/trunk/c/src/util/Makefile.am
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/Makefile.am?rev=661692&r1=661691&r2=661692&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/Makefile.am (original)
+++ webservices/rampart/trunk/c/src/util/Makefile.am Fri May 30 05:40:34 2008
@@ -13,6 +13,7 @@
librampart_util_la_LIBADD = -lssl \
-lcrypto \
+ -lsaml \
@OPENSSLLIB@
INCLUDES = -I$(top_builddir)/include \
Modified: webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
URL:
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c?rev=661692&r1=661691&r2=661692&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c
(original)
+++ webservices/rampart/trunk/c/src/util/rampart_sec_header_processor.c Fri May
30 05:40:34 2008
@@ -418,28 +418,7 @@
const axutil_env_t *env,
rampart_context_t *rampart_context)
{
-
- axis2_char_t *file_name = NULL;
- axis2_char_t *pem_buf = NULL;
-
- pem_buf = (axis2_char_t *)rampart_context_get_receiver_certificate(
- rampart_context, env);
- if(pem_buf)
- {
- return oxs_key_mgr_load_x509_cert_from_string(env, pem_buf);
- }
- else
- {
- file_name =
rampart_context_get_receiver_certificate_file(rampart_context, env);
- if(!file_name)
- {
- return NULL;
- }
- else
- {
- return oxs_key_mgr_load_x509_cert_from_pem_file(env, file_name);
- }
- }
+ return rampart_context_get_receiver_certificate(rampart_context, env);
}
static axis2_status_t
