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 da...@apache.org on 2006/08/11 11:11:03 UTC
svn commit: r430730 - in /webservices/axis2/trunk/c/rampart/include:
openssl_cipher_ctx.h openssl_cipher_property.h openssl_constants.h
openssl_rsa.h oxs_cipher.h oxs_error.h oxs_iv.h oxs_token_data_reference.h
rampart_action.h
Author: damitha
Date: Fri Aug 11 02:11:02 2006
New Revision: 430730
URL: http://svn.apache.org/viewvc?rev=430730&view=rev
Log:
Adding oxs_iv.h and applying patches
Added:
webservices/axis2/trunk/c/rampart/include/oxs_iv.h
Modified:
webservices/axis2/trunk/c/rampart/include/openssl_cipher_ctx.h
webservices/axis2/trunk/c/rampart/include/openssl_cipher_property.h
webservices/axis2/trunk/c/rampart/include/openssl_constants.h
webservices/axis2/trunk/c/rampart/include/openssl_rsa.h
webservices/axis2/trunk/c/rampart/include/oxs_cipher.h
webservices/axis2/trunk/c/rampart/include/oxs_error.h
webservices/axis2/trunk/c/rampart/include/oxs_token_data_reference.h
webservices/axis2/trunk/c/rampart/include/rampart_action.h
Modified: webservices/axis2/trunk/c/rampart/include/openssl_cipher_ctx.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/openssl_cipher_ctx.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/openssl_cipher_ctx.h (original)
+++ webservices/axis2/trunk/c/rampart/include/openssl_cipher_ctx.h Fri Aug 11 02:11:02 2006
@@ -68,6 +68,9 @@
int encrypt,
const unsigned char* cipher_name
);
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+openssl_evp_block_cipher_ctx_reset(const axis2_env_t *env, openssl_evp_block_cipher_ctx_ptr bc_ctx);
+
/*TODO write the free function*/
Modified: webservices/axis2/trunk/c/rampart/include/openssl_cipher_property.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/openssl_cipher_property.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/openssl_cipher_property.h (original)
+++ webservices/axis2/trunk/c/rampart/include/openssl_cipher_property.h Fri Aug 11 02:11:02 2006
@@ -47,6 +47,9 @@
openssl_cipher_property_create(const axis2_env_t *env);
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+openssl_cipher_property_reset(const axis2_env_t *env, cipher_prop_ptr cprop);
+
/*TODO write the free function*/
AXIS2_EXTERN axis2_status_t AXIS2_CALL
openssl_cipher_property_free(const axis2_env_t *env );
Modified: webservices/axis2/trunk/c/rampart/include/openssl_constants.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/openssl_constants.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/openssl_constants.h (original)
+++ webservices/axis2/trunk/c/rampart/include/openssl_constants.h Fri Aug 11 02:11:02 2006
@@ -31,7 +31,7 @@
#define OPENSSL_DECRYPT 0
#define OPENSSL_LEAVE_UNCHANGED -1
-/**Ciphers *************/
+/**Supported Ciphers *************/
#define OPENSSL_EVP_des_ede3_cbc "EVP_des_ede3_cbc"
#define OPENSSL_EVP_aes_128_cbc "EVP_aes_128_cbc"
Modified: webservices/axis2/trunk/c/rampart/include/openssl_rsa.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/openssl_rsa.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/openssl_rsa.h (original)
+++ webservices/axis2/trunk/c/rampart/include/openssl_rsa.h Fri Aug 11 02:11:02 2006
@@ -48,7 +48,7 @@
struct _evp_pkey{
EVP_PKEY *key;
- unsigned char *name;
+ axis2_char_t *name;
int size;
int type;
};
Modified: webservices/axis2/trunk/c/rampart/include/oxs_cipher.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_cipher.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_cipher.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_cipher.h Fri Aug 11 02:11:02 2006
@@ -47,14 +47,6 @@
axis2_char_t *url);
-AXIS2_EXTERN int AXIS2_CALL
-oxs_get_cipher_key_size(const axis2_env_t *env,
- axis2_char_t *url);
-
-
-AXIS2_EXTERN int AXIS2_CALL
-oxs_get_cipher_iv_size(const axis2_env_t *env,
- axis2_char_t *url);
/** @} */
#ifdef __cplusplus
}
Modified: webservices/axis2/trunk/c/rampart/include/oxs_error.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_error.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_error.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_error.h Fri Aug 11 02:11:02 2006
@@ -50,6 +50,7 @@
#define OXS_ERROR_CREATION_FAILED 8
#define OXS_ERROR_INITIALIZATION_FAILED 9
#define OXS_ERROR_DATA_CONV_FAILED 10
+#define OXS_ERROR_OPENSSL_FUNC_FAILED 11
typedef struct _oxs_error_description oxs_error_description, *oxs_error_description_ptr;
Added: webservices/axis2/trunk/c/rampart/include/oxs_iv.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_iv.h?rev=430730&view=auto
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_iv.h (added)
+++ webservices/axis2/trunk/c/rampart/include/oxs_iv.h Fri Aug 11 02:11:02 2006
@@ -0,0 +1,51 @@
+/*
+ * Copyright 2004,2005 The Apache Software Foundation.
+ *
+ * Licensed under the Apache License, Version 2.0 (the "License");
+ * you may not use this file except in compliance with the License.
+ * You may obtain a copy of the License at
+ *
+ * http://www.apache.org/licenses/LICENSE-2.0
+ *
+ * Unless required by applicable law or agreed to in writing, software
+ * distributed under the License is distributed on an "AS IS" BASIS,
+ * WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ * See the License for the specific language governing permissions and
+ * limitations under the License.
+ */
+
+#ifndef OXS_IV_H
+#define OXS_IV_H
+
+
+/**
+ * @file oxs_key.h
+ * @brief
+ */
+
+#include <axis2_defines.h>
+#include <oxs_constants.h>
+#include <openssl_constants.h>
+#include <axis2_env.h>
+
+#ifdef __cplusplus
+extern "C"
+{
+#endif
+
+
+#define OXS_IV_DEFAULT OPENSSL_DEFAULT_IV16
+
+
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
+oxs_iv_generate_for_algo(const axis2_env_t *env,
+ axis2_char_t *key_algo);
+
+
+
+/** @} */
+#ifdef __cplusplus
+}
+#endif
+
+#endif /* OXS_IV_H */
Modified: webservices/axis2/trunk/c/rampart/include/oxs_token_data_reference.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/oxs_token_data_reference.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/oxs_token_data_reference.h (original)
+++ webservices/axis2/trunk/c/rampart/include/oxs_token_data_reference.h Fri Aug 11 02:11:02 2006
@@ -39,10 +39,10 @@
AXIS2_EXTERN axiom_node_t* AXIS2_CALL
oxs_token_build_data_reference_element(const axis2_env_t *env,
axiom_node_t *parent,
- axis2_char_t* data_ref
+ axis2_char_t *data_ref
);
-AXIS2_EXTERN axis2_char_t *AXIS2_CALL
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL
oxs_token_get_data_reference(const axis2_env_t *env, axiom_node_t *data_ref_node);
/*TODO write free method*/
Modified: webservices/axis2/trunk/c/rampart/include/rampart_action.h
URL: http://svn.apache.org/viewvc/webservices/axis2/trunk/c/rampart/include/rampart_action.h?rev=430730&r1=430729&r2=430730&view=diff
==============================================================================
--- webservices/axis2/trunk/c/rampart/include/rampart_action.h (original)
+++ webservices/axis2/trunk/c/rampart/include/rampart_action.h Fri Aug 11 02:11:02 2006
@@ -71,37 +71,35 @@
</xs:element>
</xs:schema>
*/
-typedef struct _actions actions, *actions_ptr;
+typedef struct _actions actionss, *actions_ptr;
struct _actions{
- axis2_char_t *items ;
+ /*axis2_char_t *items ;
axis2_char_t *user ;
axis2_char_t *passwordC_callback_lass ;
axis2_char_t *encryption_prop_file;
axis2_char_t *signature_prop_file ;
axis2_char_t *signature_key_identifier ;
- axis2_char_t *encryption_key_identifier ;
+ axis2_char_t *encryption_key_identifier ;*/
axis2_char_t *encryption_user ;
- axis2_char_t *signature_parts ;
+ /*axis2_char_t *signature_parts ;
axis2_char_t *encryption_parts ;
- axis2_char_t *optimize_parts ;
+ axis2_char_t *optimize_parts ;*/
axis2_char_t *encryption_sym_algorithm ;
- axis2_char_t *embedded_key_callback_class ;
+ /*axis2_char_t *embedded_key_callback_class ;*/
axis2_char_t *encryption_key_transport_algorithm ;
- axis2_char_t *embedded_key_name ;
- axis2_char_t *time_to_live ;
-
+ /*axis2_char_t *embedded_key_name ;
+ axis2_char_t *time_to_live ;*/
};
-
-
AXIS2_EXTERN actions_ptr AXIS2_CALL
oxs_ctx_create_actions_ptr(const axis2_env_t *env);
+AXIS2_EXTERN axis2_status_t AXIS2_CALL
+oxs_ctx_reset_actions_ptr(const axis2_env_t *env, actions_ptr actions);
AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_ctx_free_actions_ptr(const axis2_env_t *env, actions_ptr actions);
-
AXIS2_EXTERN axis2_status_t AXIS2_CALL
oxs_ctx_populate_actions_ptr(const axis2_env_t *env, actions_ptr actions, axis2_param_t *param_action );
---------------------------------------------------------------------
To unsubscribe, e-mail: axis-cvs-unsubscribe@ws.apache.org
For additional commands, e-mail: axis-cvs-help@ws.apache.org