From 08035be41befff7c86c374caa47e36c02af376f7 Mon Sep 17 00:00:00 2001 From: Armin Novak Date: Mon, 25 Apr 2022 14:28:26 +0200 Subject: [PATCH] Added missing WINPR_API --- include/freerdp/crypto/crypto.h | 6 +++--- winpr/include/winpr/crypto.h | 22 ++++++++++++---------- winpr/include/winpr/smartcard.h | 6 +++--- 3 files changed, 18 insertions(+), 16 deletions(-) diff --git a/include/freerdp/crypto/crypto.h b/include/freerdp/crypto/crypto.h index 08dd0b5f9..fceb6a26a 100644 --- a/include/freerdp/crypto/crypto.h +++ b/include/freerdp/crypto/crypto.h @@ -89,9 +89,9 @@ extern "C" DWORD* PublicKeyLength); #define TSSK_KEY_LENGTH 64 - extern const BYTE tssk_modulus[]; - extern const BYTE tssk_privateExponent[]; - extern const BYTE tssk_exponent[]; + WINPR_API extern const BYTE tssk_modulus[]; + WINPR_API extern const BYTE tssk_privateExponent[]; + WINPR_API extern const BYTE tssk_exponent[]; FREERDP_API SSIZE_T crypto_rsa_public_encrypt(const BYTE* input, size_t length, size_t key_length, const BYTE* modulus, diff --git a/winpr/include/winpr/crypto.h b/winpr/include/winpr/crypto.h index 7cefbd908..43d5422b1 100644 --- a/winpr/include/winpr/crypto.h +++ b/winpr/include/winpr/crypto.h @@ -482,8 +482,8 @@ typedef const CERT_CONTEXT* PCCERT_CONTEXT; #define CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE \ (CERT_SYSTEM_STORE_LOCAL_MACHINE_ENTERPRISE_ID << CERT_SYSTEM_STORE_LOCATION_SHIFT) -HCERTSTORE CertOpenStore(LPCSTR lpszStoreProvider, DWORD dwMsgAndCertEncodingType, - HCRYPTPROV_LEGACY hCryptProv, DWORD dwFlags, const void* pvPara); +WINPR_API HCERTSTORE CertOpenStore(LPCSTR lpszStoreProvider, DWORD dwMsgAndCertEncodingType, + HCRYPTPROV_LEGACY hCryptProv, DWORD dwFlags, const void* pvPara); WINPR_API HCERTSTORE CertOpenSystemStoreW(HCRYPTPROV_LEGACY hProv, LPCWSTR szSubsystemProtocol); WINPR_API HCERTSTORE CertOpenSystemStoreA(HCRYPTPROV_LEGACY hProv, LPCSTR szSubsystemProtocol); @@ -607,15 +607,17 @@ extern "C" #define CRYPT_STRING_NOCRLF 0x40000000 #define CRYPT_STRING_NOCR 0x80000000 -BOOL CryptStringToBinaryW(LPCWSTR pszString, DWORD cchString, DWORD dwFlags, BYTE* pbBinary, - DWORD* pcbBinary, DWORD* pdwSkip, DWORD* pdwFlags); -BOOL CryptStringToBinaryA(LPCSTR pszString, DWORD cchString, DWORD dwFlags, BYTE* pbBinary, - DWORD* pcbBinary, DWORD* pdwSkip, DWORD* pdwFlags); +WINPR_API BOOL CryptStringToBinaryW(LPCWSTR pszString, DWORD cchString, DWORD dwFlags, + BYTE* pbBinary, DWORD* pcbBinary, DWORD* pdwSkip, + DWORD* pdwFlags); +WINPR_API BOOL CryptStringToBinaryA(LPCSTR pszString, DWORD cchString, DWORD dwFlags, + BYTE* pbBinary, DWORD* pcbBinary, DWORD* pdwSkip, + DWORD* pdwFlags); -BOOL CryptBinaryToStringW(CONST BYTE* pbBinary, DWORD cbBinary, DWORD dwFlags, LPWSTR pszString, - DWORD* pcchString); -BOOL CryptBinaryToStringA(CONST BYTE* pbBinary, DWORD cbBinary, DWORD dwFlags, LPSTR pszString, - DWORD* pcchString); +WINPR_API BOOL CryptBinaryToStringW(CONST BYTE* pbBinary, DWORD cbBinary, DWORD dwFlags, + LPWSTR pszString, DWORD* pcchString); +WINPR_API BOOL CryptBinaryToStringA(CONST BYTE* pbBinary, DWORD cbBinary, DWORD dwFlags, + LPSTR pszString, DWORD* pcchString); #ifdef UNICODE #define CryptStringToBinary CryptStringToBinaryW diff --git a/winpr/include/winpr/smartcard.h b/winpr/include/winpr/smartcard.h index 3e52f92a2..4a9b966ea 100644 --- a/winpr/include/winpr/smartcard.h +++ b/winpr/include/winpr/smartcard.h @@ -619,9 +619,9 @@ extern "C" { #endif - extern const SCARD_IO_REQUEST g_rgSCardT0Pci; - extern const SCARD_IO_REQUEST g_rgSCardT1Pci; - extern const SCARD_IO_REQUEST g_rgSCardRawPci; + WINPR_API extern const SCARD_IO_REQUEST g_rgSCardT0Pci; + WINPR_API extern const SCARD_IO_REQUEST g_rgSCardT1Pci; + WINPR_API extern const SCARD_IO_REQUEST g_rgSCardRawPci; #define SCARD_PCI_T0 (&g_rgSCardT0Pci) #define SCARD_PCI_T1 (&g_rgSCardT1Pci)