From: Dr. Stephen Henson <steve@openssl.org>
Date: Wed, 4 Jun 2008 23:03:28 +0000 (+0000)
Subject: Update from stable branch.
X-Git-Tag: OpenSSL_0_9_8k^2~331
X-Git-Url: https://git.openssl.org/?p=openssl.git;a=commitdiff_plain;h=e1451bb51d9a8e8ff8fbdca962636f4d54d131af;ds=sidebyside

Update from stable branch.
---

diff --git a/engines/e_capi.c b/engines/e_capi.c
index ec8dab0f07..be01278ad4 100644
--- a/engines/e_capi.c
+++ b/engines/e_capi.c
@@ -1620,6 +1620,8 @@ static int client_cert_select(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
 
 #define dlg_title L"OpenSSL Application SSL Client Certificate Selection"
 #define dlg_prompt L"Select a certificate to use for authentication"
+#define dlg_columns	 CRYPTUI_SELECT_LOCATION_COLUMN \
+			|CRYPTUI_SELECT_INTENDEDUSE_COLUMN
 
 static int client_cert_select(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
 	{
@@ -1661,7 +1663,7 @@ static int client_cert_select(ENGINE *e, SSL *ssl, STACK_OF(X509) *certs)
 	/* Call dialog to select one */
 	cert = CryptUIDlgSelectCertificateFromStore(dstore, hwnd,
 							dlg_title, dlg_prompt,
-							0, 0, NULL);
+							dlg_columns, 0, NULL);
 
 	/* Find matching cert from list */
 	if (cert)