summaryrefslogtreecommitdiff
path: root/src/mscrypto/app.c
diff options
context:
space:
mode:
authorsangwan.kwon <sangwan.kwon@samsung.com>2016-07-28 15:17:14 +0900
committersangwan.kwon <sangwan.kwon@samsung.com>2016-07-28 15:17:14 +0900
commit1ca1a139b4c1a00de4d72f64b7411e118111a161 (patch)
tree2c93e5dbce5b42d1efd45520b1c8cd50b6bf6998 /src/mscrypto/app.c
parentfe8ea3dba5971ab3f47090ba52d7f824c3d23545 (diff)
parentd4d35351fd63a7051a7cbef2002cb0c641925ec3 (diff)
downloadxmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.tar.gz
xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.tar.bz2
xmlsec1-1ca1a139b4c1a00de4d72f64b7411e118111a161.zip
Merge branch 'upstream' into tizen
Change-Id: Iacc73c9ed5e9cfd188df62c405426bfa89bf4e51
Diffstat (limited to 'src/mscrypto/app.c')
-rw-r--r--src/mscrypto/app.c4
1 files changed, 2 insertions, 2 deletions
diff --git a/src/mscrypto/app.c b/src/mscrypto/app.c
index 92894d90..bcb0ea19 100644
--- a/src/mscrypto/app.c
+++ b/src/mscrypto/app.c
@@ -5,7 +5,7 @@
* distribution for preciese wording.
*
* Copyright (C) 2003 Cordys R&D BV, All rights reserved.
- * Copyright (C) 2003 Aleksey Sanin <aleksey@aleksey.com>
+ * Copyright (C) 2003-2016 Aleksey Sanin <aleksey@aleksey.com>. All Rights Reserved.
*/
#include "globals.h"
@@ -622,7 +622,7 @@ xmlSecMSCryptoAppPkcs12LoadMemory(const xmlSecByte* data,
goto done;
}
- hCertStore = PFXImportCertStore(&pfx, wcPwd, CRYPT_EXPORTABLE);
+ hCertStore = PFXImportCertStore(&pfx, wcPwd, CRYPT_EXPORTABLE | PKCS12_NO_PERSIST_KEY);
if (NULL == hCertStore) {
xmlSecError(XMLSEC_ERRORS_HERE,
NULL,