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 na...@apache.org on 2006/09/26 10:41:17 UTC
svn commit: r449948 - in /webservices/axis2/trunk/c/rampart/src:
omxmlsec/enc_engine.c omxmlsec/key.c omxmlsec/openssl/cipher_ctx.c
util/rampart_crypto_engine.c util/timestamp_token.c util/username_token.c
Author: nandika
Date: Tue Sep 26 01:41:15 2006
New Revision: 449948
URL: http://svn.apache.org/viewvc?view=rev&rev=449948
Log:
compilation problems fixed
Modified:
webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c
webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c
webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c
webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
webservices/axis2/trunk/c/rampart/src/util/username_token.c
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c?view=diff&rev=449948&r1=449947&r2=449948
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/enc_engine.c Tue Sep 26 01:41:15 2006
@@ -13,7 +13,7 @@
* See the License for the specific language governing permissions and
* limitations under the License.
*/
-
+#include <oxs_axiom.h>
#include <axis2_qname.h>
#include <axiom_namespace.h>
#include <axiom_node.h>
@@ -35,7 +35,7 @@
#include <openssl_rsa.h>
#include <oxs_token_cipher_value.h>
#include <oxs_iv.h>
-
+#include <openssl_util.h>
typedef struct oxs_enc_engine_impl
{
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c?view=diff&rev=449948&r1=449947&r2=449948
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/key.c Tue Sep 26 01:41:15 2006
@@ -348,7 +348,7 @@
axis2_status_t status = AXIS2_FAILURE;
buf = oxs_buffer_create(env);
- status = oxs_buffer_read_file(env, buf, file_name);
+ status = OXS_BUFFER_READ_FILE(buf, env, file_name);
status = OXS_KEY_POPULATE(key, env,
OXS_BUFFER_GET_DATA(buf, env), file_name,
Modified: webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c?view=diff&rev=449948&r1=449947&r2=449948
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c (original)
+++ webservices/axis2/trunk/c/rampart/src/omxmlsec/openssl/cipher_ctx.c Tue Sep 26 01:41:15 2006
@@ -185,8 +185,7 @@
const EVP_CIPHER* AXIS2_CALL
openssl_cipher_ctx_get_cipher(openssl_cipher_ctx_t *ctx,
- const axis2_env_t *env
- )
+ const axis2_env_t *env)
{
openssl_cipher_ctx_impl_t * ctx_impl = NULL;
AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
@@ -201,7 +200,7 @@
)
{
openssl_cipher_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
return ctx_impl->key ;
@@ -213,7 +212,7 @@
)
{
openssl_cipher_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
return ctx_impl->iv ;
@@ -225,7 +224,7 @@
)
{
openssl_cipher_ctx_impl_t * ctx_impl = NULL;
- AXIS2_ENV_CHECK(env, AXIS2_FAILURE);
+ AXIS2_ENV_CHECK(env, NULL);
ctx_impl = AXIS2_INTF_TO_IMPL(ctx);
return ctx_impl->pad;
Modified: webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c?view=diff&rev=449948&r1=449947&r2=449948
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/rampart_crypto_engine.c Tue Sep 26 01:41:15 2006
@@ -33,6 +33,7 @@
#include <rampart_constants.h>
#include <oxs_token_reference_list.h>
#include <axis2_array_list.h>
+#include <oxs_axiom.h>
typedef struct rampart_crypto_engine_impl
{
Modified: webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c?view=diff&rev=449948&r1=449947&r2=449948
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/timestamp_token.c Tue Sep 26 01:41:15 2006
@@ -24,6 +24,7 @@
#include <rampart_crypto_util.h>
#include <rampart_util.h>
#include <rampart_timestamp_token.h>
+#include <oxs_axiom.h>
typedef struct rampart_timestamp_token_impl
{
Modified: webservices/axis2/trunk/c/rampart/src/util/username_token.c
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/src/util/username_token.c?view=diff&rev=449948&r1=449947&r2=449948
==============================================================================
--- webservices/axis2/trunk/c/rampart/src/util/username_token.c (original)
+++ webservices/axis2/trunk/c/rampart/src/util/username_token.c Tue Sep 26 01:41:15 2006
@@ -26,6 +26,7 @@
#include <rampart_util.h>
#include <rampart_callback.h>
#include <rampart_handler_util.h>
+#include <oxs_axiom.h>
typedef struct rampart_username_token_impl
{
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org