Signed-off-by: Joseph Kogut joseph.kogut@gmail.com --- dlls/ncrypt/main.c | 8 ++++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 7 +++++++ 3 files changed, 16 insertions(+), 1 deletion(-)
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index bfda1d8295..c2dd8c0d71 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -68,6 +68,14 @@ SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i return NTE_NOT_SUPPORTED; }
+SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD alg_ops, + DWORD *alg_count, NCryptAlgorithmName **alg_list, + DWORD flags) +{ + FIXME("(0x%lx, 0x%08x, %p, %p, 0x%08x): stub\n", provider, alg_ops, alg_count, alg_list, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { FIXME("(0x%lx, 0x%08x): stub\n", key, flags); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index b0141808a3..c94a17d1b2 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -67,7 +67,7 @@ @ stub NCryptDeriveKey @ stub NCryptDuplicateKeyProtectorHandle @ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long) -@ stub NCryptEnumAlgorithms +@ stdcall NCryptEnumAlgorithms(long long ptr ptr long) @ stub NCryptEnumKeys @ stub NCryptEnumStorageProviders @ stub NCryptExportKey diff --git a/include/ncrypt.h b/include/ncrypt.h index 85ced7a2fb..cf4442ccd8 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -32,6 +32,13 @@ typedef LONG SECURITY_STATUS; #define __SECSTATUS_DEFINED__ #endif
+typedef struct _NCryptAlgorithmName { + LPWSTR pszName; + DWORD dwClass; + DWORD dwAlgOperations; + DWORD dwFlags; +} NCryptAlgorithmName; + typedef ULONG_PTR NCRYPT_HANDLE; typedef ULONG_PTR NCRYPT_PROV_HANDLE; typedef ULONG_PTR NCRYPT_KEY_HANDLE;
Signed-off-by: Joseph Kogut joseph.kogut@gmail.com --- dlls/ncrypt/main.c | 7 +++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 7 +++++++ 3 files changed, 15 insertions(+), 1 deletion(-)
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index c2dd8c0d71..1e8fe93244 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -76,6 +76,13 @@ SECURITY_STATUS WINAPI NCryptEnumAlgorithms(NCRYPT_PROV_HANDLE provider, DWORD a return NTE_NOT_SUPPORTED; }
+SECURITY_STATUS WINAPI NCryptEnumKeys(NCRYPT_PROV_HANDLE provider, const WCHAR *scope, + NCryptKeyName **key_name, PVOID *enum_state, DWORD flags) +{ + FIXME("(0x%lx, %p, %p, %p, 0x%08x): stub\n", provider, scope, key_name, enum_state, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) { FIXME("(0x%lx, 0x%08x): stub\n", key, flags); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index c94a17d1b2..d4482d5b40 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -68,7 +68,7 @@ @ stub NCryptDuplicateKeyProtectorHandle @ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long) @ stdcall NCryptEnumAlgorithms(long long ptr ptr long) -@ stub NCryptEnumKeys +@ stdcall NCryptEnumKeys(long wstr ptr ptr long) @ stub NCryptEnumStorageProviders @ stub NCryptExportKey @ stdcall NCryptFinalizeKey(long long) diff --git a/include/ncrypt.h b/include/ncrypt.h index cf4442ccd8..9712f2f521 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -39,6 +39,13 @@ typedef struct _NCryptAlgorithmName { DWORD dwFlags; } NCryptAlgorithmName;
+typedef struct NCryptKeyName { + LPWSTR pszName; + LPWSTR pszAlgid; + DWORD dwLegacyKeySpec; + DWORD dwFlags; +} NCryptKeyName; + typedef ULONG_PTR NCRYPT_HANDLE; typedef ULONG_PTR NCRYPT_PROV_HANDLE; typedef ULONG_PTR NCRYPT_KEY_HANDLE;
Signed-off-by: Joseph Kogut joseph.kogut@gmail.com --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1e8fe93244..6022d20ca0 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -89,6 +89,12 @@ SECURITY_STATUS WINAPI NCryptFinalizeKey(NCRYPT_KEY_HANDLE key, DWORD flags) return NTE_NOT_SUPPORTED; }
+SECURITY_STATUS WINAPI NCryptFreeBuffer(PVOID buf) +{ + FIXME("(%p): stub\n", buf); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) { FIXME("(0x%lx): stub\n", object); diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index d4482d5b40..1c06935bed 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -72,7 +72,7 @@ @ stub NCryptEnumStorageProviders @ stub NCryptExportKey @ stdcall NCryptFinalizeKey(long long) -@ stub NCryptFreeBuffer +@ stdcall NCryptFreeBuffer(ptr) @ stdcall NCryptFreeObject(long) @ stub NCryptGetProperty @ stub NCryptGetProtectionDescriptorInfo
Signed-off-by: Joseph Kogut joseph.kogut@gmail.com --- dlls/ncrypt/main.c | 16 ++++++++++++++++ dlls/ncrypt/ncrypt.spec | 4 ++-- 2 files changed, 18 insertions(+), 2 deletions(-)
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 6022d20ca0..1d7c853840 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -101,6 +101,14 @@ SECURITY_STATUS WINAPI NCryptFreeObject(NCRYPT_HANDLE object) return NTE_NOT_SUPPORTED; }
+SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *property, PBYTE output, + DWORD outsize, DWORD *result, DWORD flags) +{ + FIXME("(0x%lx, %s, %p, %u, %p, 0x%08x): stub\n", object, wine_dbgstr_w(property), output, outsize, + result, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { @@ -113,3 +121,11 @@ SECURITY_STATUS WINAPI NCryptOpenStorageProvider(NCRYPT_PROV_HANDLE *provider, c FIXME("(%p, %s, %u): stub\n", provider, wine_dbgstr_w(name), flags); return NTE_NOT_SUPPORTED; } + +SECURITY_STATUS WINAPI NCryptSetProperty(NCRYPT_HANDLE object, const WCHAR *property, + PBYTE input, DWORD insize, DWORD flags) +{ + FIXME("(%lx, %s, %p, %u, 0x%08x): stub\n", object, wine_dbgstr_w(property), input, insize, + flags); + return NTE_NOT_SUPPORTED; +} diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index 1c06935bed..cf5decbc8c 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -74,7 +74,7 @@ @ stdcall NCryptFinalizeKey(long long) @ stdcall NCryptFreeBuffer(ptr) @ stdcall NCryptFreeObject(long) -@ stub NCryptGetProperty +@ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stub NCryptImportKey @ stub NCryptIsAlgSupported @@ -90,7 +90,7 @@ @ stub NCryptRegisterProtectionDescriptorName @ stub NCryptSecretAgreement @ stub NCryptSetAuditingInterface -@ stub NCryptSetProperty +@ stdcall NCryptSetProperty(ptr wstr ptr long long) @ stub NCryptSignHash @ stub NCryptStreamClose @ stub NCryptStreamOpenToProtect
Signed-off-by: Joseph Kogut joseph.kogut@gmail.com --- dlls/ncrypt/main.c | 10 ++++++++++ dlls/ncrypt/ncrypt.spec | 2 +- include/ncrypt.h | 12 ++++++++++++ 3 files changed, 23 insertions(+), 1 deletion(-)
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1d7c853840..2d4a513140 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -109,6 +109,16 @@ SECURITY_STATUS WINAPI NCryptGetProperty(NCRYPT_HANDLE object, const WCHAR *prop return NTE_NOT_SUPPORTED; }
+SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE decrypt_key, + const WCHAR *type, NCryptBufferDesc *params, NCRYPT_KEY_HANDLE *key, + PBYTE data, DWORD datasize, DWORD flags) +{ + FIXME("(0x%lx, 0x%lx, %s, %p, %p, %p, %u, 0x%08x): stub\n", provider, decrypt_key, + wine_dbgstr_w(type), params, + key, data, datasize, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index cf5decbc8c..ac5e85895a 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -76,7 +76,7 @@ @ stdcall NCryptFreeObject(long) @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo -@ stub NCryptImportKey +@ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) @ stub NCryptIsAlgSupported @ stub NCryptIsKeyHandle @ stub NCryptKeyDerivation diff --git a/include/ncrypt.h b/include/ncrypt.h index 9712f2f521..111693f1d4 100644 --- a/include/ncrypt.h +++ b/include/ncrypt.h @@ -39,6 +39,18 @@ typedef struct _NCryptAlgorithmName { DWORD dwFlags; } NCryptAlgorithmName;
+typedef struct _NCryptBuffer { + ULONG cbBuffer; + ULONG BufferType; + PVOID pvBuffer; +} NCryptBuffer, *PNCryptBuffer; + +typedef struct _NCryptBufferDesc { + ULONG ulVersion; + ULONG cBuffers; + PNCryptBuffer pBuffers; +} NCryptBufferDesc, *PNCryptBufferDesc; + typedef struct NCryptKeyName { LPWSTR pszName; LPWSTR pszAlgid;
Signed-off-by: Joseph Kogut joseph.kogut@gmail.com --- dlls/ncrypt/main.c | 6 ++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 7 insertions(+), 1 deletion(-)
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 2d4a513140..1f06ed398e 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -60,6 +60,12 @@ SECURITY_STATUS WINAPI NCryptDecrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD i return NTE_NOT_SUPPORTED; }
+SECURITY_STATUS WINAPI NCryptDeleteKey(NCRYPT_KEY_HANDLE key, DWORD flags) +{ + FIXME("(0x%lx, 0x%08x): stub\n", key, flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptEncrypt(NCRYPT_KEY_HANDLE key, BYTE *input, DWORD insize, void *padding, BYTE *output, DWORD outsize, DWORD *result, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index ac5e85895a..b58ef34434 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -63,7 +63,7 @@ @ stdcall NCryptCreatePersistedKey(long ptr wstr wstr long long) @ stub NCryptCreateProtectionDescriptor @ stdcall NCryptDecrypt(long ptr long ptr ptr long ptr long) -@ stub NCryptDeleteKey +@ stdcall NCryptDeleteKey(long long) @ stub NCryptDeriveKey @ stub NCryptDuplicateKeyProtectorHandle @ stdcall NCryptEncrypt(long ptr long ptr ptr long ptr long)
Signed-off-by: Joseph Kogut joseph.kogut@gmail.com --- dlls/ncrypt/main.c | 7 +++++++ dlls/ncrypt/ncrypt.spec | 2 +- 2 files changed, 8 insertions(+), 1 deletion(-)
diff --git a/dlls/ncrypt/main.c b/dlls/ncrypt/main.c index 1f06ed398e..c0cc05c43c 100644 --- a/dlls/ncrypt/main.c +++ b/dlls/ncrypt/main.c @@ -125,6 +125,13 @@ SECURITY_STATUS WINAPI NCryptImportKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_H return NTE_NOT_SUPPORTED; }
+SECURITY_STATUS WINAPI NCryptIsAlgSupported(NCRYPT_PROV_HANDLE provider, const WCHAR *algid, + DWORD flags) +{ + FIXME("(0x%lx, %s, 0x%08x): stub\n", provider, wine_dbgstr_w(algid), flags); + return NTE_NOT_SUPPORTED; +} + SECURITY_STATUS WINAPI NCryptOpenKey(NCRYPT_PROV_HANDLE provider, NCRYPT_KEY_HANDLE *key, const WCHAR *name, DWORD keyspec, DWORD flags) { diff --git a/dlls/ncrypt/ncrypt.spec b/dlls/ncrypt/ncrypt.spec index b58ef34434..3908cbfb91 100644 --- a/dlls/ncrypt/ncrypt.spec +++ b/dlls/ncrypt/ncrypt.spec @@ -77,7 +77,7 @@ @ stdcall NCryptGetProperty(ptr wstr ptr long ptr long) @ stub NCryptGetProtectionDescriptorInfo @ stdcall NCryptImportKey(long long wstr ptr ptr ptr long long) -@ stub NCryptIsAlgSupported +@ stub NCryptIsAlgSupported(long wstr long) @ stub NCryptIsKeyHandle @ stub NCryptKeyDerivation @ stub NCryptNotifyChangeKey
-
Joseph Kogut