diff options
| author | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2012-01-04 01:32:07 +0000 |
|---|---|---|
| committer | Chris Sutcliffe <ir0nh34d@users.sourceforge.net> | 2012-01-04 01:32:07 +0000 |
| commit | b018c06fa911f9f1a96d5709056762879bd58768 (patch) | |
| tree | 8379b75f2c632c0c5f8441d74c046586cf29ae70 /winsup/w32api | |
| parent | 286625cf9103de59993c2275691c4feb12a29885 (diff) | |
| download | cygnal-b018c06fa911f9f1a96d5709056762879bd58768.tar.gz cygnal-b018c06fa911f9f1a96d5709056762879bd58768.tar.bz2 cygnal-b018c06fa911f9f1a96d5709056762879bd58768.zip | |
2012-01-03 Chris Sutcliffe <ir0nh34d@users.sf.net>
Remove duplicate definitions, identified by 'make test'.
* include/wincrypt.h (CRYPT_NEWKEYSET, CRYPT_DELETEKEYSET,
CRYPT_MACHINE_KEYSET, CRYPT_SILENT, CRYPT_EXPORTABLE, CRYPT_USER_PROTECTED,
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): Remove duplicate
definitions.
* include/winerror.h (CRYPT_E_REVOKED): Removed - already defined in
wincrypt (which is where it should be defined according to MSDN).
Diffstat (limited to 'winsup/w32api')
| -rw-r--r-- | winsup/w32api/ChangeLog | 13 | ||||
| -rw-r--r-- | winsup/w32api/include/wincrypt.h | 19 | ||||
| -rw-r--r-- | winsup/w32api/include/winerror.h | 1 |
3 files changed, 13 insertions, 20 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog index 675fd6a29..7b65749df 100644 --- a/winsup/w32api/ChangeLog +++ b/winsup/w32api/ChangeLog @@ -1,3 +1,16 @@ +2012-01-03 Chris Sutcliffe <ir0nh34d@users.sf.net> + + Remove duplicate definitions, identified by 'make test'. + + * include/wincrypt.h (CRYPT_NEWKEYSET, CRYPT_DELETEKEYSET, + CRYPT_MACHINE_KEYSET, CRYPT_SILENT, CRYPT_EXPORTABLE, CRYPT_USER_PROTECTED, + 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): Remove duplicate + definitions. + * include/winerror.h (CRYPT_E_REVOKED): Removed - already defined in + wincrypt (which is where it should be defined according to MSDN). + 2012-01-03 Keith Marshall <keithmarshall@users.sf.net> Correct misuse of #ifdef, identified by 'make test'. diff --git a/winsup/w32api/include/wincrypt.h b/winsup/w32api/include/wincrypt.h index d2a09d543..68dfbed70 100644 --- a/winsup/w32api/include/wincrypt.h +++ b/winsup/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/winsup/w32api/include/winerror.h b/winsup/w32api/include/winerror.h index 6b1c73c92..6b0b1734a 100644 --- a/winsup/w32api/include/winerror.h +++ b/winsup/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) |