svn commit: r909305 - in /webservices/rampart/trunk/c: include/openssl_pkcs12_keystore.h src/omxmlsec/openssl/pkcs12_keystore.c

[danushka]

Author: danushka
Date: Fri Feb 12 09:23:16 2010
New Revision: 909305

URL: http://svn.apache.org/viewvc?rev=909305&view=rev
Log:
Adding API calls into openssl_pkcs12_keystore.h to expose keystore members and 
export pkcs12_keystore_populate_cert_array method.

Modified:
    webservices/rampart/trunk/c/include/openssl_pkcs12_keystore.h
    webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c

Modified: webservices/rampart/trunk/c/include/openssl_pkcs12_keystore.h
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/include/openssl_pkcs12_keystore.h?rev=909305&r1=909304&r2=909305&view=diff
==============================================================================
--- webservices/rampart/trunk/c/include/openssl_pkcs12_keystore.h (original)
+++ webservices/rampart/trunk/c/include/openssl_pkcs12_keystore.h Fri Feb 12 
09:23:16 2010
@@ -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
 }

Modified: webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c
URL: 
http://svn.apache.org/viewvc/webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c?rev=909305&r1=909304&r2=909305&view=diff
==============================================================================
--- webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c 
(original)
+++ webservices/rampart/trunk/c/src/omxmlsec/openssl/pkcs12_keystore.c Fri Feb 
12 09:23:16 2010
@@ -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) 
 {