From: Keith Marshall Date: Mon, 23 May 2016 18:31:09 +0000 (+0100) Subject: Merge W32API updates, from Cygwin CVS, into legacy branch. X-Git-Tag: w32api-3.18-release~13 X-Git-Url: http://git.osdn.net/view?a=commitdiff_plain;h=d1d4a17e51a2b78e252ef0147d483267d56c90cc;p=mingw%2Fmingw-org-wsl.git Merge W32API updates, from Cygwin CVS, into legacy branch. --- d1d4a17e51a2b78e252ef0147d483267d56c90cc diff --cc w32api/ChangeLog index a95157e,28731aa..5e47c0e --- a/w32api/ChangeLog +++ b/w32api/ChangeLog @@@ -1,391 -1,161 +1,572 @@@ ++2016-05-23 Keith Marshall ++ ++ Merge W32API updates, from Cygwin CVS, into legacy branch. ++ Incorporate changes since release of w32api-3.17, until 2012-07-06. ++ ++ * include/shobjidl.h lib/shobjidl-uuid.c: New files, added per LRN's ++ 2012-04-28 commit to Cygwin CVS. ++ ++ * include/gdiplus/gdiplustypes.h include/imagehlp.h ++ * include/routprot.h include/shlwapi.h include/userenv.h ++ * include/winbase.h include/wincon.h include/windef.h ++ * include/winerror.h include/wingdi.h include/winnt.h ++ * include/winsock.h include/winsock2.h include/winuser.h: Updated to ++ match Cygwin CVS state, as of 2012-07-06. ++ ++ * include/wincrypt.h: Updated to remove duplicate manifest constant ++ definitions, as identified per Chris Sutcliffe's 2012-01-03 commit to ++ Cygwin CVS; merge with my 2015-09-29 commit; additionally, remove... ++ (szOID_RSA_emailAddr, szOID_RSA_unstructAddr, szOID_RSA_unstructName) ++ (CRYPT_ARCHIVABLE, CRYPT_NOHASHOID, CRYPT_VERIFYCONTEXT): ...extra ++ copies of these further duplicated definitions, identified during ++ the merging operation. ++ +2016-05-04 Keith Marshall + + Eliminate redundant header. + + * include/parts/winioctl.h: Delete it; distribute its content... + * include/ddk/winddk.h include/ddk/ntddstor.h include/ddk/ntdddisk.h: + ...among these, separating it into discrete sections based on... + [__need_ddk_winddk_includes, __need_ddk_ntddstor_includes] + [__need_ddk_ntdddisk_includes]: ...these selectors, respectively. + [__WINIOCTL_H_SOURCED__]: Expose only those sections; do not define... + (_DDK_WINDDK_H, _DDK_NTDDSTOR_H, _DDK_NTDDDISK_H): ...these. + + * include/winioctl.h (__WINIOCTL_H_SOURCED__): Define it; include each + of , , and + +2016-05-03 Keith Marshall + + Enforce consistent specification of package version. + + * include/w32api.h: Rename as... + * include/w32api.h.in: ...this build-time template file. + (__W32API_VERSION): Redefine it, in terms of... + (%PACKAGE_VERSION_LONG%): ...this substitution template. + (__W32API_MAJOR_VERSION, __W32API_MINOR_VERSION) + (__W32API_PATCHLEVEL): Likewise, redefine them in terms of... + (%PACKAGE_VERSION_MAJOR%, %PACKAGE_VERSION_MINOR%) + (%PACKAGE_VERSION_PATCH%): ...these. + + * configure.ac (AC_CONFIG_SRCDIR): Adjust for renamed file. + (MINGW_AC_CONFIG_EXTRA_SRCDIR): Likewise, for similarly renamed + mingwrt/include/_mingw.h.in file. + + * Makefile.in (all-w32api-libs): Add dependency on... + (w32api.h, _mingw.h): ...these; add rule to generate them, using... + (PACKAGE_VERSION_SCRIPT, PACKAGE_VERSION_FORMAT): ...these new macros; + they apply appropriate substitutions to the renamed template files. + (install-w32api-headers): Explicitly add w32api.h + +2015-11-14 Keith Marshall + + Refactor for Windows DDK synchronization; fix MinGW-Bug [#1954]. + + * include/parts/winioctl.h: New file; it provides infrastructure for + sharing of common code between DDK headers and primary + (__IOCTL_STORAGE_, __IOCTL_DISK_, __FILE_RW_ACCESS, __FILE_AM_BUFFERED) + (__FILE_RD_BUFFERED, __FILE_RW_BUFFERED): New internal convenience + macros; they facilitate more consise expression of factored out IOCTL + and FSCTL macros; define them. + + * include/ddk/ntddk.h: Assert copyright; tidy layout. + (__NTDDK_H): Multiple inclusion guard macro, renamed to... + (_DDK_NTDDK_H): ...this; it provides better indication of location. + (_BEGIN_C_DECLS, _END_C_DECLS): Use them. + + * include/ddk/winddk.h: Assert copyright; tidy layout. + (__WINDDK_H): Multiple inclusion guard macro, renamed to... + (_DDK_WINDDK_H): ...this; it provides better indication of location. + [!defined _DDK_NTDDK_H]: Forbid direct inclusion; emit diagnostic. + (_BEGIN_C_DECLS, _END_C_DECLS): Use them. + (METHOD_BUFFERED, METHOD_IN_DIRECT, METHOD_OUT_DIRECT) + (METHOD_NEITHER): Redefine as enumeration; factor it out. + (FILE_ANY_ACCESS, FILE_SPECIAL_ACCESS, FILE_READ_ACCESS) + (FILE_WRITE_ACCESS): Likewise. + (CTL_CODE, DEVICE_TYPE_FROM_CTL_CODE): Factor out. + [defined _DRIVE_LAYOUT_INFORMATION_MBR_DEFINED]: Delete guard. + (struct _DRIVE_LAYOUT_INFORMATION_MBR, DRIVE_LAYOUT_INFORMATION_MBR) + (PDRIVE_LAYOUT_INFORMATION_MBR): Factor out, without guard. + (struct _DRIVE_LAYOUT_INFORMATION_GPT, DRIVE_LAYOUT_INFORMATION_GPT) + (PDRIVE_LAYOUT_INFORMATION_GPT): Factor out. + (struct _PARTITION_INFORMATION_MBR, PARTITION_INFORMATION_MBR) + (PPARTITION_INFORMATION_MBR): Likewise. + (FILE_DEVICE_BEEP, FILE_DEVICE_CD_ROM, FILE_DEVICE_CD_ROM_FILE_SYSTEM) + (FILE_DEVICE_CONTROLLER, FILE_DEVICE_DATALINK, FILE_DEVICE_DFS) + (FILE_DEVICE_DISK, FILE_DEVICE_DISK_FILE_SYSTEM) + (FILE_DEVICE_FILE_SYSTEM, FILE_DEVICE_INPORT_PORT) + (FILE_DEVICE_KEYBOARD, FILE_DEVICE_MAILSLOT, FILE_DEVICE_MIDI_IN) + (FILE_DEVICE_MIDI_OUT, FILE_DEVICE_MOUSE) + (FILE_DEVICE_MULTI_UNC_PROVIDER, FILE_DEVICE_NAMED_PIPE) + (FILE_DEVICE_NETWORK, FILE_DEVICE_NETWORK_BROWSER) + (FILE_DEVICE_NETWORK_FILE_SYSTEM, FILE_DEVICE_NULL) + (FILE_DEVICE_PARALLEL_PORT, FILE_DEVICE_PHYSICAL_NETCARD) + (FILE_DEVICE_PRINTER, FILE_DEVICE_SCANNER) + (FILE_DEVICE_SERIAL_MOUSE_PORT, FILE_DEVICE_SERIAL_PORT) + (FILE_DEVICE_SCREEN, FILE_DEVICE_SOUND, FILE_DEVICE_STREAMS) + (FILE_DEVICE_TAPE, FILE_DEVICE_TAPE_FILE_SYSTEM, FILE_DEVICE_TRANSPORT) + (FILE_DEVICE_UNKNOWN, FILE_DEVICE_VIDEO, FILE_DEVICE_VIRTUAL_DISK) + (FILE_DEVICE_WAVE_IN, FILE_DEVICE_WAVE_OUT, FILE_DEVICE_8042_PORT) + (FILE_DEVICE_NETWORK_REDIRECTOR, FILE_DEVICE_BATTERY) + (FILE_DEVICE_BUS_EXTENDER, FILE_DEVICE_MODEM, FILE_DEVICE_VDM) + (FILE_DEVICE_MASS_STORAGE, FILE_DEVICE_SMB, FILE_DEVICE_KS) + (FILE_DEVICE_CHANGER, FILE_DEVICE_SMARTCARD, FILE_DEVICE_ACPI) + (FILE_DEVICE_DVD, FILE_DEVICE_FULLSCREEN_VIDEO) + (FILE_DEVICE_DFS_FILE_SYSTEM, FILE_DEVICE_DFS_VOLUME) + (FILE_DEVICE_SERENUM, FILE_DEVICE_TERMSRV, FILE_DEVICE_KSEC) + (FILE_DEVICE_FIPS): Redefine as enumeration; factor it out. + (enum _PARTITION_STYLE, PARTITION_STYLE): Factor out; add... + (PARTITION_STYLE_RAW): ...this new enumeration state; previously, it + was defined only when including this enumeration from winioctl.h + (struct _CREATE_DISK_MBR, CREATE_DISK_MBR, PCREATE_DISK_MBR) + (struct _CREATE_DISK_GPT, CREATE_DISK_GPT, PCREATE_DISK_GPT) + (struct _CREATE_DISK, CREATE_DISK, PCREATE_DISK): Factor out; + include parts/winioctl.h + + * include/ddk/ntddstor.h: Assert copyright; tidy layout. + (__NTDDSTOR_H): Multiple inclusion guard macro, renamed to... + (_DDK_NTDDSTOR_H): ...this; to provide better indication of location. + (_BEGIN_C_DECLS, _END_C_DECLS): Use them. + (struct _STORAGE_BUS_TYPE, STORAGE_BUS_TYPE, PSTORAGE_BUS_TYPE) + (IOCTL_STORAGE_BASE, IOCTL_STORAGE_RESERVE, IOCTL_STORAGE_RELEASE) + (IOCTL_STORAGE_CHECK_VERIFY, IOCTL_STORAGE_CHECK_VERIFY2) + (IOCTL_STORAGE_MEDIA_REMOVAL, IOCTL_STORAGE_EJECT_MEDIA) + (IOCTL_STORAGE_LOAD_MEDIA, IOCTL_STORAGE_LOAD_MEDIA2) + (IOCTL_STORAGE_EJECTION_CONTROL, IOCTL_STORAGE_FIND_NEW_DEVICES) + (IOCTL_STORAGE_GET_MEDIA_TYPES, IOCTL_STORAGE_GET_MEDIA_TYPES_EX) + (IOCTL_STORAGE_GET_MEDIA_SERIAL_NUMBER, IOCTL_STORAGE_PREDICT_FAILURE) + (IOCTL_STORAGE_QUERY_PROPERTY, IOCTL_STORAGE_GET_DEVICE_NUMBER) + (IOCTL_STORAGE_RESET_BUS, IOCTL_STORAGE_RESET_DEVICE) + (IOCTL_STORAGE_MCN_CONTROL): Factor out; include parts/winioctl.h + + * include/ddk/ntdddisk.h: Assert copyright; tidy layout. + (__NTDDDISK_H): Multiple inclusion guard macro, renamed to... + (_DDK_NTDDDISK_H): ...this; to provide better indication of location. + (_BEGIN_C_DECLS, _END_C_DECLS): Use them. + (IOCTL_DISK_BASE, IOCTL_DISK_GET_LENGTH_INFO) + (IOCTL_DISK_IS_WRITABLE, IOCTL_DISK_REASSIGN_BLOCKS) + (IOCTL_DISK_FIND_NEW_DEVICES, IOCTL_DISK_GET_MEDIA_TYPES) + (IOCTL_DISK_GET_DRIVE_LAYOUT, IOCTL_DISK_SET_DRIVE_LAYOUT) + (IOCTL_DISK_GET_PARTITION_INFO, IOCTL_DISK_SET_PARTITION_INFO) + (IOCTL_DISK_GET_DRIVE_LAYOUT_EX, IOCTL_DISK_SET_DRIVE_LAYOUT_EX) + (IOCTL_DISK_GET_DRIVE_GEOMETRY, IOCTL_DISK_GET_DRIVE_GEOMETRY_EX) + (IOCTL_DISK_CREATE_DISK, IOCTL_DISK_VERIFY, IOCTL_DISK_CHECK_VERIFY) + (IOCTL_DISK_GET_PARTITION_INFO_EX, IOCTL_DISK_SET_PARTITION_INFO_EX) + (IOCTL_DISK_GET_CACHE_INFORMATION, IOCTL_DISK_SET_CACHE_INFORMATION) + (IOCTL_DISK_DELETE_DRIVE_LAYOUT, IOCTL_DISK_GROW_PARTITION) + (IOCTL_DISK_FORMAT_TRACKS, IOCTL_DISK_FORMAT_TRACKS_EX) + (IOCTL_DISK_PERFORMANCE, IOCTL_DISK_PERFORMANCE_OFF) + (IOCTL_DISK_UPDATE_DRIVE_SIZE, IOCTL_DISK_RESERVE): Factor out; all of + these macros are now defined in parts/winioctl.h; include it. + (PARTITION_ENTRY_UNUSED, PARTITION_FAT_12, PARTITION_XENIX_1) + (PARTITION_XENIX_2, PARTITION_FAT_16, PARTITION_EXTENDED) + (PARTITION_HUGE, PARTITION_IFS, PARTITION_OS2BOOTMGR, PARTITION_FAT32) + (PARTITION_FAT32_XINT13, PARTITION_XINT13, PARTITION_XINT13_EXTENDED) + (PARTITION_PREP, PARTITION_LDM, PARTITION_UNIX, PARTITION_NTFT) + (VALID_NTFT): Redefine as enumeration; factor it out. + (IsRecognizedPartition, IsContainerPartition): Factor out. + (enum _MEDIA_TYPE, MEDIA_TYPE, PMEDIA_TYPE): Factor out, adding... + (F3_200Mb_512, F3_240M_512, F3_32M_512): ...these new state values. + (enum _DETECTION_TYPE, DETECTION_TYPE): Factor out. + (struct _DISK_INT13_INFO, DISK_INT13_INFO, PDISK_INT13_INFO) + (struct _DISK_EX_INT13_INFO, DISK_EX_INT13_INFO, PDISK_EX_INT13_INFO) + (struct _DISK_DETECTION_INFO, DISK_DETECTION_INFO, PDISK_DETECTION_INFO) + (struct _DISK_GEOMETRY_EX, DISK_GEOMETRY_EX, PDISK_GEOMETRY_EX) + (struct _DISK_GEOMETRY, DISK_GEOMETRY, PDISK_GEOMETRY) + (DiskGeometryGetPartition, DiskGeometryGetDetect): Factor out. + (struct _PARTITION_INFORMATION): Change field data types for... + (HiddenSectors, PartitionNumber): ...these, from DWORD to ULONG... + (PartitionType): ...and this from BYTE to UCHAR, to keep consistent + with Windows DDK convention, then factor out struct, together with... + (PARTITION_INFORMATION, PPARTITION_INFORMATION): ...these. + (struct _PARTITION_INFORMATION_GPT, struct _DISK_PARTITION_INFO) + (PARTITION_INFORMATION_GPT, *PPARTITION_INFORMATION_GPT) + (DISK_PARTITION_INFO, *PDISK_PARTITION_INFO): Factor out. + (struct _GET_LENGTH_INFORMATION) + (GET_LENGTH_INFORMATION, PGET_LENGTH_INFORMATION) + (struct _DISK_PERFORMANCE, DISK_PERFORMANCE, PDISK_PERFORMANCE) + (struct _DISK_PERFORMANCE_EX, DISK_PERFORMANCE_EX, PDISK_PERFORMANCE_EX) + (struct _FORMAT_PARAMETERS, struct _FORMAT_EX_PARAMETERS) + (FORMAT_PARAMETERS, PFORMAT_PARAMETERS, FORMAT_EX_PARAMETERS) + (PFORMAT_EX_PARAMETERS): Factor out. + (struct _REASSIGN_BLOCKS): Change field data types for... + (Reserved, Count): ...these fields, from WORD to USHORT, and... + (BlockNumber): ...this from DWORD to ULONG, per Windows DDK + convention, then factor out the struct definition, together with... + (REASSIGN_BLOCKS, PREASSIGN_BLOCKS): ...these associated typedefs. + (struct _SET_PARTITION_INFORMATION, SET_PARTITION_INFORMATION) + (PSET_PARTITION_INFORMATION): Factor out. + (struct _VERIFY_INFORMATION): Change field data type for... + (Length): ...this field, from DWORD to ULONG, per DDK convention, then + factor out the entire struct definition, together with... + (VERIFY_INFORMATION, PVERIFY_INFORMATION): ...these associated typedefs. + (DISK_CACHE_RETENTION_PRIORITY): Factor out enumerated typedef. + (struct _DISK_CACHE_INFORMATION, struct _DISK_GROW_PARTITION) + (DISK_CACHE_INFORMATION, PDISK_CACHE_INFORMATION, DISK_GROW_PARTITION) + (PDISK_GROW_PARTITION): Factor out. + + * include/winioctl.h: Assert copyright; tidy layout; incorporate + definitions from Windows DDK headers, by including parts/winioctl.h; + delete duplicate definitions already identified as having been factored + out from ddk/winddk.h, ddk/ntddstor.h, and ddk/ntdddisk.h; accept type + compatible changes from DWORD to ULONG, WORD to USHORT, and BYTE to + UCHAR, resulting in no significant changes, except that... + (struct _DISK_PERFORMANCE): ...this is extended, by addition of... + (IdleTime, SplitCount, QueryTime, StorageDeviceNumber) + (StorageManagerName): ...these previously missing fields, originally + appropriately defined in ddk/ntdddisk.h, thus fixing bug [#1954]. + (_BEGIN_C_DECLS, _END_C_DECLS): Use them. + +2015-10-22 Keith Marshall + + Windows application module version information API updates. + + * include/winver.h: Assert copyright; tidy layout. + (_BEGIN_C_DECLS, _END_C_DECLS): Use these, as appropriate. + (__AW_SUFFIXED__): Use throughout, to identify generic functions + having both ANSI and UTF-16LE specific alternative implementations. + [NTDDI_VERSION >= NTDDI_VISTA] (GetFileVersionInfoEx): New function. + [NTDDI_VERSION >= NTDDI_VISTA] (GetFileVersionInfoSizeEx): Likewise; + note that both are generic, with ANSI and UTF-16LE implementations, + but the ANSI implementations are missing from MSVCRT.DLL when... + [NTDDI_VERSION < NTDDI_WIN8]: ...this. + + * lib/version.def (GetFileVersionInfoExA, GetFileVersionInfoExW) + (GetFileVersionInfoSizeExA, GetFileVersionInfoSizeExW): Add symbols. + +2015-10-22 Keith Marshall + + Revert a failed experimental macro construct. + + * include/w32api.h (__W32API_DEPRECATED_ALIAS): Delete this; it bloats + code, and doesn't work in the C preprocessor conditional context where + its associated constant definitions are most likely to be required. + (Windows95, Windows98, WindowsME, WindowsNT4, Windows2000, WindowsXP) + (Windows2003, WindowsVista, IE3, IE301, IE302, IE4, IE401, IE5, IE5a) + (IE5b, IE501, IE55, IE56, IE6, IE601, IE602, IE7): Redefine as macros, + now in terms of their preferred equivalents from + +2015-09-29 Keith Marshall + + Code clean-up; fix MinGW-Bug [#2263]. + + * include/w32api.h (__AW_SUFFIXED__): New macro; define it. + (__AW_EXTENDED__, __AW_STRING_A__, __AW_STRING_W__): Likewise. + (__AW__WCHAR_T__): Likewise; this is a helper for __AW_STRING_W__. + + * include/wincrypt.h: Assert copyright; tidy layout; replace all C++ + style comments, using ISO-C conforming style; remove all redundant + parameter names from function prototype declarations, throughout. + (pragma GCC system_header): Remove pointless conditional guard. + (_BEGIN_C_DECLS, _END_C_DECLS): Use to wrap extern "C" declarations. + [WINVER >= 0x500, WINVER >= 0x501]: Replace conditionals with... + [WINVER >= _WIN32_WINNT_WIN2K, WINVER >= _WIN32_WINNT_WINXP]: ...these + alternatives, respectively; they offer improved self-documentation. + (MS_DEF_PROV, MS_ENHANCED_PROV, MS_STRONG_PROV, MS_SCARD_PROV) + (MS_DEF_RSA_SIG_PROV, MS_DEF_RSA_SCHANNEL_PROV, MS_DEF_DSS_PROV) + (MS_DEF_DSS_DH_PROV, MS_ENH_DSS_DH_PROV, MS_DEF_DH_SCHANNEL_PROV) + (MS_ENH_RSA_AES_PROV): Redefine as __AW_EXTENDED__ derivatives. + (MS_DEF_PROV_W, MS_ENHANCED_PROV_W, MS_STRONG_PROV_W, MS_SCARD_PROV_W) + (MS_DEF_RSA_SIG_PROV_W, MS_DEF_RSA_SCHANNEL_PROV_W, MS_DEF_DSS_PROV_W) + (MS_DEF_DSS_DH_PROV_W, MS_ENH_DSS_DH_PROV_W, MS_DEF_DH_SCHANNEL_PROV_W) + (MS_ENH_RSA_AES_PROV_W): Redefine; use __AW_STRING_W__ to derive them + from their __AW_STRING_A__ equivalent string constant definitions. + (GET_ALG_CLASS): Redefine, expressing result in terms of... + (ALG_CLASS_ALL): ...this manifest bit mask; also redefined, preferring + a hexadecimal expression of the mask value over the former decimal. + (GET_ALG_TYPE, GET_ALG_SID): Similarly, use hexadecimal mask values. + (ALG_CLASS_SIGNATURE, ALG_CLASS_MSG_ENCRYPT, ALG_CLASS_DATA_ENCRYPT) + (ALG_CLASS_HASH, ALG_CLASS_KEY_EXCHANGE, ALG_TYPE_DSS, ALG_TYPE_RSA) + (ALG_TYPE_BLOCK, ALG_TYPE_STREAM, ALG_TYPE_DH, ALG_TYPE_SECURECHANNEL) + (CRYPT_UPDATE_KEY, CRYPT_NEWKEYSET, CRYPT_DELETEKEYSET, CRYPT_SILENT) + (CRYPT_MACHINE_KEYSET, CRYPT_USER_PROTECTED, CRYPT_CREATE_SALT) + (CRYPT_EXPORTABLE, CRYPT_ENCRYPT, CRYPT_DECRYPT, CRYPT_EXPORT) + (CRYPT_READ, CRYPT_WRITE, CRYPT_MAC, CERT_TRUST_IS_NOT_TIME_VALID) + (CERT_TRUST_IS_NOT_TIME_NESTED, CERT_TRUST_IS_REVOKED) + (CERT_TRUST_IS_NOT_SIGNATURE_VALID, CERT_TRUST_IS_NOT_VALID_FOR_USAGE) + (CERT_TRUST_IS_UNTRUSTED_ROOT, CERT_TRUST_REVOCATION_STATUS_UNKNOWN) + (CERT_TRUST_IS_CYCLIC, CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID) + (CERT_TRUST_IS_PARTIAL_CHAIN, CERT_TRUST_CTL_IS_NOT_TIME_VALID) + (CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE, CERT_TRUST_IS_SELF_SIGNED) + (CERT_TRUST_HAS_EXACT_MATCH_ISSUER, CERT_TRUST_HAS_KEY_MATCH_ISSUER) + (CERT_TRUST_HAS_NAME_MATCH_ISSUER, CERT_TRUST_IS_COMPLEX_CHAIN) + (CERT_CHAIN_POLICY_BASE, CERT_CHAIN_POLICY_AUTHENTICODE) + (CERT_CHAIN_POLICY_AUTHENTICODE_TS, CERT_CHAIN_POLICY_SSL) + (CERT_CHAIN_POLICY_BASIC_CONSTRAINTS, CERT_CHAIN_POLICY_NT_AUTH) + (CERT_NAME_STR_REVERSE_FLAG, CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG) + (CERT_NAME_STR_CRLF_FLAG, CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG) + (CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG, CERT_NAME_STR_NO_PLUS_FLAG) + (CERT_NAME_STR_NO_QUOTING_FLAG, CERT_NAME_STR_SEMICOLON_FLAG) + (CERT_FIND_CERT_ID, CERT_FIND_CTL_USAGE, CERT_FIND_ENHKEY_USAGE) + (CERT_FIND_EXISTING, CERT_FIND_HASH, CERT_FIND_ISSUER_ATTR) + (CERT_FIND_ISSUER_NAME, CERT_FIND_ISSUER_OF, CERT_FIND_KEY_IDENTIFIER) + (CERT_FIND_KEY_SPEC, CERT_FIND_MD5_HASH, CERT_FIND_PROPERTY) + (CERT_FIND_PUBLIC_KEY, CERT_FIND_SHA1_HASH, CERT_FIND_SIGNATURE_HASH) + (CERT_FIND_SUBJECT_ATTR, CERT_FIND_SUBJECT_CERT, CERT_FIND_SUBJECT_NAME) + (CERT_FIND_SUBJECT_STR_A, CERT_FIND_SUBJECT_STR_W) + (CERT_FIND_ISSUER_STR_A, CERT_FIND_ISSUER_STR_W) + (CERT_FIND_OR_ENHKEY_USAGE_FLAG, CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG) + (CERT_FIND_NO_ENHKEY_USAGE_FLAG, CERT_FIND_VALID_ENHKEY_USAGE_FLAG) + (CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG, CERT_UNICODE_IS_RDN_ATTRS_FLAG) + (CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG, CERT_CHAIN_FIND_BY_ISSUER) + (CERT_CHAIN_FIND_BY_ISSUER_COMPARE_KEY_FLAG) + (CERT_CHAIN_FIND_BY_ISSUER_COMPLEX_CHAIN_FLAG) + (CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_FLAG) + (CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_URL_FLAG) + (CERT_CHAIN_FIND_BY_ISSUER_LOCAL_MACHINE_FLAG) + (CERT_CHAIN_FIND_BY_ISSUER_NO_KEY_FLAG) + (CERT_SYSTEM_STORE_LOCAL_MACHINE): All represent bit-mapped values; + express them in hexadecimal, in preference to original decimal form. + (CERT_FIND_SUBJECT_STR, CERT_FIND_ISSUER_STR): Redefine them as + __AW_EXTENDED__ macros, for UNICODE/non-UNICODE cases respectively. + (szOID_CRL_DIST_POINTS): Correct defective definition; value should be + a string literal, but was missing delimiting quotes; insert them. + (CertNameToStr, CertOpenSystemStore, CertGetNameString, CryptSignHash) + (CryptAcquireContext, CryptVerifySignature, CryptGetDefaultProvider) + (CryptEnumProviders, CryptSetProvider): Define as __AW_SUFFIXED__ + aliases for each of the UNICODE/non-UNICODE cases respectively. + (CryptEnumProvidersA): Correct prototype declaration; 5th parameter + was declared as type LPTSTR, but should be type LPSTR. + (CryptEnumProvidersW): Likewise; 5th parameter should be type LPWSTR. + (CryptGetDefaultProviderW): Likewise; 4th parameter was declared as + type LPSTR, but should be type LPWSTR. + [defined MINGW_TENTATIVE_ASSUMPTIONS] (X509_ANY_STRING) + (X509_CRL_REASON_CODE, X509_DSS_PUBLICKEY, X509_UNICODE_ANY_STRING) + (struct _CERT_ALT_NAME_ENTRY): Add tentative definitions. + +2015-09-22 Keith Marshall + + Correct defect in build system compilation rule. + + * Makefile.in (scrnsavw.$OBJEXT): Do not use $^ to represent the + source file; it expands to also include prerequisite header files, + which should not appear on the compilation command line. Rewrite + rule in static pattern format, and use $< instead. + +2015-08-02 Keith Marshall + + Build system corrections for GCC build time support. + + * configure.ac (AC_PROG_CC): Don't use this; we need... + (MINGW_AC_PROG_CC_COMPILE_ONLY): ...this alternative, to support + building with only a stage 1 partially built GCC installation. + + * Makefile.in (install-headers): New make objective; map it to... + (install-w32api-headers): ...this, for which it is a logical alias. + +2015-07-16 Keith Marshall + + Overhaul and streamline build system configuration. + + * configure.in: Delete obsolete file; replace with... + * configure.ac: New file; rewritten per current autoconf conventions. + + * Makefile.in: Rewritten; adapted from current mingwrt configuration, + it now processes the entire build without using separate sub-makes. + + * lib/Makefile.in: Sub-make configuration not required now; delete it. + * lib/ddk/Makefile.in lib/directx/Makefile.in: Likewise; delete them. + +2015-07-14 Keith Marshall + + Remove unused aclocal.m4 configuration file. + + * aclocal.m4: Delete it; it provides no content used by this package. + +2015-07-14 Keith Marshall + + Adapt platform feature checks to NTDDI_VERSION conventions. + + * include/sdkddkver.h: New file; merge from 4.0-dev branch. + (_WIN32_WINNT_WINBLUE): New manifest constant for Windows-8.1. + (WINNTVER): Prefer bitwise shift to division; adjust accordingly. + [_WIN32_WINNT != OSVER(NTDDI_VERSION)]: Bad comparison; correct to... + [_WIN32_WINNT != WINNTVER(NTDDI_VERSION)]: ...this. + + * include/w32api.h: Assert copyright; include sdkddkver.h. + (__W32API_VERSION): Increment to 3.18; adopt new encoding format. + (__W32API_MAJOR_VERSION, __W32API_MINOR_VERSION): Adjust consistently. + (__W32API_PATCH_LEVEL): New macro; define with initial value of zero. + (__W32API_DEPRECATED_ALIAS): New macro; define it; use to redefine... + (Windows95, Windows98, WindowsME, WindowsNT4, Windows2000, WindowsXP) + (Windows2003, WindowsVista, IE3, IE301, IE302, IE4, IE401, IE5, IE5a) + (IE5b, IE501, IE55, IE56, IE6, IE601, IE602, IE7): ...these; replace + macro definitions by long integer constants, and mark as deprecated. + (UNICODE, _UNICODE): Keep these consistent; use logic factored out of + mingwrt/include/_mingw.h, whence we similarly relocate... + (_EXTERN_C, _BEGIN_C_DECLS, _END_C_DECLS): ...these. + + * include/windef.h: Assert copyright; include w32api.h, whence we + infer default assignments, per included sdkddkver.h, for each of... + (WINVER, _WIN32_WINNT): ...these; delete local defines. + (_BEGIN_C_DECLS, _END_C_DECLS): Use them. + +2015-06-16 Keith Marshall + + Remove generated configure script from revision control. + + * configure: Delete from SCM; maintainer must regenerate it, when + required, as SCM will now ignore it. + + 2012-07-06 Corinna Vinschen + + Extend visibility of winsock definitions when building Cygwin. + + * include/winsock.h [__INSIDE_CYGWIN__]: Expose definitions of... + (IP_OPTIONS, SO_DEBUG, SO_ACCEPTCONN, SO_REUSEADDR, SO_KEEPALIVE) + (SO_DONTROUTE, SO_BROADCAST, SO_USELOOPBACK, SO_LINGER, SO_OOBINLINE) + (SO_DONTLINGER, SO_SNDBUF, SO_RCVBUF, SO_SNDLOWAT, SO_RCVLOWAT) + (SO_SNDTIMEO, SO_RCVTIMEO, SO_ERROR, SO_TYPE): ...these; however... + [__INSIDE_MSYS__]: ...keep them hidden. + + * include/winsock2.h [__INSIDE_CYGWIN__]: Likewise, expose... + (AF_MAX, _SS_MAXSIZE, _SS_ALIGNSIZE, _SS_PAD1SIZE, _SS_PAD2SIZE) + (struct sockaddr, struct sockaddr_storage): ...these, whereas... + [__INSIDE_MSYS__]: ...also keep them hidden. + + 2012-04-29 Jan Ringos + + Correct version guard for WinXP minimum requirement. + + * include/winbase.h (GetModuleHandleEx): Function unsupported for... + [_WIN32_WINNT >= 0x500]: ...this; it isn't in Win2K, so should be... + [_WIN32_WINNT >= 0x501]: ...this; correct it accordingly. + (GetModuleHandleExA, GetModuleHandleExW): Likewise. + + 2012-04-28 LRN + + Add missing and associated UUID implementation. + + * include/shobjidl.h lib/shobjidl-uuid.c: New files. + * lib/Makefile.in (UUID_SOURCES, UUID_OBJS): Add references. + + 2012-03-19 Ben Greear + + Adjust header file definition order, to fix issue [#1570]. + + * include/routprot.h (IP_LOCAL_BINDING): Must be defined before... + (IP_ADAPTER_BINDING_INFO): ...this; adjust order of definition. + + 2012-01-03 Chris Sutcliffe + + Add missing return value, flagged by 'make test'. + + * include/gdiplus/gdiplustypes.h (Gdiplus::GdiplusAbort::Abort): + Return NO_ERROR in virtual definition. + + 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'. + + * include/shlwapi.h (enum ASSOCSTR, enum ASSOCDATA): Fix typos; + /#ifdef _WIN32_IE >= 0x0600/s/#ifdef/#if/ + + 2011-12-22 Corinna Vinschen + + Replace more incorrectly named manifest constants. + + * include/winnt.h (JOB_OBJECT_LIMIT_BREAKAWAY_OK) + (JOB_OBJECT_LIMIT_SILENT_BREAKAWAY_OK): Define; make aliases for... + (JOB_OBJECT_BREAKAWAY_OK, JOB_OBJECT_SILENT_BREAKAWAY): ...these old + definitions respectively; retain for backward compatibility only. + + 2011-12-22 Corinna Vinschen + + Add missing PROCESS_QUERY_LIMITED_INFORMATION. + + * include/winnt.h (PROCESS_QUERY_LIMITED_INFORMATION): Define it. + + 2011-08-19 Corinna Vinschen + + Add missing MAPVK manifest constant definitions. + + * include/winuser.h (MAPVK_VK_TO_VSC, MAPVK_VSC_TO_VK): Define them. + (MAPVK_VK_TO_CHAR, MAPVK_VSC_TO_VK_EX, MAPVK_VK_TO_VSC_EX): Likewise. + + 2011-08-05 Corinna Vinschen + + Correct some misspelled manifest constant names. + + * include/winnt.h (IMAGE_DLL_CHARACTERISTICS_NX_COMPAT): Should be... + (IMAGE_DLLCHARACTERISTICS_NX_COMPAT): ...this; define correctly; also + alias to original misspelling, to maintain backward compatibility. + (IMAGE_DLL_CHARACTERISTICS_FORCE_INTEGRITY): Likewise; should be... + (IMAGE_DLLCHARACTERISTICS_FORCE_INTEGRITY): ...this; define and alias. + (IMAGE_DLL_CHARACTERISTICS_DYNAMIC_BASE): Likewise; should be... + (IMAGE_DLLCHARACTERISTICS_DYNAMIC_BASE): ...this; define and alias. + + 2011-07-29 Corinna Vinschen + + Add a missing Win2K sockets IOCTL feature. + + * include/winsock2.h (SIO_UDP_CONNRESET): Define. + + 2011-05-22 Albrecht Schlosser + + Fix an incorrectly typed structure member. + + * include/wingdi.h (GCP_RESULTSW): lpClass field defined as LPWSTR; + should be LPSTR; correct it. + + 2011-05-15 Corinna Vinschen + + Add another missing manifest constant definition. + + * include/winbase.h (STACK_SIZE_PARAM_IS_A_RESERVATION): Define. + + 2011-04-21 Keith Marshall + + Avoid pollution of user namespace; fix MinGW-Bug [#1531]. + + * include/windef.h (PACKED): Delete macro definition; its name is not + reserved, and may thus conflict with a user defined name; replace it... + * include/wincon.h (KEY_EVENT_RECORD): ...at this sole point of use; + use __attribute__((packed)) directly instead. + + 2011-04-21 Chris Sutcliffe + + Fix bad typedef, per MinGW-Bug [#1529]. + + * include/imagehlp.h (PREAD_PROCESS_MEMORY_ROUTINE): Corrected, to + conform with MSDN reference, as identified by Safety0ff. + + 2011-04-04 Corinna Vinschen + + Add a missing manifest constant definition. + + * include/winnt.h (DOMAIN_ALIAS_RID_REMOTE_DESKTOP_USERS): Define. + + 2011-03-29 Corinna Vinschen + + Win2K and Vista userenv updates. + + * include/userenv.h [_WIN32_WINNT >= 0x0500] (DeleteProfile) + (GetAllUsersProfileDirectory, GetDefaultUserProfileDirectory) + (ExpandEnvironmentStringsForUser): Define function aliases. + [_WIN32_WINNT >= 0x0500] (DeleteProfileA, DeleteProfileW) + (GetAllUsersProfileDirectoryA, GetAllUsersProfileDirectoryW) + (GetDefaultUserProfileDirectoryA, GetDefaultUserProfileDirectoryW + (ExpandEnvironmentStringsForUserA, ExpandEnvironmentStringsForUserW) + (GetProfileType): Declare function prototypes. + [_WIN32_WINNT >= 0x0600] (CreateProfile): Declare function prototype. + [_WIN32_WINNT >= 0x0500] (PT_TEMPORARY, PT_ROAMING, PT_MANDATORY): + New manifest constants; define them. + 2011-03-25 Chris Sutcliffe * Makefile.in: Increment CYGRELEASE to 2. diff --cc w32api/include/wincrypt.h index ca74c28,cd86753..c6085d4 --- a/w32api/include/wincrypt.h +++ b/w32api/include/wincrypt.h @@@ -38,780 -8,657 +38,781 @@@ #define WINADVAPI #endif -#ifdef __cplusplus -extern "C" { -#endif -#define MS_DEF_PROV_A "Microsoft Base Cryptographic Provider v1.0" -#define MS_DEF_PROV_W L"Microsoft Base Cryptographic Provider v1.0" -#define MS_ENHANCED_PROV_A "Microsoft Enhanced Cryptographic Provider v1.0" -#define MS_ENHANCED_PROV_W L"Microsoft Enhanced Cryptographic Provider v1.0" -#define MS_STRONG_PROV_A "Microsoft Strong Cryptographic Provider" -#define MS_STRONG_PROV_W L"Microsoft Strong Cryptographic Provider" -#define MS_DEF_RSA_SIG_PROV_A "Microsoft RSA Signature Cryptographic Provider" -#define MS_DEF_RSA_SIG_PROV_W L"Microsoft RSA Signature Cryptographic Provider" +_BEGIN_C_DECLS + +#define MS_DEF_PROV __AW_EXTENDED__( MS_DEF_PROV ) +#define MS_DEF_PROV_W __AW_STRING_W__( MS_DEF_PROV_A ) +#define MS_DEF_PROV_A "Microsoft Base Cryptographic Provider v1.0" + +#define MS_ENHANCED_PROV __AW_EXTENDED__( MS_ENHANCED_PROV ) +#define MS_ENHANCED_PROV_W __AW_STRING_W__( MS_ENHANCED_PROV_A ) +#define MS_ENHANCED_PROV_A "Microsoft Enhanced Cryptographic Provider v1.0" + +#define MS_STRONG_PROV __AW_EXTENDED__( MS_STRONG_PROV ) +#define MS_STRONG_PROV_W __AW_STRING_W__( MS_STRONG_PROV_A ) +#define MS_STRONG_PROV_A "Microsoft Strong Cryptographic Provider" + +#define MS_DEF_RSA_SIG_PROV __AW_EXTENDED__( MS_DEF_RSA_SIG_PROV ) +#define MS_DEF_RSA_SIG_PROV_W __AW_STRING_W__( MS_DEF_RSA_SIG_PROV_A ) +#define MS_DEF_RSA_SIG_PROV_A "Microsoft RSA Signature Cryptographic Provider" + +#define MS_DEF_RSA_SCHANNEL_PROV __AW_EXTENDED__( MS_DEF_RSA_SCHANNEL_PROV ) +#define MS_DEF_RSA_SCHANNEL_PROV_W __AW_STRING_W__( MS_DEF_RSA_SCHANNEL_PROV_A ) #define MS_DEF_RSA_SCHANNEL_PROV_A "Microsoft RSA SChannel Cryptographic Provider" -#define MS_DEF_RSA_SCHANNEL_PROV_W L"Microsoft RSA SChannel Cryptographic Provider" -#define MS_DEF_DSS_PROV_A "Microsoft Base DSS Cryptographic Provider" -#define MS_DEF_DSS_PROV_W L"Microsoft Base DSS Cryptographic Provider" -#define MS_DEF_DSS_DH_PROV_A "Microsoft Base DSS and Diffie-Hellman Cryptographic Provider" -#define MS_DEF_DSS_DH_PROV_W L"Microsoft Base DSS and Diffie-Hellman Cryptographic Provider" -#define MS_ENH_DSS_DH_PROV_A "Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider" -#define MS_ENH_DSS_DH_PROV_W L"Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider" + +#define MS_DEF_DSS_PROV __AW_EXTENDED__( MS_DEF_DSS_PROV ) +#define MS_DEF_DSS_PROV_W __AW_STRING_W__( MS_DEF_DSS_PROV_A ) +#define MS_DEF_DSS_PROV_A "Microsoft Base DSS Cryptographic Provider" + +#define MS_DEF_DSS_DH_PROV __AW_EXTENDED__( MS_DEF_DSS_DH_PROV ) +#define MS_DEF_DSS_DH_PROV_W __AW_STRING_W__( MS_DEF_DSS_DH_PROV_A ) +#define MS_DEF_DSS_DH_PROV_A "Microsoft Base DSS and Diffie-Hellman Cryptographic Provider" + +#define MS_ENH_DSS_DH_PROV __AW_EXTENDED__( MS_ENH_DSS_DH_PROV ) +#define MS_ENH_DSS_DH_PROV_W __AW_STRING_W__( MS_ENH_DSS_DH_PROV_A ) +#define MS_ENH_DSS_DH_PROV_A "Microsoft Enhanced DSS and Diffie-Hellman Cryptographic Provider" + +#define MS_DEF_DH_SCHANNEL_PROV __AW_EXTENDED__( MS_DEF_DH_SCHANNEL_PROV ) +#define MS_DEF_DH_SCHANNEL_PROV_W __AW_STRING_W__( MS_DEF_DH_SCHANNEL_PROV_A ) #define MS_DEF_DH_SCHANNEL_PROV_A "Microsoft DH SChannel Cryptographic Provider" -#define MS_DEF_DH_SCHANNEL_PROV_W L"Microsoft DH SChannel Cryptographic Provider" -#define MS_SCARD_PROV_A "Microsoft Base Smart Card Crypto Provider" -#define MS_SCARD_PROV_W L"Microsoft Base Smart Card Crypto Provider" -#if (_WIN32_WINNT == 0x0501) -#define MS_ENH_RSA_AES_PROV_A "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" -#define MS_ENH_RSA_AES_PROV_W L"Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" -#elif (_WIN32_WINNT > 0x0501) -#define MS_ENH_RSA_AES_PROV_A "Microsoft Enhanced RSA and AES Cryptographic Provider" -#define MS_ENH_RSA_AES_PROV_W L"Microsoft Enhanced RSA and AES Cryptographic Provider" + +#define MS_SCARD_PROV __AW_EXTENDED__( MS_SCARD_PROV ) +#define MS_SCARD_PROV_W __AW_STRING_W__( MS_SCARD_PROV_A ) +#define MS_SCARD_PROV_A "Microsoft Base Smart Card Crypto Provider" + +#if _WIN32_WINNT >= _WIN32_WINNT_WINXP +# define MS_ENH_RSA_AES_PROV __AW_EXTENDED__( MS_ENH_RSA_AES_PROV ) +# define MS_ENH_RSA_AES_PROV_W __AW_STRING_W__( MS_ENH_RSA_AES_PROV_A ) + +# if _WIN32_WINNT == _WIN32_WINNT_WINXP +# define MS_ENH_RSA_AES_PROV_A "Microsoft Enhanced RSA and AES Cryptographic Provider (Prototype)" + +#else /* _WIN32_WINNT > _WIN32_WINNT_WINXP */ +# define MS_ENH_RSA_AES_PROV_A "Microsoft Enhanced RSA and AES Cryptographic Provider" +# endif #endif -#define GET_ALG_CLASS(x) (x&57344) -#define GET_ALG_TYPE(x) (x&7680) -#define GET_ALG_SID(x) (x&511) -#define ALG_CLASS_ANY 0 -#define ALG_CLASS_SIGNATURE 8192 -#define ALG_CLASS_MSG_ENCRYPT 16384 -#define ALG_CLASS_DATA_ENCRYPT 24576 -#define ALG_CLASS_HASH 32768 -#define ALG_CLASS_KEY_EXCHANGE 40960 -#define ALG_CLASS_ALL 57344 /* (7 << 13) */ -#define ALG_TYPE_ANY 0 -#define ALG_TYPE_DSS 512 -#define ALG_TYPE_RSA 1024 -#define ALG_TYPE_BLOCK 1536 -#define ALG_TYPE_STREAM 2048 -#define ALG_TYPE_DH 2560 /* (5 << 9) */ -#define ALG_TYPE_SECURECHANNEL 3072 /* (6 << 9) */ -#define ALG_SID_ANY 0 -#define ALG_SID_RSA_ANY 0 -#define ALG_SID_RSA_PKCS 1 -#define ALG_SID_RSA_MSATWORK 2 -#define ALG_SID_RSA_ENTRUST 3 -#define ALG_SID_RSA_PGP 4 -#define ALG_SID_DSS_ANY 0 -#define ALG_SID_DSS_PKCS 1 -#define ALG_SID_DSS_DMS 2 -#define ALG_SID_DES 1 -#define ALG_SID_3DES 3 -#define ALG_SID_DESX 4 -#define ALG_SID_IDEA 5 -#define ALG_SID_CAST 6 -#define ALG_SID_SAFERSK64 7 -#define ALG_SID_SAFERSK128 8 -#define ALG_SID_3DES_112 9 -#define ALG_SID_SKIPJACK 10 -#define ALG_SID_TEK 11 -#define ALG_SID_CYLINK_MEK 12 -#define ALG_SID_RC5 13 -#define ALG_SID_RC2 2 -#define ALG_SID_RC4 1 -#define ALG_SID_SEAL 2 -#define ALG_SID_MD2 1 -#define ALG_SID_MD4 2 -#define ALG_SID_MD5 3 -#define ALG_SID_SHA 4 -#define ALG_SID_MAC 5 -#define ALG_SID_RIPEMD 6 -#define ALG_SID_RIPEMD160 7 -#define ALG_SID_SSL3SHAMD5 8 -#define ALG_SID_HMAC 9 -#define ALG_SID_TLS1PRF 10 -#define ALG_SID_AES_128 14 -#define ALG_SID_AES_192 15 -#define ALG_SID_AES_256 16 -#define ALG_SID_AES 17 -#define ALG_SID_EXAMPLE 80 - -#define CALG_MD2 (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MD2) -#define CALG_MD4 (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MD4) -#define CALG_MD5 (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MD5) -#define CALG_SHA (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_SHA) -#define CALG_SHA1 CALG_SHA -#define CALG_MAC (ALG_CLASS_HASH|ALG_TYPE_ANY|ALG_SID_MAC) -#define CALG_3DES (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|3) -#define CALG_CYLINK_MEK (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|12) -#define CALG_SKIPJACK (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|10) -#define CALG_KEA_KEYX (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_STREAM|ALG_TYPE_DSS|4) -#define CALG_RSA_SIGN (ALG_CLASS_SIGNATURE|ALG_TYPE_RSA|ALG_SID_RSA_ANY) -#define CALG_DSS_SIGN (ALG_CLASS_SIGNATURE|ALG_TYPE_DSS|ALG_SID_DSS_ANY) -#define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_RSA|ALG_SID_RSA_ANY) -#define CALG_DES (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_DES) -#define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_RC2) -#define CALG_RC4 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_STREAM|ALG_SID_RC4) -#define CALG_SEAL (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_STREAM|ALG_SID_SEAL) -#define CALG_DH_EPHEM (ALG_CLASS_KEY_EXCHANGE|ALG_TYPE_STREAM|ALG_TYPE_DSS|ALG_SID_DSS_DMS) -#define CALG_DESX (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_DESX) -#define CALG_TLS1PRF (ALG_CLASS_DHASH|ALG_TYPE_ANY|ALG_SID_TLS1PRF) -#define CALG_AES_128 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_128) -#define CALG_AES_192 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_192) -#define CALG_AES_256 (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES_256) -#define CALG_AES (ALG_CLASS_DATA_ENCRYPT|ALG_TYPE_BLOCK|ALG_SID_AES) - -#define CRYPT_VERIFYCONTEXT 0xF0000000 -#define CRYPT_NEWKEYSET 8 -#define CRYPT_DELETEKEYSET 16 -#define CRYPT_MACHINE_KEYSET 32 -#define CRYPT_SILENT 64 -#define CRYPT_EXPORTABLE 1 -#define CRYPT_USER_PROTECTED 2 -#define CRYPT_CREATE_SALT 4 -#define CRYPT_UPDATE_KEY 8 -#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 -#define PKCS5_PADDING 1 -#define CRYPT_MODE_CBC 1 -#define CRYPT_MODE_ECB 2 -#define CRYPT_MODE_OFB 3 -#define CRYPT_MODE_CFB 4 -#define CRYPT_MODE_CTS 5 -#define CRYPT_MODE_CBCI 6 -#define CRYPT_MODE_CFBP 7 -#define CRYPT_MODE_OFBP 8 -#define CRYPT_MODE_CBCOFM 9 -#define CRYPT_MODE_CBCOFMI 10 -#define CRYPT_ENCRYPT 1 -#define CRYPT_DECRYPT 2 -#define CRYPT_EXPORT 4 -#define CRYPT_READ 8 -#define CRYPT_WRITE 16 -#define CRYPT_MAC 32 -#define HP_ALGID 1 -#define HP_HASHVAL 2 -#define HP_HASHSIZE 4 -#define HP_HMAC_INFO 5 -#define CRYPT_FAILED FALSE -#define CRYPT_SUCCEED TRUE -#define RCRYPT_SUCCEEDED(r) ((r)==CRYPT_SUCCEED) -#define RCRYPT_FAILED(r) ((r)==CRYPT_FAILED) -#define PP_ENUMALGS 1 -#define PP_ENUMCONTAINERS 2 -#define PP_IMPTYPE 3 -#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 -#define PP_ADMIN_PIN 31 -#define PP_KEYEXCHANGE_PIN 32 -#define PP_SIGNATURE_PIN 33 -#define PP_SIG_KEYSIZE_INC 34 -#define PP_KEYX_KEYSIZE_INC 35 -#define PP_UNIQUE_CONTAINER 36 -#define PP_SGC_INFO 37 -#define PP_USE_HARDWARE_RNG 38 -#define PP_KEYSPEC 39 -#define PP_ENUMEX_SIGNING_PROT 40 -#define CRYPT_FIRST 1 -#define CRYPT_NEXT 2 -#define CRYPT_IMPL_HARDWARE 1 -#define CRYPT_IMPL_SOFTWARE 2 -#define CRYPT_IMPL_MIXED 3 -#define CRYPT_IMPL_UNKNOWN 4 -#define PROV_RSA_FULL 1 -#define PROV_RSA_SIG 2 -#define PROV_DSS 3 -#define PROV_FORTEZZA 4 -#define PROV_MS_EXCHANGE 5 -#define PROV_MS_MAIL 5 -#define PROV_SSL 6 -#define PROV_STT_MER 7 -#define PROV_STT_ACQ 8 -#define PROV_STT_BRND 9 -#define PROV_STT_ROOT 10 -#define PROV_STT_ISS 11 -#define PROV_RSA_SCHANNEL 12 -#define PROV_DSS_DH 13 -#define PROV_EC_ECDSA_SIG 14 -#define PROV_EC_ECNRA_SIG 15 -#define PROV_EC_ECDSA_FULL 16 -#define PROV_EC_ECNRA_FULL 17 -#define PROV_DH_SCHANNEL 18 -#define PROV_SPYRUS_LYNKS 20 -#define PROV_RNG 21 -#define PROV_INTEL_SEC 22 -#define PROV_RSA_AES 24 -#define MAXUIDLEN 64 -#define CUR_BLOB_VERSION 2 -#define X509_ASN_ENCODING 1 -#define PKCS_7_ASN_ENCODING 65536 -#define CERT_V1 0 -#define CERT_V2 1 -#define CERT_V3 2 -#define CERT_E_CHAINING (-2146762486) -#define CERT_E_CN_NO_MATCH (-2146762481) -#define CERT_E_EXPIRED (-2146762495) -#define CERT_E_PURPOSE (-2146762490) -#define CERT_E_REVOCATION_FAILURE (-2146762482) -#define CERT_E_REVOKED (-2146762484) -#define CERT_E_ROLE (-2146762493) -#define CERT_E_UNTRUSTEDROOT (-2146762487) -#define CERT_E_UNTRUSTEDTESTROOT (-2146762483) -#define CERT_E_VALIDITYPERIODNESTING (-2146762494) -#define CERT_E_WRONG_USAGE (-2146762480) -#define CERT_E_PATHLENCONST (-2146762492) -#define CERT_E_CRITICAL (-2146762491) -#define CERT_E_ISSUERCHAINING (-2146762489) -#define CERT_E_MALFORMED (-2146762488) -#define CRYPT_E_REVOCATION_OFFLINE (-2146885613) -#define CRYPT_E_REVOKED (-2146885616) -#define TRUST_E_BASIC_CONSTRAINTS (-2146869223) -#define TRUST_E_CERT_SIGNATURE (-2146869244) -#define TRUST_E_FAIL (-2146762485) -#define CERT_TRUST_NO_ERROR 0 -#define CERT_TRUST_IS_NOT_TIME_VALID 1 -#define CERT_TRUST_IS_NOT_TIME_NESTED 2 -#define CERT_TRUST_IS_REVOKED 4 -#define CERT_TRUST_IS_NOT_SIGNATURE_VALID 8 -#define CERT_TRUST_IS_NOT_VALID_FOR_USAGE 16 -#define CERT_TRUST_IS_UNTRUSTED_ROOT 32 -#define CERT_TRUST_REVOCATION_STATUS_UNKNOWN 64 -#define CERT_TRUST_IS_CYCLIC 128 -#define CERT_TRUST_IS_PARTIAL_CHAIN 65536 -#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 131072 -#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 262144 -#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 524288 -#define CERT_TRUST_HAS_EXACT_MATCH_ISSUER 1 -#define CERT_TRUST_HAS_KEY_MATCH_ISSUER 2 -#define CERT_TRUST_HAS_NAME_MATCH_ISSUER 4 -#define CERT_TRUST_IS_SELF_SIGNED 8 -#define CERT_TRUST_IS_COMPLEX_CHAIN 65536 -#define CERT_CHAIN_POLICY_BASE ((LPCSTR) 1) -#define CERT_CHAIN_POLICY_AUTHENTICODE ((LPCSTR) 2) -#define CERT_CHAIN_POLICY_AUTHENTICODE_TS ((LPCSTR) 3) -#define CERT_CHAIN_POLICY_SSL ((LPCSTR) 4) -#define CERT_CHAIN_POLICY_BASIC_CONSTRAINTS ((LPCSTR) 5) -#define CERT_CHAIN_POLICY_NT_AUTH ((LPCSTR) 6) -#define USAGE_MATCH_TYPE_AND 0 -#define USAGE_MATCH_TYPE_OR 1 -#define CERT_SIMPLE_NAME_STR 1 -#define CERT_OID_NAME_STR 2 -#define CERT_X500_NAME_STR 3 -#define CERT_NAME_STR_COMMA_FLAG 0x04000000 -#define CERT_NAME_STR_SEMICOLON_FLAG 1073741824 -#define CERT_NAME_STR_CRLF_FLAG 134217728 -#define CERT_NAME_STR_NO_PLUS_FLAG 536870912 -#define CERT_NAME_STR_NO_QUOTING_FLAG 268435456 -#define CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG 0x00010000 -#define CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG 0x00040000 -#define CERT_NAME_STR_REVERSE_FLAG 33554432 -#define CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG 131072 -#define CERT_FIND_ANY 0 -#define CERT_FIND_CERT_ID 1048576 -#define CERT_FIND_CTL_USAGE 655360 -#define CERT_FIND_ENHKEY_USAGE 655360 -#define CERT_FIND_EXISTING 851968 -#define CERT_FIND_HASH 65536 -#define CERT_FIND_ISSUER_ATTR 196612 -#define CERT_FIND_ISSUER_NAME 131076 -#define CERT_FIND_ISSUER_OF 786432 -#define CERT_FIND_KEY_IDENTIFIER 983040 -#define CERT_FIND_KEY_SPEC 589824 -#define CERT_FIND_MD5_HASH 262144 -#define CERT_FIND_PROPERTY 327680 -#define CERT_FIND_PUBLIC_KEY 393216 -#define CERT_FIND_SHA1_HASH 65536 -#define CERT_FIND_SIGNATURE_HASH 917504 -#define CERT_FIND_SUBJECT_ATTR 196615 -#define CERT_FIND_SUBJECT_CERT 720896 -#define CERT_FIND_SUBJECT_NAME 131079 -#define CERT_FIND_SUBJECT_STR_A 458759 -#define CERT_FIND_SUBJECT_STR_W 524295 -#define CERT_FIND_ISSUER_STR_A 458756 -#define CERT_FIND_ISSUER_STR_W 524292 -#define CERT_FIND_OR_ENHKEY_USAGE_FLAG 16 -#define CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG 1 -#define CERT_FIND_NO_ENHKEY_USAGE_FLAG 8 -#define CERT_FIND_VALID_ENHKEY_USAGE_FLAG 32 -#define CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG 2 -#define CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG 2 -#define CERT_UNICODE_IS_RDN_ATTRS_FLAG 1 -#define CERT_CHAIN_FIND_BY_ISSUER 1 -#define CERT_CHAIN_FIND_BY_ISSUER_COMPARE_KEY_FLAG 1 -#define CERT_CHAIN_FIND_BY_ISSUER_COMPLEX_CHAIN_FLAG 2 -#define CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_FLAG 32768 -#define CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_URL_FLAG 4 -#define CERT_CHAIN_FIND_BY_ISSUER_LOCAL_MACHINE_FLAG 8 -#define CERT_CHAIN_FIND_BY_ISSUER_NO_KEY_FLAG 16384 -#define CERT_STORE_PROV_SYSTEM 10 -#define CERT_SYSTEM_STORE_LOCAL_MACHINE 131072 -#define szOID_PKIX_KP_SERVER_AUTH "4235600" -#define szOID_SERVER_GATED_CRYPTO "4235658" -#define szOID_SGC_NETSCAPE "2.16.840.1.113730.4.1" -#define szOID_PKIX_KP_CLIENT_AUTH "1.3.6.1.5.5.7.3.2" -#define CRYPT_NOHASHOID 0x00000001 -#define CRYPT_NO_SALT 0x10 -#define CRYPT_PREGEN 0x40 -#define CRYPT_RECIPIENT 0x10 -#define CRYPT_INITIATOR 0x40 -#define CRYPT_ONLINE 0x80 -#define CRYPT_SF 0x100 -#define CRYPT_CREATE_IV 0x200 -#define CRYPT_KEK 0x400 -#define CRYPT_DATA_KEY 0x800 -#define CRYPT_VOLATILE 0x1000 -#define CRYPT_SGCKEY 0x2000 -#define KP_IV 0x00000001 -#define KP_SALT 0x00000002 -#define KP_PADDING 0x00000003 -#define KP_MODE 0x00000004 -#define KP_MODE_BITS 0x00000005 -#define KP_PERMISSIONS 0x00000006 -#define KP_ALGID 0x00000007 -#define KP_BLOCKLEN 0x00000008 -#define KP_KEYLEN 0x00000009 -#define KP_SALT_EX 0x0000000a -#define KP_P 0x0000000b -#define KP_G 0x0000000c -#define KP_Q 0x0000000d -#define KP_X 0x0000000e -#define KP_Y 0x0000000f -#define KP_RA 0x00000010 -#define KP_RB 0x00000011 -#define KP_INFO 0x00000012 -#define KP_EFFECTIVE_KEYLEN 0x00000013 -#define KP_SCHANNEL_ALG 0x00000014 -#define KP_PUB_PARAMS 0x00000027 -#define CRYPT_FLAG_PCT1 0x0001 -#define CRYPT_FLAG_SSL2 0x0002 -#define CRYPT_FLAG_SSL3 0x0004 -#define CRYPT_FLAG_TLS1 0x0008 -#define CRYPT_FLAG_IPSEC 0x0010 -#define CRYPT_FLAG_SIGNING 0x0020 -#define SCHANNEL_MAC_KEY 0x00000000 -#define SCHANNEL_ENC_KEY 0x00000001 -#define INTERNATIONAL_USAGE 0x00000001 -#if (WINVER >= 0x0501) /* Windows Server 2003, Windows XP */ -#define CMC_ADD_ATTRIBUTES (LPCSTR) 63 -#define CMC_ADD_EXTENSIONS (LPCSTR) 62 -#define X509_CERT_PAIR (LPCSTR) 53 -#define X509_CERTIFICATE_TEMPLATE (LPCSTR) 64 -#define X509_CROSS_CERT_DIST_POINTS (LPCSTR) 58 -#define CMC_DATA (LPCSTR) 59 -#define X509_NAME_CONSTRAINTS (LPCSTR) 55 -#define X509_POLICY_CONSTRAINTS (LPCSTR) 57 -#define X509_POLICY_MAPPINGS (LPCSTR) 56 -#define CMC_RESPONSE (LPCSTR) 60 -#define CMC_STATUS (LPCSTR) 61 -#endif /* (WINVER >= 0x0501) */ /* Windows Server 2003, Windows XP */ -#define X509_ALGORITHM_IDENTIFIER (LPCSTR) 74 -#define X509_ALTERNATE_NAME (LPCSTR) 12 -/* need X509_ANY_STRING */ -#define PKCS_ATTRIBUTE (LPCSTR) 22 -#define X509_AUTHORITY_INFO_ACCESS (LPCSTR) 32 -#define X509_AUTHORITY_KEY_ID (LPCSTR) 9 -#define X509_AUTHORITY_KEY_ID2 (LPCSTR) 31 -#define szOID_BASIC_CONSTRAINTS "2.5.29.10" -#define X509_BASIC_CONSTRAINTS2 (LPCSTR) 15 -#define X509_BIOMETRIC_EXT (LPCSTR) 71 -#define X509_BITS (LPCSTR) 26 -#define X509_CERT (LPCSTR) 1 -#define X509_CERT_CRL_TO_BE_SIGNED (LPCSTR) 3 -#define X509_CERT_POLICIES (LPCSTR) 16 -#define X509_CERT_REQUEST_TO_BE_SIGNED (LPCSTR) 4 -#define X509_CERT_TO_BE_SIGNED (LPCSTR) 2 -#define X509_CHOICE_OF_TIME (LPCSTR) 30 -#define PKCS_CONTENT_INFO (LPCSTR) 33 -#define PKCS_CONTENT_INFO_SEQUENCE_OF_ANY (LPCSTR) 23 -#define X509_CRL_DIST_POINTS (LPCSTR) 35 -/* need X509_CRL_REASON_CODE */ -#define RSA_CSP_PUBLICKEYBLOB (LPCSTR) 19 -#define PKCS_CTL (LPCSTR) 37 -#define X509_DSS_PARAMETERS (LPCSTR) 39 -/* need X509_DSS_PUBLICKEY */ -#define X509_DSS_SIGNATURE (LPCSTR) 40 -#define X509_ECC_SIGNATURE (LPCSTR) 47 -#define X509_ENHANCED_KEY_USAGE (LPCSTR) 36 -#define X509_ENUMERATED (LPCSTR) 29 -#define X509_EXTENSIONS (LPCSTR) 5 -#define X509_INTEGER (LPCSTR) 27 -#define X509_ISSUING_DIST_POINT (LPCSTR) 54 -#define X509_KEY_ATTRIBUTES (LPCSTR) 10 -#define X509_KEY_USAGE (LPCSTR) 14 -#define X509_KEY_USAGE_RESTRICTION (LPCSTR) 11 -#define X509_KEYGEN_REQUEST_TO_BE_SIGNED (LPCSTR) 21 -#define X509_LOGOTYPE_EXT (LPCSTR) 70 -#define X509_MULTI_BYTE_INTEGER (LPCSTR) 28 -#define X509_MULTI_BYTE_UINT (LPCSTR) 38 -#define X509_NAME (LPCSTR) 7 -#define X509_NAME_VALUE (LPCSTR) 6 -#define X509_OBJECT_IDENTIFIER (LPCSTR) 73 -#define X509_OCTET_STRING (LPCSTR) 25 -#define X509_PUBLIC_KEY_INFO (LPCSTR) 8 -#define PKCS_RC2_CBC_PARAMETERS (LPCSTR) 41 -#define CNG_RSA_PUBLIC_KEY_BLOB (LPCSTR) 72 -#define PKCS_RSA_SSA_PSS_PARAMETERS (LPCSTR) 75 -#define PKCS_RSAES_OAEP_PARAMETERS (LPCSTR) 76 -#define ECC_CMS_SHARED_INFO (LPCSTR) 77 -#define X509_SEQUENCE_OF_ANY (LPCSTR) 34 -#define PKCS7_SIGNER_INFO (LPCSTR) 500 -#define CMS_SIGNER_INFO (LPCSTR) 501 -#define PKCS_SMIME_CAPABILITIES (LPCSTR) 42 -#define PKCS_TIME_REQUEST (LPCSTR) 18 -/* need X509_UNICODE_ANY_STRING */ -#define X509_UNICODE_NAME (LPCSTR) 20 -#define X509_UNICODE_NAME_VALUE (LPCSTR) 24 -#define PKCS_UTC_TIME (LPCSTR) 17 -#define OCSP_SIGNED_REQUEST (LPCSTR) 65 -#define OCSP_REQUEST (LPCSTR) 66 -#define OCSP_RESPONSE (LPCSTR) 67 -#define OCSP_BASIC_SIGNED_RESPONSE (LPCSTR) 68 -#define OCSP_BASIC_RESPONSE (LPCSTR) 69 -enum { CRL_REASON_UNSPECIFIED=0, - CRL_REASON_KEY_COMPROMISE=1, - CRL_REASON_CA_COMPROMISE=2, - CRL_REASON_AFFILIATION_CHANGED=3, - CRL_REASON_SUPERSEDED=4, - CRL_REASON_CESSATION_OF_OPERATION=5, - CRL_REASON_CERTIFICATE_HOLD=6, - CRL_REASON_REMOVE_FROM_CRL=7 - }; -/* need CRYPT_DECODE_NOCOPY_FLAG */ -#define CRYPT_ENCODE_ALLOC_FLAG 0x8000 -#define CRYPT_UNICODE_NAME_ENCODE_DISABLE_CHECK_TYPE_FLAG 0x40000000 -#define CRYPT_UNICODE_NAME_ENCODE_ENABLE_T61_UNICODE_FLAG 0x80000000 -#define CRYPT_UNICODE_NAME_ENCODE_ENABLE_UTF8_UNICODE_FLAG 0x20000000 -#define CRYPT_UNICODE_NAME_ENCODE_FORCE_UTF8_UNICODE_FLAG 0x10000000 - - -#define szOID_RSA "1.2.840.113549" -#define szOID_PKCS "1.2.840.113549.1" -#define szOID_RSA_HASH "1.2.840.113549.2" -#define szOID_RSA_ENCRYPT "1.2.840.113549.3" -#define szOID_PKCS_1 "1.2.840.113549.1.1" -#define szOID_PKCS_2 "1.2.840.113549.1.2" -#define szOID_PKCS_3 "1.2.840.113549.1.3" -#define szOID_PKCS_4 "1.2.840.113549.1.4" -#define szOID_PKCS_5 "1.2.840.113549.1.5" -#define szOID_PKCS_6 "1.2.840.113549.1.6" -#define szOID_PKCS_7 "1.2.840.113549.1.7" -#define szOID_PKCS_8 "1.2.840.113549.1.8" -#define szOID_PKCS_9 "1.2.840.113549.1.9" -#define szOID_PKCS_10 "1.2.840.113549.1.10" -#define szOID_PKCS_12 "1.2.840.113549.1.12" -#define szOID_RSA_MD2 "1.2.840.113549.1.1.2" -#define szOID_RSA_MD4 "1.2.840.113549.1.1.3" -#define szOID_RSA_MD5 "1.2.840.113549.2.5" -#define szOID_RSA_RSA "1.2.840.113549.1.1.1" -#define szOID_RSA_MD2RSA "1.2.840.113549.1.1.2" -#define szOID_RSA_MD4RSA "1.2.840.113549.1.1.3" -#define szOID_RSA_MD5RSA "1.2.840.113549.1.1.4" -#define szOID_RSA_SHA1RSA "1.2.840.113549.1.1.5" -#define szOID_RSA_SETOAEP_RSA "1.2.840.113549.1.1.5" -#define szOID_RSA_DH "1.2.840.113549.1.3.1" -#define szOID_RSA_data "1.2.840.113549.1.7.1" -#define szOID_RSA_signedData "1.2.840.113549.1.7.2" -#define szOID_RSA_envelopedData "1.2.840.113549.1.7.3" -#define szOID_RSA_signEnvData "1.2.840.113549.1.7.4" -#define szOID_RSA_digestedData "1.2.840.113549.1.7.5" -#define szOID_RSA_hashedData "1.2.840.113549.1.7.5" -#define szOID_RSA_encryptedData "1.2.840.113549.1.7.6" -#define szOID_RSA_emailAddr "1.2.840.113549.1.9.1" -#define szOID_RSA_unstructName "1.2.840.113549.1.9.2" -#define szOID_RSA_contentType "1.2.840.113549.1.9.3" -#define szOID_RSA_messageDigest "1.2.840.113549.1.9.4" -#define szOID_RSA_signingTime "1.2.840.113549.1.9.5" -#define szOID_RSA_counterSign "1.2.840.113549.1.9.6" -#define szOID_RSA_challengePwd "1.2.840.113549.1.9.7" -#define szOID_RSA_unstructAddr "1.2.840.113549.1.9.8" -#define szOID_RSA_extCertAttrs "1.2.840.113549.1.9.9" -#define szOID_RSA_SMIMECapabilities "1.2.840.113549.1.9.15" -#define szOID_RSA_preferSignedData "1.2.840.113549.1.9.15.1" -#define szOID_RSA_RC2CBC "1.2.840.113549.3.2" -#define szOID_RSA_RC4 "1.2.840.113549.3.4" -#define szOID_RSA_DES_EDE3_CBC "1.2.840.113549.3.7" -#define szOID_RSA_RC5_CBCPad "1.2.840.113549.3.9" -#define szOID_ANSI_x942 "1.2.840.10046" -#define szOID_ANSI_x942_DH "1.2.840.10046.2.1" -#define szOID_X957 "1.2.840.10040" -#define szOID_X957_DSA "1.2.840.10040.4.1" -#define szOID_DATA STRUCTURE "1.2.840.10040.4.3" -#define szOID_DS "2.5" -#define szOID_DSALG "2.5.8" -#define szOID_DSALG_CRPT "2.5.8.1" -#define szOID_DSALG_HASH "2.5.8.2" -#define szOID_DSALG_SIGN "2.5.8.3" -#define szOID_DSALG_RSA "2.5.8.1.1" -#define szOID_OIW "1.3.14" -#define szOID_OIWSEC "1.3.14.3.2" -#define szOID_OIWSEC_md4RSA "1.3.14.3.2.2" -#define szOID_OIWSEC_md5RSA "1.3.14.3.2.3" -#define szOID_OIWSEC_md4RSA2 "1.3.14.3.2.4" -#define szOID_OIWSEC_desECB "1.3.14.3.2.6" -#define szOID_OIWSEC_desCBC "1.3.14.3.2.7" -#define szOID_OIWSEC_desOFB "1.3.14.3.2.8" -#define szOID_OIWSEC_desCFB "1.3.14.3.2.9" -#define szOID_OIWSEC_desMAC "1.3.14.3.2.10" -#define szOID_OIWSEC_rsaSign "1.3.14.3.2.11" -#define szOID_OIWSEC_dsa "1.3.14.3.2.12" -#define szOID_OIWSEC_shaDSA "1.3.14.3.2.13" -#define szOID_OIWSEC_mdc2RSA "1.3.14.3.2.14" -#define szOID_OIWSEC_shaRSA "1.3.14.3.2.15" -#define szOID_OIWSEC_dhCommMod "1.3.14.3.2.16" -#define szOID_OIWSEC_desEDE "1.3.14.3.2.17" -#define szOID_OIWSEC_sha "1.3.14.3.2.18" -#define szOID_OIWSEC_mdc2 "1.3.14.3.2.19" -#define szOID_OIWSEC_dsaComm "1.3.14.3.2.20" -#define szOID_OIWSEC_dsaCommSHA "1.3.14.3.2.21" -#define szOID_OIWSEC_rsaXchg "1.3.14.3.2.22" -#define szOID_OIWSEC_keyHashSeal "1.3.14.3.2.23" -#define szOID_OIWSEC_md2RSASign "1.3.14.3.2.24" -#define szOID_OIWSEC_md5RSASign "1.3.14.3.2.25" -#define szOID_OIWSEC_sha1 "1.3.14.3.2.26" -#define szOID_OIWSEC_dsaSHA1 "1.3.14.3.2.27" -#define szOID_OIWSEC_dsaCommSHA1 "1.3.14.3.2.28" -#define szOID_OIWSEC_sha1RSASign "1.3.14.3.2.29" -#define szOID_OIWDIR "1.3.14.7.2" -#define szOID_OIWDIR_CRPT "1.3.14.7.2.1" -#define szOID_OIWDIR_HASH "1.3.14.7.2.2" -#define szOID_OIWDIR_SIGN "1.3.14.7.2.3" -#define szOID_OIWDIR_md2 "1.3.14.7.2.2.1" -#define szOID_OIWDIR_md2RSA "1.3.14.7.2.3.1" -#define szOID_INFOSEC "2.16.840.1.101.2.1" -#define szOID_INFOSEC_sdnsSignature "2.16.840.1.101.2.1.1.1" -#define szOID_INFOSEC_mosaicSignature "2.16.840.1.101.2.1.1.2" -#define szOID_INFOSEC_sdnsConfidentiality "2.16.840.1.101.2.1.1.3" -#define szOID_INFOSEC_mosaicConfidentiality "2.16.840.1.101.2.1.1.4" -#define szOID_INFOSEC_sdnsIntegrity "2.16.840.1.101.2.1.1.5" -#define szOID_INFOSEC_mosaicIntegrity "2.16.840.1.101.2.1.1.6" -#define szOID_INFOSEC_sdnsTokenProtection "2.16.840.1.101.2.1.1.7" -#define szOID_INFOSEC_mosaicTokenProtection "2.16.840.1.101.2.1.1.8" +#define GET_ALG_CLASS(x) ((x) & ALG_CLASS_ALL) +#define GET_ALG_TYPE(x) ((x) & 0x1E00) /* x & 7680 */ +#define GET_ALG_SID(x) ((x) & 0x01FF) /* x & 511 */ + +#define ALG_CLASS_ANY 0 +#define ALG_CLASS_SIGNATURE 0x2000 /* 8192 */ +#define ALG_CLASS_MSG_ENCRYPT 0x4000 /* 16384 */ +#define ALG_CLASS_DATA_ENCRYPT 0x6000 /* 24576 */ +#define ALG_CLASS_HASH 0x8000 /* 32768 */ +#define ALG_CLASS_KEY_EXCHANGE 0xA000 /* 40960 */ +#define ALG_CLASS_ALL 0xE000 /* (0x0007 << 13) */ + +#define ALG_TYPE_ANY 0 +#define ALG_TYPE_DSS 0x0200 /* 512 */ +#define ALG_TYPE_RSA 0x0400 /* 1024 */ +#define ALG_TYPE_BLOCK 0x0600 /* 1536 */ +#define ALG_TYPE_STREAM 0x0800 /* 2048 */ +#define ALG_TYPE_DH 0x0A00 /* (0x0005 << 9) */ +#define ALG_TYPE_SECURECHANNEL 0x0C00 /* (6 << 9) */ + +#define ALG_SID_ANY 0 + +#define ALG_SID_RSA_ANY 0 +#define ALG_SID_RSA_PKCS 1 +#define ALG_SID_RSA_MSATWORK 2 +#define ALG_SID_RSA_ENTRUST 3 +#define ALG_SID_RSA_PGP 4 + +#define ALG_SID_DSS_ANY 0 +#define ALG_SID_DSS_PKCS 1 +#define ALG_SID_DSS_DMS 2 + +#define ALG_SID_DES 1 +#define ALG_SID_3DES 3 +#define ALG_SID_DESX 4 +#define ALG_SID_IDEA 5 +#define ALG_SID_CAST 6 +#define ALG_SID_SAFERSK64 7 +#define ALG_SID_SAFERSK128 8 +#define ALG_SID_3DES_112 9 +#define ALG_SID_SKIPJACK 10 +#define ALG_SID_TEK 11 +#define ALG_SID_CYLINK_MEK 12 +#define ALG_SID_RC5 13 + +#define ALG_SID_RC4 1 +#define ALG_SID_RC2 2 + +#define ALG_SID_SEAL 2 + +#define ALG_SID_MD2 1 +#define ALG_SID_MD4 2 +#define ALG_SID_MD5 3 +#define ALG_SID_SHA 4 +#define ALG_SID_MAC 5 +#define ALG_SID_RIPEMD 6 +#define ALG_SID_RIPEMD160 7 +#define ALG_SID_SSL3SHAMD5 8 +#define ALG_SID_HMAC 9 +#define ALG_SID_TLS1PRF 10 +#define ALG_SID_AES_128 14 +#define ALG_SID_AES_192 15 +#define ALG_SID_AES_256 16 +#define ALG_SID_AES 17 +#define ALG_SID_EXAMPLE 80 + +#define CALG_MD2 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD2) +#define CALG_MD4 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD4) +#define CALG_MD5 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MD5) +#define CALG_SHA (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SHA) +#define CALG_SHA1 CALG_SHA +#define CALG_MAC (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_MAC) +#define CALG_3DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | 3) +#define CALG_CYLINK_MEK (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | 12) +#define CALG_SKIPJACK (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | 10) +#define CALG_KEA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_STREAM | ALG_TYPE_DSS | 4) +#define CALG_RSA_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) +#define CALG_DSS_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY) +#define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY) +#define CALG_DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES) +#define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2) +#define CALG_RC4 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC4) +#define CALG_SEAL (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_SEAL) +#define CALG_DH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_STREAM | ALG_TYPE_DSS | ALG_SID_DSS_DMS) +#define CALG_DESX (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DESX) +#define CALG_TLS1PRF (ALG_CLASS_DHASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF) +#define CALG_AES_128 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_128) +#define CALG_AES_192 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_192) +#define CALG_AES_256 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_256) +#define CALG_AES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES) + ++/* dwFlags definitions for CryptAcquireContext ++ */ +#define CRYPT_VERIFYCONTEXT 0xF0000000 +#define CRYPT_NEWKEYSET 0x00000008 +#define CRYPT_DELETEKEYSET 0x00000010 /* 16 */ +#define CRYPT_MACHINE_KEYSET 0x00000020 /* 32 */ +#define CRYPT_SILENT 0x00000040 /* 64 */ - #define CRYPT_EXPORTABLE 0x00000001 - #define CRYPT_USER_PROTECTED 0x00000002 - #define CRYPT_CREATE_SALT 0x00000004 - #define CRYPT_UPDATE_KEY 0x00000008 + +#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 + +#define PKCS5_PADDING 1 + +#define CRYPT_MODE_CBC 1 +#define CRYPT_MODE_ECB 2 +#define CRYPT_MODE_OFB 3 +#define CRYPT_MODE_CFB 4 +#define CRYPT_MODE_CTS 5 +#define CRYPT_MODE_CBCI 6 +#define CRYPT_MODE_CFBP 7 +#define CRYPT_MODE_OFBP 8 +#define CRYPT_MODE_CBCOFM 9 +#define CRYPT_MODE_CBCOFMI 10 + +#define CRYPT_ENCRYPT 0x0001 +#define CRYPT_DECRYPT 0x0002 +#define CRYPT_EXPORT 0x0004 +#define CRYPT_READ 0x0008 +#define CRYPT_WRITE 0x0010 /* 16 */ +#define CRYPT_MAC 0x0020 /* 32 */ + +#define HP_ALGID 1 +#define HP_HASHVAL 2 +#define HP_HASHSIZE 4 +#define HP_HMAC_INFO 5 + +#define CRYPT_FAILED FALSE +#define CRYPT_SUCCEED TRUE +#define RCRYPT_SUCCEEDED(r) ((r) == CRYPT_SUCCEED) +#define RCRYPT_FAILED(r) ((r) == CRYPT_FAILED) + +#define PP_ENUMALGS 1 +#define PP_ENUMCONTAINERS 2 +#define PP_IMPTYPE 3 +#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 +#define PP_ADMIN_PIN 31 +#define PP_KEYEXCHANGE_PIN 32 +#define PP_SIGNATURE_PIN 33 +#define PP_SIG_KEYSIZE_INC 34 +#define PP_KEYX_KEYSIZE_INC 35 +#define PP_UNIQUE_CONTAINER 36 +#define PP_SGC_INFO 37 +#define PP_USE_HARDWARE_RNG 38 +#define PP_KEYSPEC 39 +#define PP_ENUMEX_SIGNING_PROT 40 + +#define CRYPT_FIRST 1 +#define CRYPT_NEXT 2 + +#define CRYPT_IMPL_HARDWARE 1 +#define CRYPT_IMPL_SOFTWARE 2 +#define CRYPT_IMPL_MIXED 3 +#define CRYPT_IMPL_UNKNOWN 4 + +#define PROV_RSA_FULL 1 +#define PROV_RSA_SIG 2 +#define PROV_DSS 3 +#define PROV_FORTEZZA 4 +#define PROV_MS_EXCHANGE 5 +#define PROV_MS_MAIL 5 +#define PROV_SSL 6 +#define PROV_STT_MER 7 +#define PROV_STT_ACQ 8 +#define PROV_STT_BRND 9 +#define PROV_STT_ROOT 10 +#define PROV_STT_ISS 11 +#define PROV_RSA_SCHANNEL 12 +#define PROV_DSS_DH 13 +#define PROV_EC_ECDSA_SIG 14 +#define PROV_EC_ECNRA_SIG 15 +#define PROV_EC_ECDSA_FULL 16 +#define PROV_EC_ECNRA_FULL 17 +#define PROV_DH_SCHANNEL 18 +#define PROV_SPYRUS_LYNKS 20 +#define PROV_RNG 21 +#define PROV_INTEL_SEC 22 +#define PROV_RSA_AES 24 + +#define MAXUIDLEN 64 + +#define CUR_BLOB_VERSION 2 + +#define X509_ASN_ENCODING 1 +#define PKCS_7_ASN_ENCODING 65536 + +#define CERT_V1 0 +#define CERT_V2 1 +#define CERT_V3 2 + +#define CERT_E_CHAINING (-2146762486) +#define CERT_E_CN_NO_MATCH (-2146762481) +#define CERT_E_EXPIRED (-2146762495) +#define CERT_E_PURPOSE (-2146762490) +#define CERT_E_REVOCATION_FAILURE (-2146762482) +#define CERT_E_REVOKED (-2146762484) +#define CERT_E_ROLE (-2146762493) +#define CERT_E_UNTRUSTEDROOT (-2146762487) +#define CERT_E_UNTRUSTEDTESTROOT (-2146762483) +#define CERT_E_VALIDITYPERIODNESTING (-2146762494) +#define CERT_E_WRONG_USAGE (-2146762480) +#define CERT_E_PATHLENCONST (-2146762492) +#define CERT_E_CRITICAL (-2146762491) +#define CERT_E_ISSUERCHAINING (-2146762489) +#define CERT_E_MALFORMED (-2146762488) +#define CRYPT_E_REVOCATION_OFFLINE (-2146885613) +#define CRYPT_E_REVOKED (-2146885616) +#define TRUST_E_BASIC_CONSTRAINTS (-2146869223) +#define TRUST_E_CERT_SIGNATURE (-2146869244) +#define TRUST_E_FAIL (-2146762485) + +#define CERT_TRUST_NO_ERROR 0 +#define CERT_TRUST_IS_NOT_TIME_VALID 0x00000001 +#define CERT_TRUST_IS_NOT_TIME_NESTED 0x00000002 +#define CERT_TRUST_IS_REVOKED 0x00000004 +#define CERT_TRUST_IS_NOT_SIGNATURE_VALID 0x00000008 +#define CERT_TRUST_IS_NOT_VALID_FOR_USAGE 0x00000010 /* 16 */ +#define CERT_TRUST_IS_UNTRUSTED_ROOT 0x00000020 /* 32 */ +#define CERT_TRUST_REVOCATION_STATUS_UNKNOWN 0x00000040 /* 64 */ +#define CERT_TRUST_IS_CYCLIC 0x00000080 /* 128 */ +#define CERT_TRUST_IS_PARTIAL_CHAIN 0x00010000 /* 65336 */ +#define CERT_TRUST_CTL_IS_NOT_TIME_VALID 0x00020000 /* 131072 */ +#define CERT_TRUST_CTL_IS_NOT_SIGNATURE_VALID 0x00040000 /* 262144 */ +#define CERT_TRUST_CTL_IS_NOT_VALID_FOR_USAGE 0x00080000 /* 524288 */ + +#define CERT_TRUST_HAS_EXACT_MATCH_ISSUER 0x00000001 +#define CERT_TRUST_HAS_KEY_MATCH_ISSUER 0x00000002 +#define CERT_TRUST_HAS_NAME_MATCH_ISSUER 0x00000004 +#define CERT_TRUST_IS_SELF_SIGNED 0x00000008 +#define CERT_TRUST_IS_COMPLEX_CHAIN 0x00010000 /* 65336 */ + +#define CERT_CHAIN_POLICY_BASE ((LPCSTR)(1)) +#define CERT_CHAIN_POLICY_AUTHENTICODE ((LPCSTR)(2)) +#define CERT_CHAIN_POLICY_AUTHENTICODE_TS ((LPCSTR)(3)) +#define CERT_CHAIN_POLICY_SSL ((LPCSTR)(4)) +#define CERT_CHAIN_POLICY_BASIC_CONSTRAINTS ((LPCSTR)(5)) +#define CERT_CHAIN_POLICY_NT_AUTH ((LPCSTR)(6)) + +#define USAGE_MATCH_TYPE_AND 0 +#define USAGE_MATCH_TYPE_OR 1 + +#define CERT_SIMPLE_NAME_STR 1 +#define CERT_OID_NAME_STR 2 +#define CERT_X500_NAME_STR 3 + +#define CERT_NAME_STR_DISABLE_IE4_UTF8_FLAG 0x00010000 +#define CERT_NAME_STR_ENABLE_T61_UNICODE_FLAG 0x00020000 /* 131072 */ +#define CERT_NAME_STR_ENABLE_UTF8_UNICODE_FLAG 0x00040000 +#define CERT_NAME_STR_REVERSE_FLAG 0x02000000 /* 33554432 */ +#define CERT_NAME_STR_COMMA_FLAG 0x04000000 +#define CERT_NAME_STR_CRLF_FLAG 0x08000000 /* 134217728 */ +#define CERT_NAME_STR_NO_QUOTING_FLAG 0x10000000 /* 268435456 */ +#define CERT_NAME_STR_NO_PLUS_FLAG 0x20000000 /* 536870912 */ +#define CERT_NAME_STR_SEMICOLON_FLAG 0x40000000 /* 1073741824 */ + +#define CERT_FIND_ANY 0 +#define CERT_FIND_CERT_ID 0x00100000 /* 1048576 */ +#define CERT_FIND_CTL_USAGE 0x000A0000 /* 653360 */ +#define CERT_FIND_ENHKEY_USAGE 0x000A0000 /* 653360 */ +#define CERT_FIND_EXISTING 0x000D0000 /* 851968 */ +#define CERT_FIND_HASH 0x00010000 /* 65336 */ +#define CERT_FIND_ISSUER_ATTR 0x00030004 /* 196612 */ +#define CERT_FIND_ISSUER_NAME 0x00020004 /* 131076 */ +#define CERT_FIND_ISSUER_OF 0x000C0000 /* 786432 */ +#define CERT_FIND_KEY_IDENTIFIER 0x000F0000 /* 983040 */ +#define CERT_FIND_KEY_SPEC 0x00090000 /* 589824 */ +#define CERT_FIND_MD5_HASH 0x00040000 /* 262144 */ +#define CERT_FIND_PROPERTY 0x00050000 /* 327680 */ +#define CERT_FIND_PUBLIC_KEY 0x00060000 /* 393216 */ +#define CERT_FIND_SHA1_HASH 0x00010000 /* 65536 */ +#define CERT_FIND_SIGNATURE_HASH 0x000E0000 /* 917504 */ +#define CERT_FIND_SUBJECT_ATTR 0x00030007 /* 196615 */ +#define CERT_FIND_SUBJECT_CERT 0x000B0000 /* 720896 */ +#define CERT_FIND_SUBJECT_NAME 0x00020007 /* 131079 */ + +#define CERT_FIND_SUBJECT_STR __AW_EXTENDED__( CERT_FIND_SUBJECT_STR ) +#define CERT_FIND_SUBJECT_STR_A 0x00070007 /* 458759 */ +#define CERT_FIND_SUBJECT_STR_W 0x00080007 /* 524295 */ + +#define CERT_FIND_ISSUER_STR __AW_EXTENDED__( CERT_FIND_ISSUER_STR ) +#define CERT_FIND_ISSUER_STR_A 0x00070004 /* 458756 */ +#define CERT_FIND_ISSUER_STR_W 0x00080004 /* 524292 */ + +#define CERT_FIND_OR_ENHKEY_USAGE_FLAG 0x00000010 /* 16 */ +#define CERT_FIND_OPTIONAL_ENHKEY_USAGE_FLAG 0x00000001 +#define CERT_FIND_NO_ENHKEY_USAGE_FLAG 0x00000008 +#define CERT_FIND_VALID_ENHKEY_USAGE_FLAG 0x00000020 /* 32 */ +#define CERT_FIND_EXT_ONLY_ENHKEY_USAGE_FLAG 0x00000002 + +#define \ + CERT_CASE_INSENSITIVE_IS_RDN_ATTRS_FLAG 0x00000002 +#define CERT_UNICODE_IS_RDN_ATTRS_FLAG 0x00000001 + +#define CERT_CHAIN_FIND_BY_ISSUER 0x00000001 +#define \ + CERT_CHAIN_FIND_BY_ISSUER_COMPARE_KEY_FLAG 0x00000001 +#define \ + CERT_CHAIN_FIND_BY_ISSUER_COMPLEX_CHAIN_FLAG 0x00000002 +#define \ + CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_FLAG 0x00008000 /* 32768 */ +#define \ + CERT_CHAIN_FIND_BY_ISSUER_CACHE_ONLY_URL_FLAG 0x00000004 +#define \ + CERT_CHAIN_FIND_BY_ISSUER_LOCAL_MACHINE_FLAG 0x00000008 +#define CERT_CHAIN_FIND_BY_ISSUER_NO_KEY_FLAG 0x00004000 /* 16384 */ + +#define CERT_STORE_PROV_SYSTEM 10 +#define CERT_SYSTEM_STORE_LOCAL_MACHINE 0x00020000 /* 131072 */ + +#define szOID_PKIX_KP_SERVER_AUTH "4235600" +#define szOID_SERVER_GATED_CRYPTO "4235658" +#define szOID_SGC_NETSCAPE "2.16.840.1.113730.4.1" +#define szOID_PKIX_KP_CLIENT_AUTH "1.3.6.1.5.5.7.3.2" + - #define CRYPT_NOHASHOID 0x00000001 ++/* 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 KP_IV 0x00000001 +#define KP_SALT 0x00000002 +#define KP_PADDING 0x00000003 +#define KP_MODE 0x00000004 +#define KP_MODE_BITS 0x00000005 +#define KP_PERMISSIONS 0x00000006 +#define KP_ALGID 0x00000007 +#define KP_BLOCKLEN 0x00000008 +#define KP_KEYLEN 0x00000009 +#define KP_SALT_EX 0x0000000A +#define KP_P 0x0000000B +#define KP_G 0x0000000C +#define KP_Q 0x0000000D +#define KP_X 0x0000000E +#define KP_Y 0x0000000F +#define KP_RA 0x00000010 +#define KP_RB 0x00000011 +#define KP_INFO 0x00000012 +#define KP_EFFECTIVE_KEYLEN 0x00000013 +#define KP_SCHANNEL_ALG 0x00000014 +#define KP_PUB_PARAMS 0x00000027 + +#define CRYPT_FLAG_PCT1 0x00000001 +#define CRYPT_FLAG_SSL2 0x00000002 +#define CRYPT_FLAG_SSL3 0x00000004 +#define CRYPT_FLAG_TLS1 0x00000008 +#define CRYPT_FLAG_IPSEC 0x00000010 +#define CRYPT_FLAG_SIGNING 0x00000020 + +#define SCHANNEL_MAC_KEY 0x00000000 +#define SCHANNEL_ENC_KEY 0x00000001 + +#define INTERNATIONAL_USAGE 0x00000001 + +#if WINVER >= _WIN32_WINNT_WINXP +/* These are available only on Windows XP, Windows Server 2003, and later + */ +#define CMC_ADD_ATTRIBUTES ((LPCSTR)(63)) +#define CMC_ADD_EXTENSIONS ((LPCSTR)(62)) +#define X509_CERT_PAIR ((LPCSTR)(53)) +#define X509_CERTIFICATE_TEMPLATE ((LPCSTR)(64)) +#define X509_CROSS_CERT_DIST_POINTS ((LPCSTR)(58)) +#define CMC_DATA ((LPCSTR)(59)) +#define X509_NAME_CONSTRAINTS ((LPCSTR)(55)) +#define X509_POLICY_CONSTRAINTS ((LPCSTR)(57)) +#define X509_POLICY_MAPPINGS ((LPCSTR)(56)) +#define CMC_RESPONSE ((LPCSTR)(60)) +#define CMC_STATUS ((LPCSTR)(61)) +#endif /* WINVER >= _WIN32_WINNT_WINXP */ + +#define X509_ALGORITHM_IDENTIFIER ((LPCSTR)(74)) +#define X509_ALTERNATE_NAME ((LPCSTR)(12)) + +/* FIXME: need #define X509_ANY_STRING */ +#ifdef MINGW_TENTATIVE_ASSUMPTIONS +/* https://msdn.microsoft.com/en-us/library/aa378145.aspx suggests + * that this may be an alias for... + */ +#define X509_ANY_STRING X509_NAME_VALUE +#endif + +#define PKCS_ATTRIBUTE ((LPCSTR)(22)) +#define X509_AUTHORITY_INFO_ACCESS ((LPCSTR)(32)) +#define X509_AUTHORITY_KEY_ID ((LPCSTR) (9)) +#define X509_AUTHORITY_KEY_ID2 ((LPCSTR)(31)) + +#define szOID_BASIC_CONSTRAINTS "2.5.29.10" +#define X509_BASIC_CONSTRAINTS ((LPCSTR) (13)) +#define X509_BASIC_CONSTRAINTS2 ((LPCSTR) (15)) +#define X509_BIOMETRIC_EXT ((LPCSTR) (71)) +#define X509_BITS ((LPCSTR) (26)) +#define X509_CERT ((LPCSTR) (1)) +#define X509_CERT_CRL_TO_BE_SIGNED ((LPCSTR) (3)) +#define X509_CERT_POLICIES ((LPCSTR) (16)) +#define X509_CERT_REQUEST_TO_BE_SIGNED ((LPCSTR) (4)) +#define X509_CERT_TO_BE_SIGNED ((LPCSTR) (2)) +#define X509_CHOICE_OF_TIME ((LPCSTR) (30)) +#define PKCS_CONTENT_INFO ((LPCSTR) (33)) +#define PKCS_CONTENT_INFO_SEQUENCE_OF_ANY ((LPCSTR) (23)) +#define X509_CRL_DIST_POINTS ((LPCSTR) (35)) + +/* FIXME: need #define X509_CRL_REASON_CODE */ +#ifdef MINGW_TENTATIVE_ASSUMPTIONS +/* https://msdn.microsoft.com/en-us/library/aa378145.aspx suggests + * that this may be an alias for... + */ +#define X509_CRL_REASON_CODE X509_ENUMERATED +#endif + +#define RSA_CSP_PUBLICKEYBLOB ((LPCSTR) (19)) +#define PKCS_CTL ((LPCSTR) (37)) +#define X509_DSS_PARAMETERS ((LPCSTR) (39)) + +/* FIXME: need #define X509_DSS_PUBLICKEY */ +#ifdef MINGW_TENTATIVE_ASSUMPTIONS +/* https://msdn.microsoft.com/en-us/library/aa378145.aspx suggests + * that this may be an alias for... + */ +#define X509_DSS_PUBLICKEY X509_MULTI_BYTE_UINT +#endif + +#define X509_DSS_SIGNATURE ((LPCSTR) (40)) +#define X509_ECC_SIGNATURE ((LPCSTR) (47)) +#define X509_ENHANCED_KEY_USAGE ((LPCSTR) (36)) +#define X509_ENUMERATED ((LPCSTR) (29)) +#define X509_EXTENSIONS ((LPCSTR) (5)) +#define X509_INTEGER ((LPCSTR) (27)) +#define X509_ISSUING_DIST_POINT ((LPCSTR) (54)) +#define X509_KEY_ATTRIBUTES ((LPCSTR) (10)) +#define X509_KEY_USAGE ((LPCSTR) (14)) +#define X509_KEY_USAGE_RESTRICTION ((LPCSTR) (11)) +#define X509_KEYGEN_REQUEST_TO_BE_SIGNED ((LPCSTR) (21)) +#define X509_LOGOTYPE_EXT ((LPCSTR) (70)) +#define X509_MULTI_BYTE_INTEGER ((LPCSTR) (28)) +#define X509_MULTI_BYTE_UINT ((LPCSTR) (38)) +#define X509_NAME ((LPCSTR) (7)) +#define X509_NAME_VALUE ((LPCSTR) (6)) +#define X509_OBJECT_IDENTIFIER ((LPCSTR) (73)) +#define X509_OCTET_STRING ((LPCSTR) (25)) +#define X509_PUBLIC_KEY_INFO ((LPCSTR) (8)) +#define PKCS_RC2_CBC_PARAMETERS ((LPCSTR) (41)) +#define CNG_RSA_PUBLIC_KEY_BLOB ((LPCSTR) (72)) +#define PKCS_RSA_SSA_PSS_PARAMETERS ((LPCSTR) (75)) +#define PKCS_RSAES_OAEP_PARAMETERS ((LPCSTR) (76)) +#define ECC_CMS_SHARED_INFO ((LPCSTR) (77)) +#define X509_SEQUENCE_OF_ANY ((LPCSTR) (34)) +#define PKCS7_SIGNER_INFO ((LPCSTR)(500)) +#define CMS_SIGNER_INFO ((LPCSTR)(501)) +#define PKCS_SMIME_CAPABILITIES ((LPCSTR) (42)) +#define PKCS_TIME_REQUEST ((LPCSTR) (18)) + +/* FIXME: need #define X509_UNICODE_ANY_STRING */ +#ifdef MINGW_TENTATIVE_ASSUMPTIONS +/* https://msdn.microsoft.com/en-us/library/aa378145.aspx suggests + * that this may be an alias for... + */ +#define X509_UNICODE_ANY_STRING X509_UNICODE_NAME_VALUE +#endif + +#define X509_UNICODE_NAME ((LPCSTR) (20)) +#define X509_UNICODE_NAME_VALUE ((LPCSTR) (24)) +#define PKCS_UTC_TIME ((LPCSTR) (17)) +#define OCSP_SIGNED_REQUEST ((LPCSTR) (65)) +#define OCSP_REQUEST ((LPCSTR) (66)) +#define OCSP_RESPONSE ((LPCSTR) (67)) +#define OCSP_BASIC_SIGNED_RESPONSE ((LPCSTR) (68)) +#define OCSP_BASIC_RESPONSE ((LPCSTR) (69)) + +enum +{ CRL_REASON_UNSPECIFIED=0, + CRL_REASON_KEY_COMPROMISE=1, + CRL_REASON_CA_COMPROMISE=2, + CRL_REASON_AFFILIATION_CHANGED=3, + CRL_REASON_SUPERSEDED=4, + CRL_REASON_CESSATION_OF_OPERATION=5, + CRL_REASON_CERTIFICATE_HOLD=6, + CRL_REASON_REMOVE_FROM_CRL=7 +}; + +/* FIXME: need #define CRYPT_DECODE_NOCOPY_FLAG */ + +#define CRYPT_ENCODE_ALLOC_FLAG 0x00008000 +#define CRYPT_UNICODE_NAME_ENCODE_DISABLE_CHECK_TYPE_FLAG 0x40000000 +#define CRYPT_UNICODE_NAME_ENCODE_ENABLE_T61_UNICODE_FLAG 0x80000000 +#define CRYPT_UNICODE_NAME_ENCODE_ENABLE_UTF8_UNICODE_FLAG 0x20000000 +#define CRYPT_UNICODE_NAME_ENCODE_FORCE_UTF8_UNICODE_FLAG 0x10000000 + +/* Object ID codes from https://support.microsoft.com/en-gb/kb/287547 + * and/or from https://msdn.microsoft.com/en-us/library/aa378145.aspx + */ +#define szOID_RSA "1.2.840.113549" +#define szOID_PKCS "1.2.840.113549.1" +#define szOID_RSA_HASH "1.2.840.113549.2" +#define szOID_RSA_ENCRYPT "1.2.840.113549.3" +#define szOID_PKCS_1 "1.2.840.113549.1.1" +#define szOID_PKCS_2 "1.2.840.113549.1.2" +#define szOID_PKCS_3 "1.2.840.113549.1.3" +#define szOID_PKCS_4 "1.2.840.113549.1.4" +#define szOID_PKCS_5 "1.2.840.113549.1.5" +#define szOID_PKCS_6 "1.2.840.113549.1.6" +#define szOID_PKCS_7 "1.2.840.113549.1.7" +#define szOID_PKCS_8 "1.2.840.113549.1.8" +#define szOID_PKCS_9 "1.2.840.113549.1.9" +#define szOID_PKCS_10 "1.2.840.113549.1.10" +#define szOID_PKCS_12 "1.2.840.113549.1.12" +#define szOID_RSA_MD2 "1.2.840.113549.1.1.2" +#define szOID_RSA_MD4 "1.2.840.113549.1.1.3" +#define szOID_RSA_MD5 "1.2.840.113549.2.5" +#define szOID_RSA_RSA "1.2.840.113549.1.1.1" +#define szOID_RSA_MD2RSA "1.2.840.113549.1.1.2" +#define szOID_RSA_MD4RSA "1.2.840.113549.1.1.3" +#define szOID_RSA_MD5RSA "1.2.840.113549.1.1.4" +#define szOID_RSA_SHA1RSA "1.2.840.113549.1.1.5" +#define szOID_RSA_SETOAEP_RSA "1.2.840.113549.1.1.5" +#define szOID_RSA_DH "1.2.840.113549.1.3.1" +#define szOID_RSA_data "1.2.840.113549.1.7.1" +#define szOID_RSA_signedData "1.2.840.113549.1.7.2" +#define szOID_RSA_envelopedData "1.2.840.113549.1.7.3" +#define szOID_RSA_signEnvData "1.2.840.113549.1.7.4" +#define szOID_RSA_digestedData "1.2.840.113549.1.7.5" +#define szOID_RSA_hashedData "1.2.840.113549.1.7.5" +#define szOID_RSA_encryptedData "1.2.840.113549.1.7.6" +#define szOID_RSA_emailAddr "1.2.840.113549.1.9.1" +#define szOID_RSA_unstructName "1.2.840.113549.1.9.2" +#define szOID_RSA_contentType "1.2.840.113549.1.9.3" +#define szOID_RSA_messageDigest "1.2.840.113549.1.9.4" +#define szOID_RSA_signingTime "1.2.840.113549.1.9.5" +#define szOID_RSA_counterSign "1.2.840.113549.1.9.6" +#define szOID_RSA_challengePwd "1.2.840.113549.1.9.7" +#define szOID_RSA_unstructAddr "1.2.840.113549.1.9.8" +#define szOID_RSA_extCertAttrs "1.2.840.113549.1.9.9" +#define szOID_RSA_SMIMECapabilities "1.2.840.113549.1.9.15" +#define szOID_RSA_preferSignedData "1.2.840.113549.1.9.15.1" +#define szOID_RSA_RC2CBC "1.2.840.113549.3.2" +#define szOID_RSA_RC4 "1.2.840.113549.3.4" +#define szOID_RSA_DES_EDE3_CBC "1.2.840.113549.3.7" +#define szOID_RSA_RC5_CBCPad "1.2.840.113549.3.9" +#define szOID_ANSI_x942 "1.2.840.10046" +#define szOID_ANSI_x942_DH "1.2.840.10046.2.1" +#define szOID_X957 "1.2.840.10040" +#define szOID_X957_DSA "1.2.840.10040.4.1" +#define szOID_DATA STRUCTURE "1.2.840.10040.4.3" +#define szOID_DS "2.5" +#define szOID_DSALG "2.5.8" +#define szOID_DSALG_CRPT "2.5.8.1" +#define szOID_DSALG_HASH "2.5.8.2" +#define szOID_DSALG_SIGN "2.5.8.3" +#define szOID_DSALG_RSA "2.5.8.1.1" +#define szOID_OIW "1.3.14" +#define szOID_OIWSEC "1.3.14.3.2" +#define szOID_OIWSEC_md4RSA "1.3.14.3.2.2" +#define szOID_OIWSEC_md5RSA "1.3.14.3.2.3" +#define szOID_OIWSEC_md4RSA2 "1.3.14.3.2.4" +#define szOID_OIWSEC_desECB "1.3.14.3.2.6" +#define szOID_OIWSEC_desCBC "1.3.14.3.2.7" +#define szOID_OIWSEC_desOFB "1.3.14.3.2.8" +#define szOID_OIWSEC_desCFB "1.3.14.3.2.9" +#define szOID_OIWSEC_desMAC "1.3.14.3.2.10" +#define szOID_OIWSEC_rsaSign "1.3.14.3.2.11" +#define szOID_OIWSEC_dsa "1.3.14.3.2.12" +#define szOID_OIWSEC_shaDSA "1.3.14.3.2.13" +#define szOID_OIWSEC_mdc2RSA "1.3.14.3.2.14" +#define szOID_OIWSEC_shaRSA "1.3.14.3.2.15" +#define szOID_OIWSEC_dhCommMod "1.3.14.3.2.16" +#define szOID_OIWSEC_desEDE "1.3.14.3.2.17" +#define szOID_OIWSEC_sha "1.3.14.3.2.18" +#define szOID_OIWSEC_mdc2 "1.3.14.3.2.19" +#define szOID_OIWSEC_dsaComm "1.3.14.3.2.20" +#define szOID_OIWSEC_dsaCommSHA "1.3.14.3.2.21" +#define szOID_OIWSEC_rsaXchg "1.3.14.3.2.22" +#define szOID_OIWSEC_keyHashSeal "1.3.14.3.2.23" +#define szOID_OIWSEC_md2RSASign "1.3.14.3.2.24" +#define szOID_OIWSEC_md5RSASign "1.3.14.3.2.25" +#define szOID_OIWSEC_sha1 "1.3.14.3.2.26" +#define szOID_OIWSEC_dsaSHA1 "1.3.14.3.2.27" +#define szOID_OIWSEC_dsaCommSHA1 "1.3.14.3.2.28" +#define szOID_OIWSEC_sha1RSASign "1.3.14.3.2.29" +#define szOID_OIWDIR "1.3.14.7.2" +#define szOID_OIWDIR_CRPT "1.3.14.7.2.1" +#define szOID_OIWDIR_HASH "1.3.14.7.2.2" +#define szOID_OIWDIR_SIGN "1.3.14.7.2.3" +#define szOID_OIWDIR_md2 "1.3.14.7.2.2.1" +#define szOID_OIWDIR_md2RSA "1.3.14.7.2.3.1" +#define szOID_INFOSEC "2.16.840.1.101.2.1" +#define szOID_INFOSEC_sdnsSignature "2.16.840.1.101.2.1.1.1" +#define szOID_INFOSEC_mosaicSignature "2.16.840.1.101.2.1.1.2" +#define szOID_INFOSEC_sdnsConfidentiality "2.16.840.1.101.2.1.1.3" +#define szOID_INFOSEC_mosaicConfidentiality "2.16.840.1.101.2.1.1.4" +#define szOID_INFOSEC_sdnsIntegrity "2.16.840.1.101.2.1.1.5" +#define szOID_INFOSEC_mosaicIntegrity "2.16.840.1.101.2.1.1.6" +#define szOID_INFOSEC_sdnsTokenProtection "2.16.840.1.101.2.1.1.7" +#define szOID_INFOSEC_mosaicTokenProtection "2.16.840.1.101.2.1.1.8" #define szOID_INFOSEC_sdnsKeyManagement "2.16.840.1.101.2.1.1.9" -#define szOID_INFOSEC_mosaicKeyManagement "2.16.840.1.101.2.1.1.10" -#define szOID_INFOSEC_sdnsKMandSig "2.16.840.1.101.2.1.1.11" -#define szOID_INFOSEC_mosaicKMandSig "2.16.840.1.101.2.1.1.12" -#define szOID_INFOSEC_SuiteASignature "2.16.840.1.101.2.1.1.13" +#define szOID_INFOSEC_mosaicKeyManagement "2.16.840.1.101.2.1.1.10" +#define szOID_INFOSEC_sdnsKMandSig "2.16.840.1.101.2.1.1.11" +#define szOID_INFOSEC_mosaicKMandSig "2.16.840.1.101.2.1.1.12" +#define szOID_INFOSEC_SuiteASignature "2.16.840.1.101.2.1.1.13" #define szOID_INFOSEC_SuiteAConfidentiality "2.16.840.1.101.2.1.1.14" -#define szOID_INFOSEC_SuiteAIntegrity "2.16.840.1.101.2.1.1.15" -#define szOID_INFOSEC_SuiteATokenProtection "2.16.840.1.101.2.1.1.16" -#define szOID_INFOSEC_SuiteAKeyManagement "2.16.840.1.101.2.1.1.17" -#define szOID_INFOSEC_SuiteAKMandSig "2.16.840.1.101.2.1.1.18" -#define szOID_INFOSEC_mosaicUpdatedSig "2.16.840.1.101.2.1.1.19" +#define szOID_INFOSEC_SuiteAIntegrity "2.16.840.1.101.2.1.1.15" +#define szOID_INFOSEC_SuiteATokenProtection "2.16.840.1.101.2.1.1.16" +#define szOID_INFOSEC_SuiteAKeyManagement "2.16.840.1.101.2.1.1.17" +#define szOID_INFOSEC_SuiteAKMandSig "2.16.840.1.101.2.1.1.18" +#define szOID_INFOSEC_mosaicUpdatedSig "2.16.840.1.101.2.1.1.19" #define szOID_INFOSEC_mosaicKMandUpdSig "2.16.840.1.101.2.1.1.20" -#define szOID_INFOSEC_mosaicUpdatedInteg "2.16.840.1.101.2.1.1.21" -#define szOID_PKIX_NO_SIGNATURE "1.3.6.1.5.5.7.6.2" - -#define szOID_COMMON_NAME "2.5.4.3" -#define szOID_COUNTRY_NAME "2.5.4.6" -#define szOID_DEVICE_SERIAL_NUMBER "2.5.4.5" -#define szOID_DOMAIN_COMPONENT "0.9.2342.19200300.100.1.25" -#define szOID_RSA_emailAddr "1.2.840.113549.1.9.1" -#define szOID_GIVEN_NAME "2.5.4.42" -#define szOID_INITIALS "2.5.4.43" -#define szOID_LOCALITY_NAME "2.5.4.7" -#define szOID_ORGANIZATION_NAME "2.5.4.10" -#define szOID_ORGANIZATIONAL_UNIT_NAME "2.5.4.11" -#define szOID_STATE_OR_PROVINCE_NAME "2.5.4.8" -#define szOID_STREET_ADDRESS "2.5.4.9" -#define szOID_SUR_NAME "2.5.4.4" -#define szOID_TITLE "2.5.4.12" -#define szOID_RSA_unstructAddr "1.2.840.113549.1.9.8" -#define szOID_RSA_unstructName "1.2.840.113549.1.9.2" -#define szOID_BASIC_CONSTRAINTS2 "2.5.29.19" -#define szOID_APPLICATION_CERT_POLICIES "1.3.6.1.4.1.311.21.10" -#define szOID_APPLICATION_POLICY_CONSTRAINTS "1.3.6.1.4.1.311.21.12" -#define szOID_APPLICATION_POLICY_MAPPINGS "1.3.6.1.4.1.311.21.11" -#define szOID_AUTHORITY_INFO_ACCESS "1.3.6.1.5.5.7.1.1" -#define szOID_AUTHORITY_KEY_IDENTIFIER "2.5.29.1" -#define szOID_AUTHORITY_KEY_IDENTIFIER2 "2.5.29.35" -#define X509_BASIC_CONSTRAINTS (LPCSTR) 13 -#define szOID_BIOMETRIC_EXT "1.3.6.1.5.5.7.1.2" -#define szOID_CERT_EXTENSIONS "1.3.6.1.4.1.311.2.1.14" -#define szOID_CERT_POLICIES "2.5.29.32" -#if (WINVER >= 0x0501) /* Windows Server 2003, Windows XP */ -#define szOID_CERTIFICATE_TEMPLATE "1.3.6.1.4.1.311.21.7" -#define szOID_CRL_NUMBER "2.5.29.20" -#define szOID_CROSS_CERT_DIST_POINTS "1.3.6.1.4.1.311.10.9.1" -#define szOID_DELTA_CRL_INDICATOR "2.5.29.27" -#define szOID_ENROLLMENT_NAME_VALUE_PAIR "1.3.6.1.4.1.311.13.2.1" -#define szOID_FRESHEST_CRL "2.5.29.46" -#define szOID_ISSUING_DIST_POINT "2.5.29.28" -#define szOID_NAME_CONSTRAINTS "2.5.29.30" -#endif /* (WINVER >= 0x0501) */ /* Windows Server 2003, Windows XP */ -#define szOID_CRL_DIST_POINTS 2.5.29.31 -#define szOID_CRL_REASON_CODE "2.5.29.21" -#define szOID_CRL_VIRTUAL_BASE "1.3.6.1.4.1.311.21.3" -#define szOID_ECC_PUBLIC_KEY "1.2.840.10045.2.1" -#define szOID_ECDSA_SPECIFIED "1.2.840.10045.4.3" -#define szOID_ENHANCED_KEY_USAGE "2.5.29.37" -#define szOID_ISSUER_ALT_NAME "2.5.29.8" -#define szOID_ISSUER_ALT_NAME2 "2.5.29.18" -#define szOID_KEY_ATTRIBUTES "2.5.29.2" -#define szOID_KEY_USAGE "2.5.29.4" -#define szOID_KEY_USAGE_RESTRICTION "2.5.29.4" -#define szOID_LOGOTYPE_EXT "1.3.6.1.5.5.7.1.12" -/* need szOID_NEXT_UPDATE_LOCATION */ -#define szOID_POLICY_CONSTRAINTS "2.5.29.36" -#define szOID_POLICY_MAPPINGS "2.5.29.33" -#define szOID_RSA_SSA_PSS "1.2.840.113549.1.1.10" -#define szOID_RSAES_OAEP "1.2.840.113549.1.1.7" -#define szOID_SUBJECT_ALT_NAME "2.5.29.7" -#define szOID_SUBJECT_ALT_NAME2 "2.5.29.17" -#define szOID_SUBJECT_KEY_IDENTIFIER "2.5.29.14" - -typedef struct _CERT_BASIC_CONSTRAINTS2_INFO { - BOOL fCA; - BOOL fPathLenConstraint; - DWORD dwPathLenConstraint; -} CERT_BASIC_CONSTRAINTS2_INFO, - *PCERT_BASIC_CONSTRAINTS2_INFO; - -typedef VOID (WINAPI *PFN_CRYPT_FREE)(LPVOID pv); -typedef LPVOID (WINAPI *PFN_CRYPT_ALLOC)(size_t cbsize); -typedef struct _CRYPT_ENCODE_PARA { - DWORD cbSize; - PFN_CRYPT_ALLOC pfnAlloc; - PFN_CRYPT_FREE pfnFree; -} CRYPT_ENCODE_PARA, - *PCRYPT_ENCODE_PARA; +#define szOID_INFOSEC_mosaicUpdatedInteg "2.16.840.1.101.2.1.1.21" +#define szOID_PKIX_NO_SIGNATURE "1.3.6.1.5.5.7.6.2" + +#define szOID_COMMON_NAME "2.5.4.3" +#define szOID_COUNTRY_NAME "2.5.4.6" +#define szOID_DEVICE_SERIAL_NUMBER "2.5.4.5" +#define szOID_DOMAIN_COMPONENT "0.9.2342.19200300.100.1.25" - #define szOID_RSA_emailAddr "1.2.840.113549.1.9.1" +#define szOID_GIVEN_NAME "2.5.4.42" +#define szOID_INITIALS "2.5.4.43" +#define szOID_LOCALITY_NAME "2.5.4.7" +#define szOID_ORGANIZATION_NAME "2.5.4.10" +#define szOID_ORGANIZATIONAL_UNIT_NAME "2.5.4.11" +#define szOID_STATE_OR_PROVINCE_NAME "2.5.4.8" +#define szOID_STREET_ADDRESS "2.5.4.9" +#define szOID_SUR_NAME "2.5.4.4" +#define szOID_TITLE "2.5.4.12" - #define szOID_RSA_unstructAddr "1.2.840.113549.1.9.8" - #define szOID_RSA_unstructName "1.2.840.113549.1.9.2" +#define szOID_BASIC_CONSTRAINTS2 "2.5.29.19" +#define szOID_APPLICATION_CERT_POLICIES "1.3.6.1.4.1.311.21.10" +#define szOID_APPLICATION_POLICY_CONSTRAINTS "1.3.6.1.4.1.311.21.12" +#define szOID_APPLICATION_POLICY_MAPPINGS "1.3.6.1.4.1.311.21.11" +#define szOID_AUTHORITY_INFO_ACCESS "1.3.6.1.5.5.7.1.1" +#define szOID_AUTHORITY_KEY_IDENTIFIER "2.5.29.1" +#define szOID_AUTHORITY_KEY_IDENTIFIER2 "2.5.29.35" + +#define szOID_BIOMETRIC_EXT "1.3.6.1.5.5.7.1.2" +#define szOID_CERT_EXTENSIONS "1.3.6.1.4.1.311.2.1.14" +#define szOID_CERT_POLICIES "2.5.29.32" + +#if WINVER >= _WIN32_WINNT_WINXP +/* These are available only on Windows XP, Windows Server 2003, and later + */ +#define szOID_CERTIFICATE_TEMPLATE "1.3.6.1.4.1.311.21.7" +#define szOID_CRL_NUMBER "2.5.29.20" +#define szOID_CROSS_CERT_DIST_POINTS "1.3.6.1.4.1.311.10.9.1" +#define szOID_DELTA_CRL_INDICATOR "2.5.29.27" +#define szOID_ENROLLMENT_NAME_VALUE_PAIR "1.3.6.1.4.1.311.13.2.1" +#define szOID_FRESHEST_CRL "2.5.29.46" +#define szOID_ISSUING_DIST_POINT "2.5.29.28" +#define szOID_NAME_CONSTRAINTS "2.5.29.30" +#endif /* WINVER >= _WIN32_WINNT_WINXP */ + +#define szOID_CRL_DIST_POINTS "2.5.29.31" +#define szOID_CRL_REASON_CODE "2.5.29.21" +#define szOID_CRL_VIRTUAL_BASE "1.3.6.1.4.1.311.21.3" +#define szOID_ECC_PUBLIC_KEY "1.2.840.10045.2.1" +#define szOID_ECDSA_SPECIFIED "1.2.840.10045.4.3" +#define szOID_ENHANCED_KEY_USAGE "2.5.29.37" +#define szOID_ISSUER_ALT_NAME "2.5.29.8" +#define szOID_ISSUER_ALT_NAME2 "2.5.29.18" +#define szOID_KEY_ATTRIBUTES "2.5.29.2" +#define szOID_KEY_USAGE "2.5.29.4" +#define szOID_KEY_USAGE_RESTRICTION "2.5.29.4" +#define szOID_LOGOTYPE_EXT "1.3.6.1.5.5.7.1.12" +#define szOID_NEXT_UPDATE_LOCATION "1.3.6.1.4.1.311.10.2" +#define szOID_POLICY_CONSTRAINTS "2.5.29.36" +#define szOID_POLICY_MAPPINGS "2.5.29.33" +#define szOID_RSA_SSA_PSS "1.2.840.113549.1.1.10" +#define szOID_RSAES_OAEP "1.2.840.113549.1.1.7" +#define szOID_SUBJECT_ALT_NAME "2.5.29.7" +#define szOID_SUBJECT_ALT_NAME2 "2.5.29.17" +#define szOID_SUBJECT_KEY_IDENTIFIER "2.5.29.14" + +typedef struct _CERT_BASIC_CONSTRAINTS2_INFO +{ BOOL fCA; + BOOL fPathLenConstraint; + DWORD dwPathLenConstraint; +} CERT_BASIC_CONSTRAINTS2_INFO, *PCERT_BASIC_CONSTRAINTS2_INFO; + +typedef VOID (WINAPI *PFN_CRYPT_FREE)( LPVOID ); +typedef LPVOID (WINAPI *PFN_CRYPT_ALLOC)( size_t ); -/* Definition missing. */ +typedef struct _CRYPT_ENCODE_PARA +{ DWORD cbSize; + PFN_CRYPT_ALLOC pfnAlloc; + PFN_CRYPT_FREE pfnFree; +} CRYPT_ENCODE_PARA, *PCRYPT_ENCODE_PARA; + +/* FIXME: definition missing. */ typedef struct _CRYPT_DECODE_PARA *PCRYPT_DECODE_PARA; typedef UINT ALG_ID; @@@ -825,707 -669,635 +826,680 @@@ typedef ULONG HCRYPTHASH typedef PVOID HCERTSTORE; typedef PVOID HCRYPTMSG; typedef PVOID HCERTCHAINENGINE; -typedef struct _CRYPTOAPI_BLOB { - DWORD cbData; - BYTE* pbData; -} CRYPT_INTEGER_BLOB, *PCRYPT_INTEGER_BLOB, - CRYPT_UINT_BLOB, *PCRYPT_UINT_BLOB, - CRYPT_OBJID_BLOB, *PCRYPT_OBJID_BLOB, - CERT_NAME_BLOB, *PCERT_NAME_BLOB, - CERT_RDN_VALUE_BLOB,*PCERT_RDN_VALUE_BLOB, - CERT_BLOB, *PCERT_BLOB, - CRL_BLOB, *PCRL_BLOB, - DATA_BLOB, *PDATA_BLOB, - CRYPT_DATA_BLOB, *PCRYPT_DATA_BLOB, - CRYPT_HASH_BLOB, *PCRYPT_HASH_BLOB, - CRYPT_DIGEST_BLOB, *PCRYPT_DIGEST_BLOB, - CRYPT_DER_BLOB, *PCRYPT_DER_BLOB, - CRYPT_ATTR_BLOB, *PCRYPT_ATTR_BLOB; -/* not described in SDK; has the same layout as HTTPSPolicyCallbackData */ -typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA { - DWORD cbStruct; - DWORD dwAuthType; - DWORD fdwChecks; - LPWSTR pwszServerName; -} SSL_EXTRA_CERT_CHAIN_POLICY_PARA, *PSSL_EXTRA_CERT_CHAIN_POLICY_PARA, - HTTPSPolicyCallbackData, *PHTTPSPolicyCallbackData; -/* #if (_WIN32_WINNT>=0x500) */ -typedef struct _CERT_CHAIN_POLICY_PARA { - DWORD cbSize; - DWORD dwFlags; - void* pvExtraPolicyPara; + +typedef struct _CRYPTOAPI_BLOB +{ DWORD cbData; + BYTE *pbData; +}; +typedef struct _CRYPTOAPI_BLOB CRYPT_INTEGER_BLOB, *PCRYPT_INTEGER_BLOB; +typedef struct _CRYPTOAPI_BLOB CRYPT_UINT_BLOB, *PCRYPT_UINT_BLOB; +typedef struct _CRYPTOAPI_BLOB CRYPT_OBJID_BLOB, *PCRYPT_OBJID_BLOB; +typedef struct _CRYPTOAPI_BLOB CERT_NAME_BLOB, *PCERT_NAME_BLOB; +typedef struct _CRYPTOAPI_BLOB CERT_RDN_VALUE_BLOB, *PCERT_RDN_VALUE_BLOB; +typedef struct _CRYPTOAPI_BLOB CERT_BLOB, *PCERT_BLOB; +typedef struct _CRYPTOAPI_BLOB CRL_BLOB, *PCRL_BLOB; +typedef struct _CRYPTOAPI_BLOB DATA_BLOB, *PDATA_BLOB; +typedef struct _CRYPTOAPI_BLOB CRYPT_DATA_BLOB, *PCRYPT_DATA_BLOB; +typedef struct _CRYPTOAPI_BLOB CRYPT_HASH_BLOB, *PCRYPT_HASH_BLOB; +typedef struct _CRYPTOAPI_BLOB CRYPT_DIGEST_BLOB, *PCRYPT_DIGEST_BLOB; +typedef struct _CRYPTOAPI_BLOB CRYPT_DER_BLOB, *PCRYPT_DER_BLOB; +typedef struct _CRYPTOAPI_BLOB CRYPT_ATTR_BLOB, *PCRYPT_ATTR_BLOB; + +typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA +{ /* not described in SDK; has the same layout as HTTPSPolicyCallbackData + */ + DWORD cbStruct; + DWORD dwAuthType; + DWORD fdwChecks; + LPWSTR pwszServerName; +}; +typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA SSL_EXTRA_CERT_CHAIN_POLICY_PARA; +typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA *PSSL_EXTRA_CERT_CHAIN_POLICY_PARA; +typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA HTTPSPolicyCallbackData; +typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA *PHTTPSPolicyCallbackData; + +/* #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ +typedef struct _CERT_CHAIN_POLICY_PARA +{ DWORD cbSize; + DWORD dwFlags; + void *pvExtraPolicyPara; } CERT_CHAIN_POLICY_PARA, *PCERT_CHAIN_POLICY_PARA; -typedef struct _CERT_CHAIN_POLICY_STATUS { - DWORD cbSize; - DWORD dwError; - LONG lChainIndex; - LONG lElementIndex; - void* pvExtraPolicyStatus; + +typedef struct _CERT_CHAIN_POLICY_STATUS +{ DWORD cbSize; + DWORD dwError; + LONG lChainIndex; + LONG lElementIndex; + void *pvExtraPolicyStatus; } CERT_CHAIN_POLICY_STATUS, *PCERT_CHAIN_POLICY_STATUS; -/* #endif */ -typedef struct _CRYPT_ALGORITHM_IDENTIFIER { - LPSTR pszObjId; - CRYPT_OBJID_BLOB Parameters; +/* #endif _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ + +typedef struct _CRYPT_ALGORITHM_IDENTIFIER +{ LPSTR pszObjId; + CRYPT_OBJID_BLOB Parameters; } CRYPT_ALGORITHM_IDENTIFIER, *PCRYPT_ALGORITHM_IDENTIFIER; -typedef struct _CRYPT_BIT_BLOB { - DWORD cbData; - BYTE* pbData; - DWORD cUnusedBits; + +typedef struct _CRYPT_BIT_BLOB +{ DWORD cbData; + BYTE *pbData; + DWORD cUnusedBits; } CRYPT_BIT_BLOB, *PCRYPT_BIT_BLOB; -typedef struct _CERT_PUBLIC_KEY_INFO { - CRYPT_ALGORITHM_IDENTIFIER Algorithm; - CRYPT_BIT_BLOB PublicKey; + +typedef struct _CERT_PUBLIC_KEY_INFO +{ CRYPT_ALGORITHM_IDENTIFIER Algorithm; + CRYPT_BIT_BLOB PublicKey; } CERT_PUBLIC_KEY_INFO, *PCERT_PUBLIC_KEY_INFO; -typedef struct _CERT_EXTENSION { - LPSTR pszObjId; - BOOL fCritical; - CRYPT_OBJID_BLOB Value; + +typedef struct _CERT_EXTENSION +{ LPSTR pszObjId; + BOOL fCritical; + CRYPT_OBJID_BLOB Value; } CERT_EXTENSION, *PCERT_EXTENSION; -typedef struct _CERT_INFO { - DWORD dwVersion; - CRYPT_INTEGER_BLOB SerialNumber; - CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; - CERT_NAME_BLOB Issuer; - FILETIME NotBefore; - FILETIME NotAfter; - CERT_NAME_BLOB Subject; - CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo; - CRYPT_BIT_BLOB IssuerUniqueId; - CRYPT_BIT_BLOB SubjectUniqueId; - DWORD cExtension; - PCERT_EXTENSION rgExtension; + +typedef struct _CERT_INFO +{ DWORD dwVersion; + CRYPT_INTEGER_BLOB SerialNumber; + CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; + CERT_NAME_BLOB Issuer; + FILETIME NotBefore; + FILETIME NotAfter; + CERT_NAME_BLOB Subject; + CERT_PUBLIC_KEY_INFO SubjectPublicKeyInfo; + CRYPT_BIT_BLOB IssuerUniqueId; + CRYPT_BIT_BLOB SubjectUniqueId; + DWORD cExtension; + PCERT_EXTENSION rgExtension; } CERT_INFO, *PCERT_INFO; -typedef struct _CERT_CONTEXT { - DWORD dwCertEncodingType; - BYTE* pbCertEncoded; - DWORD cbCertEncoded; - PCERT_INFO pCertInfo; - HCERTSTORE hCertStore; + +typedef struct _CERT_CONTEXT +{ DWORD dwCertEncodingType; + BYTE *pbCertEncoded; + DWORD cbCertEncoded; + PCERT_INFO pCertInfo; + HCERTSTORE hCertStore; } CERT_CONTEXT, *PCERT_CONTEXT; + typedef const CERT_CONTEXT *PCCERT_CONTEXT; -typedef struct _CTL_USAGE { - DWORD cUsageIdentifier; - LPSTR *rgpszUsageIdentifier; -} CTL_USAGE, *PCTRL_USAGE, - CERT_ENHKEY_USAGE, *PCERT_ENHKEY_USAGE; -typedef struct _CERT_USAGE_MATCH { - DWORD dwType; - CERT_ENHKEY_USAGE Usage; + +typedef struct _CTL_USAGE +{ DWORD cUsageIdentifier; + LPSTR *rgpszUsageIdentifier; +} CTL_USAGE, *PCTRL_USAGE, CERT_ENHKEY_USAGE, *PCERT_ENHKEY_USAGE; + +typedef struct _CERT_USAGE_MATCH +{ DWORD dwType; + CERT_ENHKEY_USAGE Usage; } CERT_USAGE_MATCH, *PCERT_USAGE_MATCH; -/* #if (_WIN32_WINNT>=0x500) */ -typedef struct _CERT_CHAIN_PARA { - DWORD cbSize; - CERT_USAGE_MATCH RequestedUsage; -#if CERT_CHAIN_PARA_HAS_EXTRA_FIELDS - CERT_USAGE_MATCH RequestedIssuancePolicy; - DWORD dwUrlRetrievalTimeout; - BOOL fCheckRevocationFreshnessTime; - DWORD dwRevocationFreshnessTime; -#endif + +/* #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ +typedef struct _CERT_CHAIN_PARA +{ DWORD cbSize; + CERT_USAGE_MATCH RequestedUsage; + +# if CERT_CHAIN_PARA_HAS_EXTRA_FIELDS + + CERT_USAGE_MATCH RequestedIssuancePolicy; + DWORD dwUrlRetrievalTimeout; + BOOL fCheckRevocationFreshnessTime; + DWORD dwRevocationFreshnessTime; +# endif + } CERT_CHAIN_PARA, *PCERT_CHAIN_PARA; -typedef BOOL (WINAPI *PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK)(PCCERT_CONTEXT,void*); -typedef struct _CERT_CHAIN_FIND_BY_ISSUER_PARA { - DWORD cbSize; - LPCSTR pszUsageIdentifier; - DWORD dwKeySpec; - DWORD dwAcquirePrivateKeyFlags; - DWORD cIssuer; - CERT_NAME_BLOB* rgIssuer; - PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK pfnFIndCallback; - void* pvFindArg; - DWORD* pdwIssuerChainIndex; - DWORD* pdwIssuerElementIndex; + +typedef BOOL (WINAPI *PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK)( PCCERT_CONTEXT, void * ); + +typedef struct _CERT_CHAIN_FIND_BY_ISSUER_PARA +{ DWORD cbSize; + LPCSTR pszUsageIdentifier; + DWORD dwKeySpec; + DWORD dwAcquirePrivateKeyFlags; + DWORD cIssuer; + CERT_NAME_BLOB *rgIssuer; + PFN_CERT_CHAIN_FIND_BY_ISSUER_CALLBACK pfnFIndCallback; + void *pvFindArg; + DWORD *pdwIssuerChainIndex; + DWORD *pdwIssuerElementIndex; } CERT_CHAIN_FIND_BY_ISSUER_PARA, *PCERT_CHAIN_FIND_BY_ISSUER_PARA; -/* #endif */ -typedef struct _CERT_TRUST_STATUS { - DWORD dwErrorStatus; - DWORD dwInfoStatus; +/* #endif _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ + +typedef struct _CERT_TRUST_STATUS +{ DWORD dwErrorStatus; + DWORD dwInfoStatus; } CERT_TRUST_STATUS, *PCERT_TRUST_STATUS; -typedef struct _CRL_ENTRY { - CRYPT_INTEGER_BLOB SerialNumber; - FILETIME RevocationDate; - DWORD cExtension; - PCERT_EXTENSION rgExtension; + +typedef struct _CRL_ENTRY +{ CRYPT_INTEGER_BLOB SerialNumber; + FILETIME RevocationDate; + DWORD cExtension; + PCERT_EXTENSION rgExtension; } CRL_ENTRY, *PCRL_ENTRY; -typedef struct _CRL_INFO { - DWORD dwVersion; - CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; - CERT_NAME_BLOB Issuer; - FILETIME ThisUpdate; - FILETIME NextUpdate; - DWORD cCRLEntry; - PCRL_ENTRY rgCRLEntry; - DWORD cExtension; - PCERT_EXTENSION rgExtension; + +typedef struct _CRL_INFO +{ DWORD dwVersion; + CRYPT_ALGORITHM_IDENTIFIER SignatureAlgorithm; + CERT_NAME_BLOB Issuer; + FILETIME ThisUpdate; + FILETIME NextUpdate; + DWORD cCRLEntry; + PCRL_ENTRY rgCRLEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; } CRL_INFO, *PCRL_INFO; -typedef struct _CRL_CONTEXT { - DWORD dwCertEncodingType; - BYTE* pbCrlEncoded; - DWORD cbCrlEncoded; - PCRL_INFO pCrlInfo; - HCERTSTORE hCertStore; + +typedef struct _CRL_CONTEXT +{ DWORD dwCertEncodingType; + BYTE *pbCrlEncoded; + DWORD cbCrlEncoded; + PCRL_INFO pCrlInfo; + HCERTSTORE hCertStore; } CRL_CONTEXT, *PCRL_CONTEXT; + typedef const CRL_CONTEXT *PCCRL_CONTEXT; -typedef struct _CERT_REVOCATION_CRL_INFO { - DWORD cbSize; - PCCRL_CONTEXT pBaseCRLContext; - PCCRL_CONTEXT pDeltaCRLContext; - PCRL_ENTRY pCrlEntry; - BOOL fDeltaCrlEntry; +typedef struct _CERT_REVOCATION_CRL_INFO +{ DWORD cbSize; + PCCRL_CONTEXT pBaseCRLContext; + PCCRL_CONTEXT pDeltaCRLContext; + PCRL_ENTRY pCrlEntry; + BOOL fDeltaCrlEntry; } CERT_REVOCATION_CRL_INFO, *PCERT_REVOCATION_CRL_INFO; -typedef struct _CERT_REVOCATION_INFO { - DWORD cbSize; - DWORD dwRevocationResult; - LPCSTR pszRevocationOid; - LPVOID pvOidSpecificInfo; - BOOL fHasFreshnessTime; - DWORD dwFreshnessTime; - PCERT_REVOCATION_CRL_INFO pCrlInfo; + +typedef struct _CERT_REVOCATION_INFO +{ DWORD cbSize; + DWORD dwRevocationResult; + LPCSTR pszRevocationOid; + LPVOID pvOidSpecificInfo; + BOOL fHasFreshnessTime; + DWORD dwFreshnessTime; + PCERT_REVOCATION_CRL_INFO pCrlInfo; } CERT_REVOCATION_INFO, *PCERT_REVOCATION_INFO; -/* #if (_WIN32_WINNT>=0x500) */ -typedef struct _CERT_CHAIN_ELEMENT { - DWORD cbSize; - PCCERT_CONTEXT pCertContext; - CERT_TRUST_STATUS TrustStatus; - PCERT_REVOCATION_INFO pRevocationInfo; - PCERT_ENHKEY_USAGE pIssuanceUsage; - PCERT_ENHKEY_USAGE pApplicationUsage; + +/* #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ +typedef struct _CERT_CHAIN_ELEMENT +{ DWORD cbSize; + PCCERT_CONTEXT pCertContext; + CERT_TRUST_STATUS TrustStatus; + PCERT_REVOCATION_INFO pRevocationInfo; + PCERT_ENHKEY_USAGE pIssuanceUsage; + PCERT_ENHKEY_USAGE pApplicationUsage; } CERT_CHAIN_ELEMENT, *PCERT_CHAIN_ELEMENT; -/* #endif */ -typedef struct _CRYPT_ATTRIBUTE { - LPSTR pszObjId; - DWORD cValue; - PCRYPT_ATTR_BLOB rgValue; +/* #endif _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ + +typedef struct _CRYPT_ATTRIBUTE +{ LPSTR pszObjId; + DWORD cValue; + PCRYPT_ATTR_BLOB rgValue; } CRYPT_ATTRIBUTE, *PCRYPT_ATTRIBUTE; -typedef struct _CTL_ENTRY { - CRYPT_DATA_BLOB SubjectIdentifier; - DWORD cAttribute; - PCRYPT_ATTRIBUTE rgAttribute; + +typedef struct _CRYPT_ATTRIBUTE_TYPE_VALUE +{ LPSTR pszObjId; + CRYPT_OBJID_BLOB rgValue; +} CRYPT_ATTRIBUTE_TYPE_VALUE, *PCRYPT_ATTRIBUTE_TYPE_VALUE; + +typedef struct _CTL_ENTRY +{ CRYPT_DATA_BLOB SubjectIdentifier; + DWORD cAttribute; + PCRYPT_ATTRIBUTE rgAttribute; } CTL_ENTRY, *PCTL_ENTRY; -typedef struct _CTL_INFO { - DWORD dwVersion; - CTL_USAGE SubjectUsage; - CRYPT_DATA_BLOB ListIdentifier; - CRYPT_INTEGER_BLOB SequenceNumber; - FILETIME ThisUpdate; - FILETIME NextUpdate; - CRYPT_ALGORITHM_IDENTIFIER SubjectAlgorithm; - DWORD cCTLEntry; - PCTL_ENTRY rgCTLEntry; - DWORD cExtension; - PCERT_EXTENSION rgExtension; + +typedef struct _CTL_INFO +{ DWORD dwVersion; + CTL_USAGE SubjectUsage; + CRYPT_DATA_BLOB ListIdentifier; + CRYPT_INTEGER_BLOB SequenceNumber; + FILETIME ThisUpdate; + FILETIME NextUpdate; + CRYPT_ALGORITHM_IDENTIFIER SubjectAlgorithm; + DWORD cCTLEntry; + PCTL_ENTRY rgCTLEntry; + DWORD cExtension; + PCERT_EXTENSION rgExtension; } CTL_INFO, *PCTL_INFO; -typedef struct _CTL_CONTEXT { - DWORD dwMsgAndCertEncodingType; - BYTE* pbCtlEncoded; - DWORD cbCtlEncoded; - PCTL_INFO pCtlInfo; - HCERTSTORE hCertStore; - HCRYPTMSG hCryptMsg; - BYTE* pbCtlContent; - DWORD cbCtlContent; + +typedef struct _CTL_CONTEXT +{ DWORD dwMsgAndCertEncodingType; + BYTE *pbCtlEncoded; + DWORD cbCtlEncoded; + PCTL_INFO pCtlInfo; + HCERTSTORE hCertStore; + HCRYPTMSG hCryptMsg; + BYTE *pbCtlContent; + DWORD cbCtlContent; } CTL_CONTEXT, *PCTL_CONTEXT; + typedef const CTL_CONTEXT *PCCTL_CONTEXT; -typedef struct _CERT_TRUST_LIST_INFO { - DWORD cbSize; - PCTL_ENTRY pCtlEntry; - PCCTL_CONTEXT pCtlContext; +typedef struct _CERT_TRUST_LIST_INFO +{ DWORD cbSize; + PCTL_ENTRY pCtlEntry; + PCCTL_CONTEXT pCtlContext; } CERT_TRUST_LIST_INFO, *PCERT_TRUST_LIST_INFO; -typedef struct _CERT_SIMPLE_CHAIN { - DWORD cbSize; - CERT_TRUST_STATUS TrustStatus; - DWORD cElement; - PCERT_CHAIN_ELEMENT* rgpElement; - PCERT_TRUST_LIST_INFO pTrustListInfo; - BOOL fHasRevocationFreshnessTime; - DWORD dwRevocationFreshnessTime; + +typedef struct _CERT_SIMPLE_CHAIN +{ DWORD cbSize; + CERT_TRUST_STATUS TrustStatus; + DWORD cElement; + PCERT_CHAIN_ELEMENT *rgpElement; + PCERT_TRUST_LIST_INFO pTrustListInfo; + BOOL fHasRevocationFreshnessTime; + DWORD dwRevocationFreshnessTime; } CERT_SIMPLE_CHAIN, *PCERT_SIMPLE_CHAIN; -/* #if (_WIN32_WINNT>=0x500) */ + +/* #if _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ typedef const struct _CERT_CHAIN_CONTEXT* PCCERT_CHAIN_CONTEXT; -typedef struct _CERT_CHAIN_CONTEXT { - DWORD cbSize; - CERT_TRUST_STATUS TrustStatus; - DWORD cChain; - PCERT_SIMPLE_CHAIN* rgpChain; - DWORD cLowerQualityChainContext; - PCCERT_CHAIN_CONTEXT* rgpLowerQualityChainContext; - BOOL fHasRevocationFreshnessTime; - DWORD dwRevocationFreshnessTime; +typedef struct _CERT_CHAIN_CONTEXT +{ DWORD cbSize; + CERT_TRUST_STATUS TrustStatus; + DWORD cChain; + PCERT_SIMPLE_CHAIN *rgpChain; + DWORD cLowerQualityChainContext; + PCCERT_CHAIN_CONTEXT *rgpLowerQualityChainContext; + BOOL fHasRevocationFreshnessTime; + DWORD dwRevocationFreshnessTime; } CERT_CHAIN_CONTEXT, *PCERT_CHAIN_CONTEXT; -/* #endif */ -typedef struct _PROV_ENUMALGS { - ALG_ID aiAlgid; - DWORD dwBitLen; - DWORD dwNameLen; - CHAR szName[20]; +/* #endif _WIN32_WINNT >= _WIN32_WINNT_WIN2K */ + +typedef struct _PROV_ENUMALGS +{ ALG_ID aiAlgid; + DWORD dwBitLen; + DWORD dwNameLen; + CHAR szName[20]; } PROV_ENUMALGS; -typedef struct _PUBLICKEYSTRUC { - BYTE bType; - BYTE bVersion; - WORD reserved; - ALG_ID aiKeyAlg; + +typedef struct _PUBLICKEYSTRUC +{ BYTE bType; + BYTE bVersion; + WORD reserved; + ALG_ID aiKeyAlg; } BLOBHEADER, PUBLICKEYSTRUC; -typedef struct _RSAPUBKEY { - DWORD magic; - DWORD bitlen; - DWORD pubexp; + +typedef struct _RSAPUBKEY +{ DWORD magic; + DWORD bitlen; + DWORD pubexp; } RSAPUBKEY; + typedef struct _HMAC_Info -{ - ALG_ID HashAlgid; - BYTE* pbInnerString; - DWORD cbInnerString; - BYTE* pbOuterString; - DWORD cbOuterString; +{ ALG_ID HashAlgid; + BYTE *pbInnerString; + DWORD cbInnerString; + BYTE *pbOuterString; + DWORD cbOuterString; } HMAC_INFO, *PHMAC_INFO; -#if (WINVER >= 0x0501) /* Windows Server 2003, Windows XP */ -typedef struct _CMC_ADD_ATTRIBUTES_INFO { - DWORD dwCmcDataReference; - DWORD cCertReference; - DWORD* rgdwCertReference; - DWORD cAttribute; - PCRYPT_ATTRIBUTE rgAttribute; -} CMC_ADD_ATTRIBUTES_INFO, - *PCMC_ADD_ATTRIBUTES_INFO; -typedef struct _CMC_ADD_EXTENSIONS_INFO { - DWORD dwCmcDataReference; - DWORD cCertReference; - DWORD* rgdwCertReference; - DWORD cExtension; - PCERT_EXTENSION rgExtension; -} CMC_ADD_EXTENSIONS_INFO, - *PCMC_ADD_EXTENSIONS_INFO; -#endif /* (WINVER >= 0x0501) */ /* Windows Server 2003, Windows XP */ -#if (WINVER >= 0x0410) /* Windows 98 */ -/* need PCERT_OTHER_NAME & CERT_DATA_BLOB! -typedef struct _CERT_ALT_NAME_ENTRY { - DWORD dwAltNameChoice; - union { - PCERT_OTHER_NAME pOtherName; - LPWSTR pwszRfc822Name; - LPWSTR pwszDNSName; - CERT_DATA_BLOB x400Address; - CERT_NAME_BLOB DirectoryName; - LPWSTR pEdiPartyName; - LPWSTR pwszURL; - CRYPT_DATA_BLOB IPAddress; - LPSTR pszRegisteredID; + +#if WINVER >= _WIN32_WINNT_WINXP +/* Available only on Windows-XP, Windows Server 2003, and later. + */ +typedef struct _CMC_ADD_ATTRIBUTES_INFO +{ DWORD dwCmcDataReference; + DWORD cCertReference; + DWORD *rgdwCertReference; + DWORD cAttribute; + PCRYPT_ATTRIBUTE rgAttribute; +} CMC_ADD_ATTRIBUTES_INFO, *PCMC_ADD_ATTRIBUTES_INFO; + +typedef struct _CMC_ADD_EXTENSIONS_INFO +{ DWORD dwCmcDataReference; + DWORD cCertReference; + DWORD *rgdwCertReference; + DWORD cExtension; + PCERT_EXTENSION rgExtension; +} CMC_ADD_EXTENSIONS_INFO, *PCMC_ADD_EXTENSIONS_INFO; + +#endif /* WINVER >= _WIN32_WINNT_WINXP */ + +#if WINVER >= _WIN32_WINDOWS_98 +#ifdef MINGW_TENTATIVE_ASSUMPTIONS +/* FIXME: CERT_ALT_NAME_ENTRY needs definitions for PCERT_OTHER_NAME and + * (allegedly) CERT_DATA_BLOB (for the the x400Address field, which according to + * https://msdn.microsoft.com/en-us/library/windows/desktop/aa377173%28v=vs.85%29.aspx + * is NOT a member of this structure; similarly, neither is pEdiPartyName) + * + * The CERT_OTHER_NAME structure, (to which a PCERT_OTHER_NAME would point), is + * not documented on MSDN, (or on any other Microsoft reference site). There is, + * however, a tenuous suggestion within the CERT_ALT_NAME_ENTRY documentation, (at + * the aforementioned URL), that it comprises an object identifier (OID), and a + * BLOB specifying the name, (closely resembling a CRYPT_ATTRIBUTE_TYPE_VALUE); + * that this tenuous resemblance may suffice as an actual representation of a + * CERT_OTHER_NAME structure is further hinted at, in the form of a SEE ALSO + * reference to CRYPT_ATTRIBUTE_TYPE_VALUE, which appears to have no other + * relevance in the CERT_ALT_NAME_ENTRY context; hence, we may infer... + */ +typedef struct _CRYPT_ATTRIBUTE_TYPE_VALUE CERT_OTHER_NAME; +typedef struct _CRYPT_ATTRIBUTE_TYPE_VALUE *PCERT_OTHER_NAME; + +typedef struct _CERT_ALT_NAME_ENTRY +{ DWORD dwAltNameChoice; + union + { PCERT_OTHER_NAME pOtherName; + LPWSTR pwszRfc822Name; + LPWSTR pwszDNSName; + /* CERT_DATA_BLOB x400Address; */ /* never implemented? */ + CERT_NAME_BLOB DirectoryName; + /* LPWSTR pEdiPartyName; */ /* never implemented? */ + LPWSTR pwszURL; + CRYPT_DATA_BLOB IPAddress; + LPSTR pszRegisteredID; }; -} CERT_ALT_NAME_ENTRY, - *PCERT_ALT_NAME_ENTRY; -*/ -/* needs CERT_ALT_NAME_ENTRY above, which lacks prereqs -typedef struct _CERT_ALT_NAME_INFO { - DWORD cAltEntry; - PCERT_ALT_NAME_ENTRY rgAltEntry; -} CERT_ALT_NAME_INFO, - *PCERT_ALT_NAME_INFO; +} CERT_ALT_NAME_ENTRY, *PCERT_ALT_NAME_ENTRY; + +typedef struct _CERT_ALT_NAME_INFO +/* FIXME: this needs CERT_ALT_NAME_ENTRY above, which lacks prereqs */ +{ DWORD cAltEntry; + PCERT_ALT_NAME_ENTRY rgAltEntry; +} CERT_ALT_NAME_INFO, *PCERT_ALT_NAME_INFO; + +#endif /* MINGW_TENTATIVE_ASSUMPTIONS */ + +typedef struct _CERT_NAME_VALUE +{ DWORD dwValueType; + CERT_RDN_VALUE_BLOB Value; +} CERT_NAME_VALUE, *PCERT_NAME_VALUE; + +typedef struct _CERT_POLICY_QUALIFIER_INFO +{ LPSTR pszPolicyQualifierId; + CRYPT_OBJID_BLOB Qualifier; +} CERT_POLICY_QUALIFIER_INFO, *PCERT_POLICY_QUALIFIER_INFO; + +typedef struct _CERT_POLICY_CONSTRAINTS_INFO +{ BOOL fRequireExplicitPolicy; + DWORD dwRequireExplicitPolicySkipCerts; + BOOL fInhibitPolicyMapping; + DWORD dwInhibitPolicyMappingSkipCerts; +} CERT_POLICY_CONSTRAINTS_INFO, *PCERT_POLICY_CONSTRAINTS_INFO; + +#endif /* WINVER >= _WIN32_WINDOWS_98 */ + +#if WINVER >= _WIN32_WINNT_WINXP +/* Available only on Windows-XP, Windows Server 2003, and later. */ -typedef struct _CERT_NAME_VALUE { - DWORD dwValueType; - CERT_RDN_VALUE_BLOB Value; -} CERT_NAME_VALUE, - *PCERT_NAME_VALUE; -typedef struct _CERT_POLICY_QUALIFIER_INFO { - LPSTR pszPolicyQualifierId; - CRYPT_OBJID_BLOB Qualifier; -} CERT_POLICY_QUALIFIER_INFO, - *PCERT_POLICY_QUALIFIER_INFO; -typedef struct _CERT_POLICY_CONSTRAINTS_INFO { - BOOL fRequireExplicitPolicy; - DWORD dwRequireExplicitPolicySkipCerts; - BOOL fInhibitPolicyMapping; - DWORD dwInhibitPolicyMappingSkipCerts; -} CERT_POLICY_CONSTRAINTS_INFO, - *PCERT_POLICY_CONSTRAINTS_INFO; -#endif /* (WINVER >= 0x0410) */ /* Windows 98 */ -#if (WINVER >= 0x0501) /* Windows Server 2003, Windows XP */ -typedef struct _CERT_POLICY_MAPPING { - LPSTR pszIssuerDomainPolicy; - LPSTR pszSubjectDomainPolicy; -} CERT_POLICY_MAPPING, - *PCERT_POLICY_MAPPING; -typedef struct _CERT_POLICY_MAPPINGS_INFO { - DWORD cPolicyMapping; - PCERT_POLICY_MAPPING rgPolicyMapping; -} CERT_POLICY_MAPPINGS_INFO, - *PCERT_POLICY_MAPPINGS_INFO; - -#endif /* (WINVER >= 0x0501) */ /* Windows Server 2003, Windows XP */ - -//http://msdn.microsoft.com/en-us/library/aa922935.aspx -//Some Crypto Key Provider Information structures. -typedef struct _CRYPT_KEY_PROV_PARAM { - DWORD dwParam; - BYTE *pbData; - DWORD cbData; - DWORD dwFlags; +typedef struct _CERT_POLICY_MAPPING +{ LPSTR pszIssuerDomainPolicy; + LPSTR pszSubjectDomainPolicy; +} CERT_POLICY_MAPPING, *PCERT_POLICY_MAPPING; + +typedef struct _CERT_POLICY_MAPPINGS_INFO +{ DWORD cPolicyMapping; + PCERT_POLICY_MAPPING rgPolicyMapping; +} CERT_POLICY_MAPPINGS_INFO, *PCERT_POLICY_MAPPINGS_INFO; + +#endif /* WINVER >= _WIN32_WINNT_WINXP */ + +/* Some Crypto Key Provider Information structures. + */ +typedef struct _CRYPT_KEY_PROV_PARAM +{ /* From http://msdn.microsoft.com/en-us/library/aa922935.aspx + */ + DWORD dwParam; + BYTE *pbData; + DWORD cbData; + DWORD dwFlags; } CRYPT_KEY_PROV_PARAM, *PCRYPT_KEY_PROV_PARAM; -//http://msdn.microsoft.com/en-us/library/aa381420(VS.85).aspx -typedef struct _CRYPT_KEY_PROV_INFO { - LPWSTR pwszContainerName; - LPWSTR pwszProvName; - DWORD dwProvType; - DWORD dwFlags; - DWORD cProvParam; - PCRYPT_KEY_PROV_PARAM rgProvParam; - DWORD dwKeySpec; +typedef struct _CRYPT_KEY_PROV_INFO +{ /* From http://msdn.microsoft.com/en-us/library/aa381420(VS.85).aspx + */ + LPWSTR pwszContainerName; + LPWSTR pwszProvName; + DWORD dwProvType; + DWORD dwFlags; + DWORD cProvParam; + PCRYPT_KEY_PROV_PARAM rgProvParam; + DWORD dwKeySpec; } CRYPT_KEY_PROV_INFO, *PCRYPT_KEY_PROV_INFO; -#define CERT_SET_KEY_PROV_HANDLE_PROP_ID 0x00000001 -#define CERT_SET_KEY_CONTEXT_PROP_ID 0x00000001 - -#define CRYPT_KEYID_DELETE_FLAG 0x00000010 -#define CRYPT_KEYID_SET_NEW_FLAG 0x00002000 - -//certificate crl ctl IDs -#define CERT_KEY_PROV_HANDLE_PROP_ID 1 -#define CERT_KEY_PROV_INFO_PROP_ID 2 -#define CERT_SHA1_HASH_PROP_ID 3 -#define CERT_MD5_HASH_PROP_ID 4 -#define CERT_HASH_PROP_ID CERT_SHA1_HASH_PROP_ID -#define CERT_KEY_CONTEXT_PROP_ID 5 -#define CERT_KEY_SPEC_PROP_ID 6 -#define CERT_IE30_RESERVED_PROP_ID 7 -#define CERT_PUBKEY_HASH_RESERVED_PROP_ID 8 -#define CERT_ENHKEY_USAGE_PROP_ID 9 -#define CERT_CTL_USAGE_PROP_ID CERT_ENHKEY_USAGE_PROP_ID -#define CERT_NEXT_UPDATE_LOCATION_PROP_ID 10 -#define CERT_FRIENDLY_NAME_PROP_ID 11 -#define CERT_PVK_FILE_PROP_ID 12 -#define CERT_DESCRIPTION_PROP_ID 13 -#define CERT_ACCESS_STATE_PROP_ID 14 -#define CERT_SIGNATURE_HASH_PROP_ID 15 -#define CERT_SMART_CARD_DATA_PROP_ID 16 -#define CERT_EFS_PROP_ID 17 -#define CERT_FORTEZZA_DATA_PROP_ID 18 -#define CERT_ARCHIVED_PROP_ID 19 -#define CERT_KEY_IDENTIFIER_PROP_ID 20 -#define CERT_AUTO_ENROLL_PROP_ID 21 -#define CERT_PUBKEY_ALG_PARA_PROP_ID 22 -#define CERT_CROSS_CERT_DIST_POINTS_PROP_ID 23 -#define CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID 24 -#define CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID 25 -#define CERT_ENROLLMENT_PROP_ID 26 -#define CERT_DATE_STAMP_PROP_ID 27 -#define CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID 28 -#define CERT_SUBJECT_NAME_MD5_HASH_PROP_ID 29 -#define CERT_EXTENDED_ERROR_INFO_PROP_ID 30 - -//Certificate name type -#define CERT_NAME_EMAIL_TYPE 1 -#define CERT_NAME_RDN_TYPE 2 -#define CERT_NAME_ATTR_TYPE 3 -#define CERT_NAME_SIMPLE_DISPLAY_TYPE 4 -#define CERT_NAME_FRIENDLY_DISPLAY_TYPE 5 -#define CERT_NAME_DNS_TYPE 6 -#define CERT_NAME_URL_TYPE 7 -#define CERT_NAME_UPN_TYPE 8 - -//certificate/CRL, encoded, context or element disposition values. -#define CERT_STORE_ADD_NEW 1 -#define CERT_STORE_ADD_USE_EXISTING 2 -#define CERT_STORE_ADD_REPLACE_EXISTING 3 -#define CERT_STORE_ADD_ALWAYS 4 -#define CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES 5 -#define CERT_STORE_ADD_NEWER 6 -#define CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES 7 - -#define CRYPT_ACQUIRE_CACHE_FLAG 0x00000001 -#define CRYPT_ACQUIRE_USE_PROV_INFO_FLAG 0x00000002 -#define CRYPT_ACQUIRE_COMPARE_KEY_FLAG 0x00000004 -#define CRYPT_ACQUIRE_SILENT_FLAG 0x00000040 - -// dwFlags definitions for CryptAcquireContext -#define CRYPT_VERIFYCONTEXT 0xF0000000 - -// dwFlag definitions for CryptGenKey -#define CRYPT_ARCHIVABLE 0x00004000 - -#define RSA1024BIT_KEY 0x04000000 - -// dwFlags definitions for CryptDeriveKey -#define CRYPT_SERVER 0x00000400 - -#define KEY_LENGTH_MASK 0xFFFF0000 - -// dwFlag definitions for CryptExportKey -#define CRYPT_Y_ONLY 0x00000001 -#define CRYPT_SSL2_FALLBACK 0x00000002 -#define CRYPT_DESTROYKEY 0x00000004 -#define CRYPT_OAEP 0x00000040 // used with RSA encryptions/decryptions - // CryptExportKey, CryptImportKey, - // CryptEncrypt and CryptDecrypt - -#define CRYPT_BLOB_VER3 0x00000080 // export version 3 of a blob type -#define CRYPT_IPSEC_HMAC_KEY 0x00000100 // CryptImportKey only - -// dwFlags definitions for CryptDecrypt -// See also CRYPT_OAEP, above. -// Note, the following flag is not supported for CryptEncrypt -#define CRYPT_DECRYPT_RSA_NO_PADDING_CHECK 0x00000020 - -// dwFlags definitions for CryptCreateHash -#define CRYPT_SECRETDIGEST 0x00000001 - -// dwFlags definitions for CryptHashData -#define CRYPT_OWF_REPL_LM_HASH 0x00000001 // this is only for the OWF replacement CSP - -// dwFlags definitions for CryptHashSessionKey -#define CRYPT_LITTLE_ENDIAN 0x00000001 - -// dwFlags definitions for CryptSignHash and CryptVerifySignature -#define CRYPT_NOHASHOID 0x00000001 -#define CRYPT_TYPE2_FORMAT 0x00000002 -#define CRYPT_X931_FORMAT 0x00000004 - -// dwFlag definitions for CryptSetProviderEx and CryptGetDefaultProvider -#define CRYPT_MACHINE_DEFAULT 0x00000001 -#define CRYPT_USER_DEFAULT 0x00000002 -#define CRYPT_DELETE_DEFAULT 0x00000004 - -//algorithm +#define CERT_SET_KEY_PROV_HANDLE_PROP_ID 0x00000001 +#define CERT_SET_KEY_CONTEXT_PROP_ID 0x00000001 + +#define CRYPT_KEYID_DELETE_FLAG 0x00000010 +#define CRYPT_KEYID_SET_NEW_FLAG 0x00002000 + +/* Certificate crl ctl IDs. + */ +#define CERT_KEY_PROV_HANDLE_PROP_ID 1 +#define CERT_KEY_PROV_INFO_PROP_ID 2 +#define CERT_SHA1_HASH_PROP_ID 3 +#define CERT_MD5_HASH_PROP_ID 4 +#define CERT_HASH_PROP_ID CERT_SHA1_HASH_PROP_ID +#define CERT_KEY_CONTEXT_PROP_ID 5 +#define CERT_KEY_SPEC_PROP_ID 6 +#define CERT_IE30_RESERVED_PROP_ID 7 +#define CERT_PUBKEY_HASH_RESERVED_PROP_ID 8 +#define CERT_ENHKEY_USAGE_PROP_ID 9 +#define CERT_CTL_USAGE_PROP_ID CERT_ENHKEY_USAGE_PROP_ID +#define CERT_NEXT_UPDATE_LOCATION_PROP_ID 10 +#define CERT_FRIENDLY_NAME_PROP_ID 11 +#define CERT_PVK_FILE_PROP_ID 12 +#define CERT_DESCRIPTION_PROP_ID 13 +#define CERT_ACCESS_STATE_PROP_ID 14 +#define CERT_SIGNATURE_HASH_PROP_ID 15 +#define CERT_SMART_CARD_DATA_PROP_ID 16 +#define CERT_EFS_PROP_ID 17 +#define CERT_FORTEZZA_DATA_PROP_ID 18 +#define CERT_ARCHIVED_PROP_ID 19 +#define CERT_KEY_IDENTIFIER_PROP_ID 20 +#define CERT_AUTO_ENROLL_PROP_ID 21 +#define CERT_PUBKEY_ALG_PARA_PROP_ID 22 +#define CERT_CROSS_CERT_DIST_POINTS_PROP_ID 23 +#define CERT_ISSUER_PUBLIC_KEY_MD5_HASH_PROP_ID 24 +#define CERT_SUBJECT_PUBLIC_KEY_MD5_HASH_PROP_ID 25 +#define CERT_ENROLLMENT_PROP_ID 26 +#define CERT_DATE_STAMP_PROP_ID 27 +#define CERT_ISSUER_SERIAL_NUMBER_MD5_HASH_PROP_ID 28 +#define CERT_SUBJECT_NAME_MD5_HASH_PROP_ID 29 +#define CERT_EXTENDED_ERROR_INFO_PROP_ID 30 + +/* Certificate name type. + */ +#define CERT_NAME_EMAIL_TYPE 1 +#define CERT_NAME_RDN_TYPE 2 +#define CERT_NAME_ATTR_TYPE 3 +#define CERT_NAME_SIMPLE_DISPLAY_TYPE 4 +#define CERT_NAME_FRIENDLY_DISPLAY_TYPE 5 +#define CERT_NAME_DNS_TYPE 6 +#define CERT_NAME_URL_TYPE 7 +#define CERT_NAME_UPN_TYPE 8 + +/* Certificate/CRL, encoded, context or element disposition values. + */ +#define CERT_STORE_ADD_NEW 1 +#define CERT_STORE_ADD_USE_EXISTING 2 +#define CERT_STORE_ADD_REPLACE_EXISTING 3 +#define CERT_STORE_ADD_ALWAYS 4 + +#define CERT_STORE_ADD_REPLACE_EXISTING_INHERIT_PROPERTIES 5 + +#define CERT_STORE_ADD_NEWER 6 +#define CERT_STORE_ADD_NEWER_INHERIT_PROPERTIES 7 + +#define CRYPT_ACQUIRE_CACHE_FLAG 0x00000001 +#define CRYPT_ACQUIRE_USE_PROV_INFO_FLAG 0x00000002 +#define CRYPT_ACQUIRE_COMPARE_KEY_FLAG 0x00000004 +#define CRYPT_ACQUIRE_SILENT_FLAG 0x00000040 + - /* 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 + +/* dwFlags definitions for CryptDeriveKey + */ +#define CRYPT_SERVER 0x00000400 + +#define KEY_LENGTH_MASK 0xFFFF0000 + +/* dwFlag definitions for CryptExportKey + */ +#define CRYPT_Y_ONLY 0x00000001 +#define CRYPT_SSL2_FALLBACK 0x00000002 +#define CRYPT_DESTROYKEY 0x00000004 + +/* Used with RSA encryptions/decryptions, CryptExportKey, CryptImportKey, + * CryptEncrypt, and CryptDecrypt + */ +#define CRYPT_OAEP 0x00000040 + +#define CRYPT_BLOB_VER3 0x00000080 /* export version 3 of a blob type */ +#define CRYPT_IPSEC_HMAC_KEY 0x00000100 /* CryptImportKey only */ + +/* dwFlags definitions for CryptDecrypt; see also CRYPT_OAEP, above. + * Note, the following flag is not supported for CryptEncrypt + */ +#define CRYPT_DECRYPT_RSA_NO_PADDING_CHECK 0x00000020 + +/* dwFlags definitions for CryptCreateHash + */ +#define CRYPT_SECRETDIGEST 0x00000001 + +/* dwFlags definitions for CryptHashData + */ +#define CRYPT_OWF_REPL_LM_HASH 0x00000001 /* this is only for the OWF replacement CSP */ + +/* dwFlags definitions for CryptHashSessionKey + */ +#define CRYPT_LITTLE_ENDIAN 0x00000001 + +/* dwFlags definitions for CryptSignHash and CryptVerifySignature + */ +#define CRYPT_NOHASHOID 0x00000001 +#define CRYPT_TYPE2_FORMAT 0x00000002 +#define CRYPT_X931_FORMAT 0x00000004 + +/* dwFlag definitions for CryptSetProviderEx and CryptGetDefaultProvider + */ +#define CRYPT_MACHINE_DEFAULT 0x00000001 +#define CRYPT_USER_DEFAULT 0x00000002 +#define CRYPT_DELETE_DEFAULT 0x00000004 + +/* algorithm. + */ #define CALG_SSL3_SHAMD5 (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_SSL3SHAMD5) -//End of crypto key provider information structures - -BOOL WINAPI CertCloseStore(HCERTSTORE,DWORD); -BOOL WINAPI CertGetCertificateChain(HCERTCHAINENGINE,PCCERT_CONTEXT,LPFILETIME,HCERTSTORE,PCERT_CHAIN_PARA,DWORD,LPVOID,PCCERT_CHAIN_CONTEXT*); -BOOL WINAPI CertVerifyCertificateChainPolicy(LPCSTR,PCCERT_CHAIN_CONTEXT,PCERT_CHAIN_POLICY_PARA,PCERT_CHAIN_POLICY_STATUS); -void WINAPI CertFreeCertificateChain(PCCERT_CHAIN_CONTEXT); -DWORD WINAPI CertNameToStrA(DWORD,PCERT_NAME_BLOB,DWORD,LPSTR,DWORD); -DWORD WINAPI CertNameToStrW(DWORD,PCERT_NAME_BLOB,DWORD,LPWSTR,DWORD); -HCERTSTORE WINAPI CertOpenSystemStoreA(HCRYPTPROV,LPCSTR); -HCERTSTORE WINAPI CertOpenSystemStoreW(HCRYPTPROV,LPCWSTR); -HCERTSTORE WINAPI CertOpenStore(LPCSTR,DWORD,HCRYPTPROV,DWORD,const void*); -PCCERT_CONTEXT WINAPI CertFindCertificateInStore(HCERTSTORE,DWORD,DWORD,DWORD,const void*,PCCERT_CONTEXT); -BOOL WINAPI CertFreeCertificateContext(PCCERT_CONTEXT); -PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore(HCERTSTORE,PCCERT_CONTEXT,PCCERT_CONTEXT,DWORD*); -PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore(HCERTSTORE,DWORD,DWORD,DWORD,const void*,PCCERT_CHAIN_CONTEXT); - -HCERTSTORE WINAPI CertDuplicateStore(HCERTSTORE); -PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore(HCERTSTORE,PCCERT_CONTEXT); -PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext(PCCERT_CONTEXT); -DWORD WINAPI CertGetNameStringA(PCCERT_CONTEXT,DWORD,DWORD,void*,LPSTR,DWORD); -DWORD WINAPI CertGetNameStringW(PCCERT_CONTEXT,DWORD,DWORD,void*,LPWSTR,DWORD); -BOOL WINAPI PFXIsPFXBlob(CRYPT_DATA_BLOB*); -PCERT_EXTENSION WINAPI CertFindExtension(LPCSTR,DWORD,CERT_EXTENSION*); -BOOL WINAPI CryptDecodeObject(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,void*,DWORD*); -BOOL WINAPI CryptDecodeObjectEx(DWORD,LPCSTR,const BYTE*,DWORD,DWORD,PCRYPT_DECODE_PARA,void*,DWORD*); -BOOL WINAPI CryptEncodeObject(DWORD dwCertEncodingType,LPCSTR,const void*,BYTE*,DWORD*); -BOOL WINAPI CryptEncodeObjectEx(DWORD,LPCSTR,const void*,DWORD,PCRYPT_ENCODE_PARA,void*,DWORD*); -BOOL WINAPI CertAddCertificateContextToStore(HCERTSTORE,PCCERT_CONTEXT,DWORD,PCCERT_CONTEXT*); -BOOL WINAPI CertCompareCertificate(DWORD,PCERT_INFO,PCERT_INFO); -BOOL WINAPI PFXVerifyPassword(CRYPT_DATA_BLOB*,LPCWSTR,DWORD); -HCERTSTORE WINAPI PFXImportCertStore(CRYPT_DATA_BLOB*,LPCWSTR,DWORD); -BOOL WINAPI CertDeleteCertificateFromStore(PCCERT_CONTEXT); - -WINADVAPI BOOL WINAPI CryptAcquireContextA(HCRYPTPROV*,LPCSTR,LPCSTR,DWORD,DWORD); -WINADVAPI BOOL WINAPI CryptAcquireContextW(HCRYPTPROV*,LPCWSTR,LPCWSTR,DWORD,DWORD); -WINADVAPI BOOL WINAPI CryptContextAddRef(HCRYPTPROV,DWORD*,DWORD); -WINADVAPI BOOL WINAPI CryptReleaseContext(HCRYPTPROV,DWORD); -WINADVAPI BOOL WINAPI CryptGenKey(HCRYPTPROV,ALG_ID,DWORD,HCRYPTKEY*); -WINADVAPI BOOL WINAPI CryptDeriveKey(HCRYPTPROV,ALG_ID,HCRYPTHASH,DWORD,HCRYPTKEY*); -WINADVAPI BOOL WINAPI CryptDestroyKey(HCRYPTKEY); -#if (WINVER >= 0x0500) -WINADVAPI BOOL WINAPI CryptDuplicateHash(HCRYPTHASH,DWORD*,DWORD,HCRYPTHASH*); -WINADVAPI BOOL WINAPI CryptDuplicateKey(HCRYPTKEY,DWORD*,DWORD,HCRYPTKEY*); -#endif -WINADVAPI BOOL WINAPI CryptSetKeyParam(HCRYPTKEY,DWORD,PBYTE,DWORD); -WINADVAPI BOOL WINAPI CryptGetKeyParam(HCRYPTKEY,DWORD,PBYTE,PDWORD,DWORD); -WINADVAPI BOOL WINAPI CryptSetHashParam(HCRYPTHASH,DWORD,PBYTE,DWORD); -WINADVAPI BOOL WINAPI CryptGetHashParam(HCRYPTHASH,DWORD,PBYTE,PDWORD,DWORD); -WINADVAPI BOOL WINAPI CryptSetProvParam(HCRYPTPROV,DWORD,PBYTE,DWORD); -WINADVAPI BOOL WINAPI CryptGetProvParam(HCRYPTPROV,DWORD,PBYTE,PDWORD,DWORD); -WINADVAPI BOOL WINAPI CryptGenRandom(HCRYPTPROV,DWORD,PBYTE); -WINADVAPI BOOL WINAPI CryptGetUserKey(HCRYPTPROV,DWORD,HCRYPTKEY*); -WINADVAPI BOOL WINAPI CryptExportKey(HCRYPTKEY,HCRYPTKEY,DWORD,DWORD,PBYTE,PDWORD); -WINADVAPI BOOL WINAPI CryptImportKey(HCRYPTPROV,PBYTE,DWORD,HCRYPTKEY,DWORD,HCRYPTKEY*); -WINADVAPI BOOL WINAPI CryptEncrypt(HCRYPTKEY,HCRYPTHASH,BOOL,DWORD,PBYTE,PDWORD,DWORD); -WINADVAPI BOOL WINAPI CryptDecrypt(HCRYPTKEY,HCRYPTHASH,BOOL,DWORD,PBYTE,PDWORD); -WINADVAPI BOOL WINAPI CryptCreateHash(HCRYPTPROV,ALG_ID,HCRYPTKEY,DWORD,HCRYPTHASH*); -WINADVAPI BOOL WINAPI CryptHashData(HCRYPTHASH,PBYTE,DWORD,DWORD); -WINADVAPI BOOL WINAPI CryptHashSessionKey(HCRYPTHASH,HCRYPTKEY,DWORD); -WINADVAPI BOOL WINAPI CryptGetHashValue(HCRYPTHASH,DWORD,PBYTE,PDWORD); -WINADVAPI BOOL WINAPI CryptDestroyHash(HCRYPTHASH); -WINADVAPI BOOL WINAPI CryptSignHashA(HCRYPTHASH,DWORD,LPCSTR,DWORD,PBYTE,PDWORD); -WINADVAPI BOOL WINAPI CryptSignHashW(HCRYPTHASH,DWORD,LPCWSTR,DWORD,PBYTE,PDWORD); -WINADVAPI BOOL WINAPI CryptVerifySignatureA(HCRYPTHASH,PBYTE,DWORD,HCRYPTKEY,LPCSTR,DWORD); -WINADVAPI BOOL WINAPI CryptVerifySignatureW(HCRYPTHASH,PBYTE,DWORD,HCRYPTKEY,LPCWSTR,DWORD); -WINADVAPI BOOL WINAPI CryptSetProviderA(LPCSTR,DWORD); -WINADVAPI BOOL WINAPI CryptSetProviderW(LPCWSTR,DWORD); -WINADVAPI BOOL WINAPI CryptEnumProvidersA(DWORD,DWORD*,DWORD,DWORD*,LPTSTR,DWORD*); -WINADVAPI BOOL WINAPI CryptEnumProvidersW(DWORD,DWORD*,DWORD,DWORD*,LPTSTR,DWORD*); - -#ifdef UNICODE -#define CertGetNameString CertGetNameStringW -#else -#define CertGetNameString CertGetNameStringA -#endif +/* End of crypto key provider information structures. + */ -#ifdef UNICODE -#define CertNameToStr CertNameToStrW -#define CryptAcquireContext CryptAcquireContextW -#define CryptSignHash CryptSignHashW -#define CryptVerifySignature CryptVerifySignatureW -#define CryptSetProvider CryptSetProviderW -#define CryptEnumProviders CryptEnumProvidersW -#define CertOpenSystemStore CertOpenSystemStoreW -#define CERT_FIND_SUBJECT_STR CERT_FIND_SUBJECT_STR_W -#define CERT_FIND_ISSUER_STR CERT_FIND_ISSUER_STR_W -#define MS_DEF_PROV MS_DEF_PROV_W -#define MS_ENHANCED_PROV MS_ENHANCED_PROV_W -#define MS_STRONG_PROV MS_STRONG_PROV_W -#define MS_DEF_RSA_SIG_PROV MS_DEF_RSA_SIG_PROV_W -#define MS_DEF_RSA_SCHANNEL_PROV MS_DEF_RSA_SCHANNEL_PROV_W -#define MS_DEF_DSS_PROV MS_DEF_DSS_PROV_W -#define MS_DEF_DSS_DH_PROV MS_DEF_DSS_DH_PROV_W -#define MS_ENH_DSS_DH_PROV MS_ENH_DSS_DH_PROV_W -#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_W -#define MS_SCARD_PROV MS_SCARD_PROV_W -#if (_WIN32_WINNT >= 0x0501) -#define MS_ENH_RSA_AES_PROV MS_ENH_RSA_AES_PROV_W -#endif -#else -#define CertNameToStr CertNameToStrA -#define CryptAcquireContext CryptAcquireContextA -#define CryptSignHash CryptSignHashA -#define CryptVerifySignature CryptVerifySignatureA -#define CryptSetProvider CryptSetProviderA -#define CryptEnumProviders CryptEnumProvidersA -#define CertOpenSystemStore CertOpenSystemStoreA -#define CERT_FIND_SUBJECT_STR CERT_FIND_SUBJECT_STR_A -#define CERT_FIND_ISSUER_STR CERT_FIND_ISSUER_STR_A -#define MS_DEF_PROV MS_DEF_PROV_A -#define MS_ENHANCED_PROV MS_ENHANCED_PROV_A -#define MS_STRONG_PROV MS_STRONG_PROV_A -#define MS_DEF_RSA_SIG_PROV MS_DEF_RSA_SIG_PROV_A -#define MS_DEF_RSA_SCHANNEL_PROV MS_DEF_RSA_SCHANNEL_PROV_A -#define MS_DEF_DSS_PROV MS_DEF_DSS_PROV_A -#define MS_DEF_DSS_DH_PROV MS_DEF_DSS_DH_PROV_A -#define MS_ENH_DSS_DH_PROV MS_ENH_DSS_DH_PROV_A -#define MS_DEF_DH_SCHANNEL_PROV MS_DEF_DH_SCHANNEL_PROV_A -#define MS_SCARD_PROV MS_SCARD_PROV_A -#if (_WIN32_WINNT >= 0x0501) -#define MS_ENH_RSA_AES_PROV MS_ENH_RSA_AES_PROV_A -#endif +BOOL WINAPI CertCloseStore( HCERTSTORE, DWORD ); +BOOL WINAPI CertGetCertificateChain( HCERTCHAINENGINE, PCCERT_CONTEXT, LPFILETIME, HCERTSTORE, PCERT_CHAIN_PARA, DWORD, LPVOID, PCCERT_CHAIN_CONTEXT * ); +BOOL WINAPI CertVerifyCertificateChainPolicy( LPCSTR, PCCERT_CHAIN_CONTEXT, PCERT_CHAIN_POLICY_PARA, PCERT_CHAIN_POLICY_STATUS ); +void WINAPI CertFreeCertificateChain( PCCERT_CHAIN_CONTEXT ); + +#define CertNameToStr __AW_SUFFIXED__( CertNameToStr ) +DWORD WINAPI CertNameToStrA( DWORD, PCERT_NAME_BLOB, DWORD, LPSTR, DWORD ); +DWORD WINAPI CertNameToStrW( DWORD, PCERT_NAME_BLOB, DWORD, LPWSTR, DWORD ); + +#define CertOpenSystemStore __AW_SUFFIXED__( CertOpenSystemStore ) +HCERTSTORE WINAPI CertOpenSystemStoreA( HCRYPTPROV, LPCSTR ); +HCERTSTORE WINAPI CertOpenSystemStoreW( HCRYPTPROV, LPCWSTR ); + +HCERTSTORE WINAPI CertOpenStore( LPCSTR, DWORD, HCRYPTPROV, DWORD, const void * ); +PCCERT_CONTEXT WINAPI CertFindCertificateInStore( HCERTSTORE, DWORD, DWORD, DWORD, const void *, PCCERT_CONTEXT ); +BOOL WINAPI CertFreeCertificateContext( PCCERT_CONTEXT ); +PCCERT_CONTEXT WINAPI CertGetIssuerCertificateFromStore( HCERTSTORE, PCCERT_CONTEXT, PCCERT_CONTEXT, DWORD * ); +PCCERT_CHAIN_CONTEXT WINAPI CertFindChainInStore( HCERTSTORE, DWORD, DWORD, DWORD, const void *, PCCERT_CHAIN_CONTEXT ); + +HCERTSTORE WINAPI CertDuplicateStore( HCERTSTORE ); +PCCERT_CONTEXT WINAPI CertEnumCertificatesInStore( HCERTSTORE, PCCERT_CONTEXT ); +PCCERT_CONTEXT WINAPI CertDuplicateCertificateContext( PCCERT_CONTEXT ); + +#define CertGetNameString __AW_SUFFIXED__( CertGetNameString ) +DWORD WINAPI CertGetNameStringA( PCCERT_CONTEXT, DWORD, DWORD, void *, LPSTR, DWORD ); +DWORD WINAPI CertGetNameStringW( PCCERT_CONTEXT, DWORD, DWORD, void *, LPWSTR, DWORD ); + +BOOL WINAPI PFXIsPFXBlob( CRYPT_DATA_BLOB * ); +PCERT_EXTENSION WINAPI CertFindExtension( LPCSTR, DWORD, CERT_EXTENSION * ); +BOOL WINAPI CryptDecodeObject( DWORD, LPCSTR, const BYTE *, DWORD, DWORD, void *, DWORD * ); +BOOL WINAPI CryptDecodeObjectEx( DWORD, LPCSTR, const BYTE *, DWORD, DWORD, PCRYPT_DECODE_PARA, void *, DWORD * ); +BOOL WINAPI CryptEncodeObject( DWORD, LPCSTR, const void *, BYTE *, DWORD * ); +BOOL WINAPI CryptEncodeObjectEx( DWORD, LPCSTR, const void *, DWORD, PCRYPT_ENCODE_PARA, void *, DWORD * ); +BOOL WINAPI CertAddCertificateContextToStore( HCERTSTORE, PCCERT_CONTEXT, DWORD, PCCERT_CONTEXT * ); +BOOL WINAPI CertCompareCertificate( DWORD, PCERT_INFO, PCERT_INFO ); +BOOL WINAPI PFXVerifyPassword( CRYPT_DATA_BLOB *, LPCWSTR, DWORD ); +HCERTSTORE WINAPI PFXImportCertStore( CRYPT_DATA_BLOB *, LPCWSTR, DWORD ); +BOOL WINAPI CertDeleteCertificateFromStore( PCCERT_CONTEXT ); + +#define CryptAcquireContext __AW_SUFFIXED__( CryptAcquireContext ) +WINADVAPI BOOL WINAPI CryptAcquireContextA( HCRYPTPROV *, LPCSTR, LPCSTR, DWORD, DWORD ); +WINADVAPI BOOL WINAPI CryptAcquireContextW( HCRYPTPROV *, LPCWSTR, LPCWSTR, DWORD, DWORD ); + +WINADVAPI BOOL WINAPI CryptContextAddRef( HCRYPTPROV, DWORD *, DWORD ); +WINADVAPI BOOL WINAPI CryptReleaseContext( HCRYPTPROV, DWORD ); +WINADVAPI BOOL WINAPI CryptGenKey( HCRYPTPROV, ALG_ID, DWORD, HCRYPTKEY * ); +WINADVAPI BOOL WINAPI CryptDeriveKey( HCRYPTPROV, ALG_ID, HCRYPTHASH, DWORD, HCRYPTKEY * ); +WINADVAPI BOOL WINAPI CryptDestroyKey( HCRYPTKEY ); + +#if WINVER >= _WIN32_WINNT_WIN2K +WINADVAPI BOOL WINAPI CryptDuplicateHash( HCRYPTHASH, DWORD *, DWORD, HCRYPTHASH * ); +WINADVAPI BOOL WINAPI CryptDuplicateKey( HCRYPTKEY, DWORD *, DWORD, HCRYPTKEY * ); #endif -/* from http://msdn2.microsoft.com/en-us/library/Aa380263.aspx: */ -typedef struct _CRYPTPROTECT_PROMPTSTRUCT { - DWORD cbSize; - DWORD dwPromptFlags; - HWND hwndApp; - LPCWSTR szPrompt; -} CRYPTPROTECT_PROMPTSTRUCT, -*PCRYPTPROTECT_PROMPTSTRUCT; - - -/* from http://msdn2.microsoft.com/en-us/library/aa380261.aspx */ -BOOL WINAPI CryptProtectData (DATA_BLOB*, LPCWSTR, DATA_BLOB*, PVOID, CRYPTPROTECT_PROMPTSTRUCT*, DWORD, DATA_BLOB*); - -/* http://msdn2.microsoft.com/en-us/library/aa380882.aspx */ -BOOL WINAPI CryptUnprotectData (DATA_BLOB*, LPWSTR*, DATA_BLOB*, PVOID, CRYPTPROTECT_PROMPTSTRUCT*, DWORD, DATA_BLOB*); - -/* from http://msdn2.microsoft.com/en-us/library/aa302402.aspx: */ -#define CRYPTPROTECT_UI_FORBIDDEN 0x1 -#define CRYPTPROTECT_LOCAL_MACHINE 0x4 - -//For Mozilla trunk -typedef BOOL (WINAPI *PFN_CRYPT_ENUM_KEYID_PROP)(const CRYPT_HASH_BLOB *, DWORD, void *, void *, DWORD,DWORD,void **,DWORD); - -BOOL WINAPI CertGetCertificateContextProperty (PCCERT_CONTEXT, DWORD, void *, DWORD *); -BOOL WINAPI CryptEnumKeyIdentifierProperties (const CRYPT_HASH_BLOB *, DWORD, DWORD, LPCWSTR, void *, void *, PFN_CRYPT_ENUM_KEYID_PROP); -BOOL WINAPI CryptAcquireCertificatePrivateKey(PCCERT_CONTEXT, DWORD, void *, HCRYPTPROV *, DWORD *, BOOL *); -PCCERT_CONTEXT WINAPI CertCreateCertificateContext (DWORD, const BYTE *, DWORD); -BOOL WINAPI CryptGetKeyIdentifierProperty( const CRYPT_HASH_BLOB *, DWORD, DWORD, LPCWSTR, void *, void *, DWORD *); -BOOL WINAPI CertSetCertificateContextProperty( PCCERT_CONTEXT, DWORD, DWORD, void *); -BOOL WINAPI CertCompareCertificateName( DWORD, PCERT_NAME_BLOB, PCERT_NAME_BLOB); -BOOL WINAPI CryptSetKeyIdentifierProperty (const CRYPT_HASH_BLOB *, DWORD, DWORD, LPCWSTR, void *, void *); + +WINADVAPI BOOL WINAPI CryptSetKeyParam( HCRYPTKEY, DWORD, PBYTE, DWORD ); +WINADVAPI BOOL WINAPI CryptGetKeyParam( HCRYPTKEY, DWORD, PBYTE, PDWORD, DWORD ); +WINADVAPI BOOL WINAPI CryptSetHashParam( HCRYPTHASH, DWORD, PBYTE, DWORD ); +WINADVAPI BOOL WINAPI CryptGetHashParam( HCRYPTHASH, DWORD, PBYTE, PDWORD, DWORD ); +WINADVAPI BOOL WINAPI CryptSetProvParam( HCRYPTPROV, DWORD, PBYTE, DWORD ); +WINADVAPI BOOL WINAPI CryptGetProvParam( HCRYPTPROV, DWORD, PBYTE, PDWORD, DWORD ); +WINADVAPI BOOL WINAPI CryptGenRandom( HCRYPTPROV, DWORD, PBYTE ); +WINADVAPI BOOL WINAPI CryptGetUserKey( HCRYPTPROV, DWORD, HCRYPTKEY * ); +WINADVAPI BOOL WINAPI CryptExportKey( HCRYPTKEY, HCRYPTKEY, DWORD, DWORD, PBYTE, PDWORD ); +WINADVAPI BOOL WINAPI CryptImportKey( HCRYPTPROV, PBYTE, DWORD, HCRYPTKEY, DWORD, HCRYPTKEY * ); +WINADVAPI BOOL WINAPI CryptEncrypt( HCRYPTKEY, HCRYPTHASH, BOOL, DWORD, PBYTE, PDWORD, DWORD ); +WINADVAPI BOOL WINAPI CryptDecrypt( HCRYPTKEY, HCRYPTHASH, BOOL, DWORD, PBYTE, PDWORD ); +WINADVAPI BOOL WINAPI CryptCreateHash( HCRYPTPROV, ALG_ID, HCRYPTKEY, DWORD, HCRYPTHASH * ); +WINADVAPI BOOL WINAPI CryptHashData( HCRYPTHASH, PBYTE, DWORD, DWORD ); +WINADVAPI BOOL WINAPI CryptHashSessionKey( HCRYPTHASH, HCRYPTKEY, DWORD ); +WINADVAPI BOOL WINAPI CryptGetHashValue( HCRYPTHASH, DWORD, PBYTE, PDWORD ); +WINADVAPI BOOL WINAPI CryptDestroyHash( HCRYPTHASH ); + +#define CryptSignHash __AW_SUFFIXED__( CryptSignHash ) +WINADVAPI BOOL WINAPI CryptSignHashA( HCRYPTHASH, DWORD, LPCSTR, DWORD, PBYTE, PDWORD ); +WINADVAPI BOOL WINAPI CryptSignHashW( HCRYPTHASH, DWORD, LPCWSTR, DWORD, PBYTE, PDWORD ); + +#define CryptVerifySignature __AW_SUFFIXED__( CryptVerifySignature ) +WINADVAPI BOOL WINAPI CryptVerifySignatureA( HCRYPTHASH, PBYTE, DWORD, HCRYPTKEY, LPCSTR, DWORD ); +WINADVAPI BOOL WINAPI CryptVerifySignatureW( HCRYPTHASH, PBYTE, DWORD, HCRYPTKEY, LPCWSTR, DWORD ); + +#define CryptSetProvider __AW_SUFFIXED__( CryptSetProvider ) +WINADVAPI BOOL WINAPI CryptSetProviderA( LPCSTR, DWORD ); +WINADVAPI BOOL WINAPI CryptSetProviderW( LPCWSTR, DWORD ); + +#define CryptEnumProviders __AW_SUFFIXED__( CryptEnumProviders ) +WINADVAPI BOOL WINAPI CryptEnumProvidersA( DWORD, DWORD *, DWORD, DWORD *, LPSTR, DWORD * ); +WINADVAPI BOOL WINAPI CryptEnumProvidersW( DWORD, DWORD *, DWORD, DWORD *, LPWSTR, DWORD * ); + +typedef struct _CRYPTPROTECT_PROMPTSTRUCT +{ /* From http://msdn2.microsoft.com/en-us/library/Aa380263.aspx: + */ + DWORD cbSize; + DWORD dwPromptFlags; + HWND hwndApp; + LPCWSTR szPrompt; +} CRYPTPROTECT_PROMPTSTRUCT, *PCRYPTPROTECT_PROMPTSTRUCT; + + +/* From http://msdn2.microsoft.com/en-us/library/aa380261.aspx + */ +BOOL WINAPI CryptProtectData( DATA_BLOB *, LPCWSTR, DATA_BLOB *, PVOID, CRYPTPROTECT_PROMPTSTRUCT *, DWORD, DATA_BLOB * ); + +/* From http://msdn2.microsoft.com/en-us/library/aa380882.aspx + */ +BOOL WINAPI CryptUnprotectData( DATA_BLOB *, LPWSTR *, DATA_BLOB *, PVOID, CRYPTPROTECT_PROMPTSTRUCT *, DWORD, DATA_BLOB * ); + +/* From http://msdn2.microsoft.com/en-us/library/aa302402.aspx: + */ +#define CRYPTPROTECT_UI_FORBIDDEN 0x1 +#define CRYPTPROTECT_LOCAL_MACHINE 0x4 + +typedef BOOL (WINAPI *PFN_CRYPT_ENUM_KEYID_PROP)( const CRYPT_HASH_BLOB *, DWORD, void *, void *, DWORD, DWORD, void **, DWORD ); + +BOOL WINAPI CertGetCertificateContextProperty( PCCERT_CONTEXT, DWORD, void *, DWORD * ); +BOOL WINAPI CryptEnumKeyIdentifierProperties( const CRYPT_HASH_BLOB *, DWORD, DWORD, LPCWSTR, void *, void *, PFN_CRYPT_ENUM_KEYID_PROP ); +BOOL WINAPI CryptAcquireCertificatePrivateKey( PCCERT_CONTEXT, DWORD, void *, HCRYPTPROV *, DWORD *, BOOL * ); +PCCERT_CONTEXT WINAPI CertCreateCertificateContext( DWORD, const BYTE *, DWORD ); +BOOL WINAPI CryptGetKeyIdentifierProperty( const CRYPT_HASH_BLOB *, DWORD, DWORD, LPCWSTR, void *, void *, DWORD * ); +BOOL WINAPI CertSetCertificateContextProperty( PCCERT_CONTEXT, DWORD, DWORD, void * ); +BOOL WINAPI CertCompareCertificateName( DWORD, PCERT_NAME_BLOB, PCERT_NAME_BLOB ); +BOOL WINAPI CryptSetKeyIdentifierProperty( const CRYPT_HASH_BLOB *, DWORD, DWORD, LPCWSTR, void *, void * ); DWORD WINAPI CertOIDToAlgId( LPCSTR ); -BOOL WINAPI CryptGetDefaultProviderA(DWORD,DWORD,DWORD,LPSTR,DWORD); -BOOL WINAPI CryptGetDefaultProviderW(DWORD,DWORD,DWORD,LPSTR,DWORD); -#ifdef UNICODE -#define CryptGetDefaultProvider CryptGetDefaultProviderW -#else -#define CryptGetDefaultProvider CryptGetDefaultProviderA -#endif // !UNICODE +#define CryptGetDefaultProvider __AW_SUFFIXED__( CryptGetDefaultProvider ) +BOOL WINAPI CryptGetDefaultProviderA( DWORD, DWORD, DWORD, LPSTR, DWORD ); +BOOL WINAPI CryptGetDefaultProviderW( DWORD, DWORD, DWORD, LPWSTR, DWORD ); +_END_C_DECLS -#ifdef __cplusplus -} -#endif -#endif /* _WINCRYPT_H */ +#endif /* ! _WINCRYPT_H: $RCSfile$: end of file */