From 49ec628217f75e5d42de952a495d7f6b08d7dd99 Mon Sep 17 00:00:00 2001 From: Chris Sutcliffe Date: Wed, 4 Jan 2012 01:32:07 +0000 Subject: [PATCH] Remove duplicate definitions, identified by 'make test'. --- w32api/ChangeLog | 14 ++++++++++++++ w32api/include/wincrypt.h | 19 ------------------- w32api/include/winerror.h | 1 - 3 files changed, 14 insertions(+), 20 deletions(-) diff --git a/w32api/ChangeLog b/w32api/ChangeLog index e59ec2a..2ad278e 100644 --- a/w32api/ChangeLog +++ b/w32api/ChangeLog @@ -1,3 +1,17 @@ +2012-01-03 Chris Sutcliffe + + Remove duplicate definitions, identified by 'make test'. + + * include/wincrypt.h (CRYPT_NEWKEYSET, CRYPT_DELETEKEYSET) + (CRYPT_MACHINE_KEYSET, CRYPT_EXPORTABLE, CRYPT_USER_PROTECTED) + (CRYPT_SILENT, CRYPT_CREATE_SALT, CRYPT_UPDATE_KEY, CRYPT_NO_SALT) + (CRYPT_PREGEN, CRYPT_RECIPIENT, CRYPT_INITIATOR, CRYPT_ONLINE) + (CRYPT_SF, CRYPT_CREATE_IV, CRYPT_KEK, CRYPT_DATA_KEY) + (CRYPT_VOLATILE, CRYPT_SGCKEY): Delete second instance of each. + + * include/winerror.h (CRYPT_E_REVOKED): Delete; it is already + correctly defined (per MSDN) in + 2012-01-03 Keith Marshall Correct misuse of #ifdef, identified by 'make test'. diff --git a/w32api/include/wincrypt.h b/w32api/include/wincrypt.h index 46e9a71..cd86753 100644 --- a/w32api/include/wincrypt.h +++ b/w32api/include/wincrypt.h @@ -1083,27 +1083,8 @@ typedef struct _CRYPT_KEY_PROV_INFO { // dwFlags definitions for CryptAcquireContext #define CRYPT_VERIFYCONTEXT 0xF0000000 -#define CRYPT_NEWKEYSET 0x00000008 -#define CRYPT_DELETEKEYSET 0x00000010 -#define CRYPT_MACHINE_KEYSET 0x00000020 -#define CRYPT_SILENT 0x00000040 // dwFlag definitions for CryptGenKey -#define CRYPT_EXPORTABLE 0x00000001 -#define CRYPT_USER_PROTECTED 0x00000002 -#define CRYPT_CREATE_SALT 0x00000004 -#define CRYPT_UPDATE_KEY 0x00000008 -#define CRYPT_NO_SALT 0x00000010 -#define CRYPT_PREGEN 0x00000040 -#define CRYPT_RECIPIENT 0x00000010 -#define CRYPT_INITIATOR 0x00000040 -#define CRYPT_ONLINE 0x00000080 -#define CRYPT_SF 0x00000100 -#define CRYPT_CREATE_IV 0x00000200 -#define CRYPT_KEK 0x00000400 -#define CRYPT_DATA_KEY 0x00000800 -#define CRYPT_VOLATILE 0x00001000 -#define CRYPT_SGCKEY 0x00002000 #define CRYPT_ARCHIVABLE 0x00004000 #define RSA1024BIT_KEY 0x04000000 diff --git a/w32api/include/winerror.h b/w32api/include/winerror.h index 6b1c73c..6b0b173 100644 --- a/w32api/include/winerror.h +++ b/w32api/include/winerror.h @@ -1853,7 +1853,6 @@ #define CRYPT_E_BAD_MSG _HRESULT_TYPEDEF_(0x8009200DL) #define CRYPT_E_NO_SIGNER _HRESULT_TYPEDEF_(0x8009200EL) #define CRYPT_E_PENDING_CLOSE _HRESULT_TYPEDEF_(0x8009200FL) -#define CRYPT_E_REVOKED _HRESULT_TYPEDEF_(0x80092010L) #define CRYPT_E_NO_REVOCATION_DLL _HRESULT_TYPEDEF_(0x80092011L) #define CRYPT_E_NO_REVOCATION_CHECK _HRESULT_TYPEDEF_(0x80092012L) -- 2.11.0