From 272e380898e3fdc7864d0651444212e48f7ff348 Mon Sep 17 00:00:00 2001 From: Jakub Jelen Date: Thu, 16 May 2019 17:26:09 +0200 Subject: [PATCH] Set correctly flags for ECDH derive operations --- src/minidriver/minidriver.c | 2 +- src/pkcs11/framework-pkcs15.c | 1 + 2 files changed, 2 insertions(+), 1 deletion(-) diff --git a/src/minidriver/minidriver.c b/src/minidriver/minidriver.c index 793ce476..54e23c5d 100644 --- a/src/minidriver/minidriver.c +++ b/src/minidriver/minidriver.c @@ -4877,7 +4877,7 @@ DWORD WINAPI CardConstructDHAgreement(__in PCARD_DATA pCardData, DWORD dwret; VENDOR_SPECIFIC *vs; struct sc_pkcs15_object *pkey = NULL; - int r, opt_derive_flags = 0; + int r, opt_derive_flags = SC_ALGORITHM_ECDH_CDH_RAW; u8* out = 0; unsigned long outlen = 0; PBYTE pbPublicKey = NULL; diff --git a/src/pkcs11/framework-pkcs15.c b/src/pkcs11/framework-pkcs15.c index 57ea18a5..ed0f677d 100644 --- a/src/pkcs11/framework-pkcs15.c +++ b/src/pkcs11/framework-pkcs15.c @@ -4263,6 +4263,7 @@ pkcs15_prkey_derive(struct sc_pkcs11_session *session, void *obj, CK_ECDH1_DERIVE_PARAMS * ecdh_params = (CK_ECDH1_DERIVE_PARAMS *) pParameters; ulSeedDataLen = ecdh_params->ulPublicDataLen; pSeedData = ecdh_params->pPublicData; + flags = SC_ALGORITHM_ECDH_CDH_RAW; } break; }