diff options
Diffstat (limited to 'ckcapi-cert.c')
| -rw-r--r-- | ckcapi-cert.c | 10 |
1 files changed, 4 insertions, 6 deletions
diff --git a/ckcapi-cert.c b/ckcapi-cert.c index 15ab880..9937486 100644 --- a/ckcapi-cert.c +++ b/ckcapi-cert.c @@ -29,8 +29,6 @@ #define CERT_KEY_IDENTIFIER_PROP_ID 20 #endif -#define USE_ENCODINGS (X509_ASN_ENCODING | PKCS_7_ASN_ENCODING) - typedef struct _CertObject { CkCapiObject obj; @@ -244,7 +242,7 @@ cert_load_data(CkCapiSession* sess, CkCapiObject* obj, CkCapiObjectData** objdat memcpy(&info.SerialNumber, &cobj->serial, sizeof(info.SerialNumber)); memcpy(&info.Issuer, &cobj->issuer, sizeof(info.Issuer)); - cert = CertGetSubjectCertificateFromStore(sess->store, USE_ENCODINGS, &info); + cert = CertGetSubjectCertificateFromStore(sess->store, CKCAPI_ENCODINGS, &info); if(!cert) { @@ -572,7 +570,7 @@ match_in_store(CkCapiSession* sess, PCERT_INFO info, CK_ATTRIBUTE_PTR match, if(!sess->store) return CKR_OK; - cert = CertGetSubjectCertificateFromStore(sess->store, USE_ENCODINGS, info); + cert = CertGetSubjectCertificateFromStore(sess->store, CKCAPI_ENCODINGS, info); if(cert == NULL) { err = GetLastError(); @@ -642,14 +640,14 @@ ckcapi_cert_find(CkCapiSession* sess, CK_OBJECT_CLASS cls, CK_ATTRIBUTE_PTR matc } else if(!serial && match[i].type == CKA_SERIAL_NUMBER) { - if(!CryptDecodeObject(USE_ENCODINGS, X509_MULTI_BYTE_INTEGER, + if(!CryptDecodeObject(CKCAPI_ENCODINGS, X509_MULTI_BYTE_INTEGER, match[i].pValue, match[i].ulValueLen, 0, NULL, &size)) { continue; } serial = calloc(1, size); - if(!CryptDecodeObject(USE_ENCODINGS, X509_MULTI_BYTE_INTEGER, + if(!CryptDecodeObject(CKCAPI_ENCODINGS, X509_MULTI_BYTE_INTEGER, match[i].pValue, match[i].ulValueLen, 0, serial, &size)) continue; |