Account: download pkcs12

diff --git a/portal/accountview.py b/portal/accountview.py
index 4f4ecbf..c36ff49 100644 (file)
--- a/portal/accountview.py
+++ b/portal/accountview.py
@@ -549,6 +549,7 @@ def account_process(request):
             obj_gid = obj_cred.get_gid_object()
             str_cert = obj_gid.save_to_string()
             cert = crypto.load_certificate(crypto.FILETYPE_PEM, str_cert)
+            #ca = cert.get_issuer()
 
             user_private_key = account_config['user_private_key'].encode('ascii')
             pkey = crypto.load_privatekey(crypto.FILETYPE_PEM, user_private_key)
@@ -556,8 +557,11 @@ def account_process(request):
             p12 = crypto.PKCS12()
             p12.set_privatekey(pkey)
             p12.set_certificate(cert)       
+            #p12.set_ca_certificates(ca)       
             pkcs12 = p12.export()
 
+            pkcs12 = p12.get_ca_certificates() 
+
             response = HttpResponse(pkcs12, content_type='text/plain')
             response['Content-Disposition'] = 'attachment; filename="user_pkcs.p12"'
             return response
@@ -568,6 +572,7 @@ def account_process(request):
             obj_gid = obj_cred.get_gid_object()
             str_cert = obj_gid.save_to_string()
             cert = crypto.load_certificate(crypto.FILETYPE_PEM, str_cert)
+            #ca = cert.get_issuer()
 
             user_private_key = account_config['user_private_key'].encode('ascii')
             pkey = crypto.load_privatekey(crypto.FILETYPE_PEM, user_private_key)
@@ -575,7 +580,9 @@ def account_process(request):
             p12 = crypto.PKCS12()
             p12.set_privatekey(pkey)
             p12.set_certificate(cert)       
+            #p12.set_ca_certificates(ca)       
             pkcs12 = p12.export()
+            pkcs12 = p12.get_ca_certificates() 
 
             response = HttpResponse(pkcs12, content_type='text/plain')
             response['Content-Disposition'] = 'attachment; filename="user_pkcs.p12"'