commit 8015d7f2a4c057857fc20a3a972885b003efb866
author Danushka Menikkumbura <danushka@apache.org> Fri Feb 12 09:23:16 2010 +0000
committer Danushka Menikkumbura <danushka@apache.org> Fri Feb 12 09:23:16 2010 +0000
tree 96f05922f587583ef23d14718872b98fd655251c
parent 2d3705b2c096a377803762e2d7c318e44860a418

Adding API calls into openssl_pkcs12_keystore.h to expose keystore members and export pkcs12_keystore_populate_cert_array method.

include/openssl_pkcs12_keystore.h

diff --git a/include/openssl_pkcs12_keystore.h b/include/openssl_pkcs12_keystore.h
index 3cb8ebd..3320653 100644
--- a/include/openssl_pkcs12_keystore.h
+++ b/include/openssl_pkcs12_keystore.h
@@ -50,7 +50,7 @@
         axis2_char_t *filename, 
         axis2_char_t *password);
     
-    axutil_array_list_t * AXIS2_CALL pkcs12_keystore_populate_cert_array(
+    AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL pkcs12_keystore_populate_cert_array(
         const axutil_env_t *env,
         STACK_OF(X509) *other_certs);
     
@@ -94,7 +94,29 @@
         axis2_char_t *password,
         int len);
 
+    AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
+	pkcs12_keystore_get_keystore_file(
+		pkcs12_keystore_t* keystore);
+
+	AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
+	pkcs12_keystore_get_password(
+		pkcs12_keystore_t* keystore);
     
+	AXIS2_EXTERN PKCS12* AXIS2_CALL 
+	pkcs12_keystore_get_keystore(
+		pkcs12_keystore_t* keystore);
+
+	AXIS2_EXTERN X509* AXIS2_CALL 
+	pkcs12_keystore_get_cert(
+		pkcs12_keystore_t* keystore);
+    
+    AXIS2_EXTERN STACK_OF(X509)* AXIS2_CALL 
+	pkcs12_keystore_get_other_certs(
+		pkcs12_keystore_t* keystore);
+
+	AXIS2_EXTERN openssl_pkey_t* AXIS2_CALL 
+	pkcs12_keystore_get_pvt_key(
+		pkcs12_keystore_t* keystore);    
         
 #ifdef __cplusplus
 }

src/omxmlsec/openssl/pkcs12_keystore.c

diff --git a/src/omxmlsec/openssl/pkcs12_keystore.c b/src/omxmlsec/openssl/pkcs12_keystore.c
index cfe7c93..721c9dd 100644
--- a/src/omxmlsec/openssl/pkcs12_keystore.c
+++ b/src/omxmlsec/openssl/pkcs12_keystore.c
@@ -29,6 +29,48 @@
     openssl_pkey_t *pvt_key;
 };
 
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
+pkcs12_keystore_get_keystore_file(
+	pkcs12_keystore_t* keystore)
+{
+	return keystore->keystore_file;
+}
+
+AXIS2_EXTERN axis2_char_t* AXIS2_CALL 
+pkcs12_keystore_get_password(
+	pkcs12_keystore_t* keystore)
+{
+	return keystore->keystore_password;
+}
+
+AXIS2_EXTERN PKCS12* AXIS2_CALL 
+pkcs12_keystore_get_keystore(
+	pkcs12_keystore_t* keystore)
+{
+	return keystore->keystore;
+}
+
+AXIS2_EXTERN X509* AXIS2_CALL 
+pkcs12_keystore_get_cert(
+	pkcs12_keystore_t* keystore)
+{
+	return keystore->cert;
+}
+
+AXIS2_EXTERN STACK_OF(X509)* AXIS2_CALL 
+pkcs12_keystore_get_other_certs(
+	pkcs12_keystore_t* keystore)
+{
+	return keystore->other_certs;
+}
+
+AXIS2_EXTERN openssl_pkey_t* AXIS2_CALL 
+pkcs12_keystore_get_pvt_key(
+	pkcs12_keystore_t* keystore)
+{
+	return keystore->pvt_key;
+}
+
 AXIS2_EXTERN pkcs12_keystore_t * AXIS2_CALL 
 pkcs12_keystore_create(
         const axutil_env_t *env,
@@ -128,7 +170,8 @@
     return keystore;
 }
 
-axutil_array_list_t * AXIS2_CALL pkcs12_keystore_populate_cert_array(
+AXIS2_EXTERN axutil_array_list_t * AXIS2_CALL 
+pkcs12_keystore_populate_cert_array(
         const axutil_env_t *env,
         STACK_OF(X509) * other_certs) 
 {