summaryrefslogtreecommitdiffstats
diff options
context:
space:
mode:
-rw-r--r--winsup/w32api/ChangeLog8
-rw-r--r--winsup/w32api/include/wincrypt.h18
2 files changed, 25 insertions, 1 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index 3cade2275..bd87b838b 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,11 @@
+2003-05-21 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/wincrypt.h (PLAINTEXTKEYBLOB, OPAQUEKEYBLOB,
+ PUBLICKEYBLOBEX, SYMMETRICWRAPKEYBLOB) Add defines.
+ (PP_*): Add defines.
+ (CryptContextAddRef): Add prototype.
+ Thanks to: Shura Zam <debil_urod@users.sourceforge.net>
+
2003-05-18 Manu B <manubee@users.sourceforge.net>
* include/commctrl.h (TVSORTCB): Rename old TV_SORTCB structure.
diff --git a/winsup/w32api/include/wincrypt.h b/winsup/w32api/include/wincrypt.h
index 94e693682..225c37aaf 100644
--- a/winsup/w32api/include/wincrypt.h
+++ b/winsup/w32api/include/wincrypt.h
@@ -1,6 +1,6 @@
#ifndef _WINCRYPT_H
#define _WINCRYPT_H
-#if __GNUC__ >=3
+#if __GNUC__ >= 3
#pragma GCC system_header
#endif
@@ -94,6 +94,10 @@ extern "C" {
#define SIMPLEBLOB 1
#define PUBLICKEYBLOB 6
#define PRIVATEKEYBLOB 7
+#define PLAINTEXTKEYBLOB 8
+#define OPAQUEKEYBLOB 9
+#define PUBLICKEYBLOBEX 10
+#define SYMMETRICWRAPKEYBLOB 11
#define AT_KEYEXCHANGE 1
#define AT_SIGNATURE 2
#define CRYPT_USERDATA 1
@@ -135,6 +139,17 @@ extern "C" {
#define PP_NAME 4
#define PP_VERSION 5
#define PP_CONTAINER 6
+#define PP_CHANGE_PASSWORD 7
+#define PP_KEYSET_SEC_DESCR 8
+#define PP_CERTCHAIN 9
+#define PP_KEY_TYPE_SUBTYPE 10
+#define PP_PROVTYPE 16
+#define PP_KEYSTORAGE 17
+#define PP_APPLI_CERT 18
+#define PP_SYM_KEYSIZE 19
+#define PP_SESSION_KEYSIZE 20
+#define PP_UI_PROMPT 21
+#define PP_ENUMALGS_EX 22
#define PP_ENUMMANDROOTS 25
#define PP_ENUMELECTROOTS 26
#define PP_KEYSET_TYPE 27
@@ -563,6 +578,7 @@ PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE,PCCERT_CONTEX
PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE,DWORD,DWORD,DWORD,const void*,PCCERT_CHAIN_CONTEXT);
BOOL WINAPI CryptAcquireContextA(HCRYPTPROV*,LPCSTR,LPCSTR,DWORD,DWORD);
BOOL WINAPI CryptAcquireContextW(HCRYPTPROV*,LPCWSTR,LPCWSTR,DWORD,DWORD);
+BOOL WINAPI CryptContextAddRef(HCRYPTPROV,DWORD*,DWORD);
BOOL WINAPI CryptReleaseContext(HCRYPTPROV,DWORD);
BOOL WINAPI CryptGenKey(HCRYPTPROV,ALG_ID,DWORD,HCRYPTKEY*);
BOOL WINAPI CryptDeriveKey(HCRYPTPROV,ALG_ID,HCRYPTHASH,DWORD,HCRYPTKEY*);