From 599bc18f33c8579bbbf8f82447539cc9aa33a1c4 Mon Sep 17 00:00:00 2001 From: David Fort Date: Thu, 6 Jan 2022 10:43:30 +0100 Subject: [PATCH] winpr: fix bcrypt.h string constants --- winpr/include/winpr/bcrypt.h | 275 ++++++++++++++++++++++++++--------- 1 file changed, 206 insertions(+), 69 deletions(-) diff --git a/winpr/include/winpr/bcrypt.h b/winpr/include/winpr/bcrypt.h index 23cb7c2dc..3c50034c5 100644 --- a/winpr/include/winpr/bcrypt.h +++ b/winpr/include/winpr/bcrypt.h @@ -33,92 +33,229 @@ typedef PVOID BCRYPT_KEY_HANDLE; typedef PVOID BCRYPT_HASH_HANDLE; typedef PVOID BCRYPT_SECRET_HANDLE; -#define BCRYPT_RSA_ALGORITHM (const WCHAR*)"R\x00S\x00A\x00\x00" -#define BCRYPT_RSA_SIGN_ALGORITHM (const WCHAR*)"R\x00S\x00A\x00_\x00S\x00I\x00G\x00N\x00\x00" +#define BCRYPT_RSA_ALGORITHM \ + (const WCHAR*)"R\x00S\x00" \ + "A\x00\x00" +#define BCRYPT_RSA_SIGN_ALGORITHM \ + (const WCHAR*)"R\x00S\x00" \ + "A\x00_\x00S\x00I\x00G\x00N\x00\x00" #define BCRYPT_DH_ALGORITHM (const WCHAR*)"D\x00H\x00\x00" -#define BCRYPT_DSA_ALGORITHM (const WCHAR*)"D\x00S\x00A\x00\x00" -#define BCRYPT_RC2_ALGORITHM (const WCHAR*)"R\x00C\x002\x00\x00" -#define BCRYPT_RC4_ALGORITHM (const WCHAR*)"R\x00C\x004\x00\x00" -#define BCRYPT_AES_ALGORITHM (const WCHAR*)"A\x00E\x00S\x00\x00" -#define BCRYPT_DES_ALGORITHM (const WCHAR*)"D\x00E\x00S\x00\x00" -#define BCRYPT_DESX_ALGORITHM (const WCHAR*)"D\x00E\x00S\x00X\x00\x00" -#define BCRYPT_3DES_ALGORITHM (const WCHAR*)"3\x00D\x00E\x00S\x00\x00" -#define BCRYPT_3DES_112_ALGORITHM (const WCHAR*)"3\x00D\x00E\x00S\x00_\x001\x001\x002\x00\x00" -#define BCRYPT_MD2_ALGORITHM (const WCHAR*)"M\x00D\x002\x00\x00" -#define BCRYPT_MD4_ALGORITHM (const WCHAR*)"M\x00D\x004\x00\x00" -#define BCRYPT_MD5_ALGORITHM (const WCHAR*)"M\x00D\x005\x00\x00" -#define BCRYPT_SHA1_ALGORITHM (const WCHAR*)"S\x00H\x00A\x001\x00\x00" -#define BCRYPT_SHA256_ALGORITHM (const WCHAR*)"S\x00H\x00A\x002\x005\x006\x00\x00" -#define BCRYPT_SHA384_ALGORITHM (const WCHAR*)"S\x00H\x00A\x003\x008\x004\x00\x00" -#define BCRYPT_SHA512_ALGORITHM (const WCHAR*)"S\x00H\x00A\x005\x001\x002\x00\x00" -#define BCRYPT_AES_GMAC_ALGORITHM (const WCHAR*)"A\x00E\x00S\x00-\x00G\x00M\x00A\x00C\x00\x00" -#define BCRYPT_ECDSA_ALGORITHM (const WCHAR*)"E\x00C\x00D\x00S\x00A\x00\x00" +#define BCRYPT_DSA_ALGORITHM \ + (const WCHAR*)"D\x00S\x00" \ + "A\x00\x00" +#define BCRYPT_RC2_ALGORITHM \ + (const WCHAR*)"R\x00" \ + "C\x002\x00\x00" +#define BCRYPT_RC4_ALGORITHM \ + (const WCHAR*)"R\x00" \ + "C\x004\x00\x00" +#define BCRYPT_AES_ALGORITHM \ + (const WCHAR*)"A\x00" \ + "E\x00S\x00\x00" +#define BCRYPT_DES_ALGORITHM \ + (const WCHAR*)"D\x00" \ + "E\x00S\x00\x00" +#define BCRYPT_DESX_ALGORITHM \ + (const WCHAR*)"D\x00" \ + "E\x00S\x00X\x00\x00" +#define BCRYPT_3DES_ALGORITHM \ + (const WCHAR*)"3\x00" \ + "D\x00" \ + "E\x00S\x00\x00" +#define BCRYPT_3DES_112_ALGORITHM \ + (const WCHAR*)"3\x00" \ + "D\x00" \ + "E\x00S\x00_\x001\x001\x002\x00\x00" +#define BCRYPT_MD2_ALGORITHM \ + (const WCHAR*)"M\x00" \ + "D\x002\x00\x00" +#define BCRYPT_MD4_ALGORITHM \ + (const WCHAR*)"M\x00" \ + "D\x004\x00\x00" +#define BCRYPT_MD5_ALGORITHM \ + (const WCHAR*)"M\x00" \ + "D\x005\x00\x00" +#define BCRYPT_SHA1_ALGORITHM \ + (const WCHAR*)"S\x00H\x00" \ + "A\x001\x00\x00" +#define BCRYPT_SHA256_ALGORITHM \ + (const WCHAR*)"S\x00H\x00" \ + "A\x002\x005\x006\x00\x00" +#define BCRYPT_SHA384_ALGORITHM \ + (const WCHAR*)"S\x00H\x00" \ + "A\x003\x008\x004\x00\x00" +#define BCRYPT_SHA512_ALGORITHM \ + (const WCHAR*)"S\x00H\x00" \ + "A\x005\x001\x002\x00\x00" +#define BCRYPT_AES_GMAC_ALGORITHM \ + (const WCHAR*)"A\x00" \ + "E\x00S\x00-\x00G\x00M\x00" \ + "A\x00" \ + "C\x00\x00" +#define BCRYPT_ECDSA_ALGORITHM \ + (const WCHAR*)"E\x00" \ + "C\x00" \ + "D\x00S\x00" \ + "A\x00\x00" #define BCRYPT_ECDSA_P256_ALGORITHM \ - (const WCHAR*)"E\x00C\x00D\x00S\x00A\x00_\x00P\x002\x005\x006\x00\x00" + (const WCHAR*)"E\x00" \ + "C\x00" \ + "D\x00S\x00" \ + "A\x00_\x00P\x002\x005\x006\x00\x00" #define BCRYPT_ECDSA_P384_ALGORITHM \ - (const WCHAR*)"E\x00C\x00D\x00S\x00A\x00_\x00P\x003\x008\x004\x00\x00" + (const WCHAR*)"E\x00" \ + "C\x00" \ + "D\x00S\x00" \ + "A\x00_\x00P\x003\x008\x004\x00\x00" #define BCRYPT_ECDSA_P521_ALGORITHM \ - (const WCHAR*)"E\x00C\x00D\x00S\x00A\x00_\x00P\x005\x002\x001\x00\x00" + (const WCHAR*)"E\x00" \ + "C\x00" \ + "D\x00S\x00" \ + "A\x00_\x00P\x005\x002\x001\x00\x00" #define BCRYPT_ECDH_P256_ALGORITHM \ - (const WCHAR*)"E\x00C\x00D\x00S\x00A\x00_\x00P\x002\x005\x006\x00\x00" + (const WCHAR*)"E\x00" \ + "C\x00" \ + "D\x00S\x00" \ + "A\x00_\x00P\x002\x005\x006\x00\x00" #define BCRYPT_ECDH_P384_ALGORITHM \ - (const WCHAR*)"E\x00C\x00D\x00S\x00A\x00_\x00P\x003\x008\x004\x00\x00" + (const WCHAR*)"E\x00" \ + "C\x00" \ + "D\x00S\x00" \ + "A\x00_\x00P\x003\x008\x004\x00\x00" #define BCRYPT_ECDH_P521_ALGORITHM \ - (const WCHAR*)"E\x00C\x00D\x00S\x00A\x00_\x00P\x005\x002\x001\x00\x00" + (const WCHAR*)"E\x00" \ + "C\x00" \ + "D\x00S\x00" \ + "A\x00_\x00P\x005\x002\x001\x00\x00" #define BCRYPT_RNG_ALGORITHM (const WCHAR*)"R\x00N\x00G\x00\x00" -#define BCRYPT_RNG_FIPS186_DSA_ALGORITHM \ - (const WCHAR*)"F\x00I\x00P\x00S\x001\x008\x006\x00D\x00S\x00A\x00R\x00N\x00G\x00\x00" -#define BCRYPT_RNG_DUAL_EC_ALGORITHM (const WCHAR*)"D\x00U\x00A\x00L\x00E\x00R\x00N\x00G\x00\x00" +#define BCRYPT_RNG_FIPS186_DSA_ALGORITHM \ + (const WCHAR*)"F\x00I\x00P\x00S\x001\x008\x006\x00" \ + "D\x00S\x00" \ + "A\x00R\x00N\x00G\x00\x00" +#define BCRYPT_RNG_DUAL_EC_ALGORITHM \ + (const WCHAR*)"D\x00U\x00" \ + "A\x00L\x00" \ + "E\x00R\x00N\x00G\x00\x00" -#define MS_PRIMITIVE_PROVIDER \ - (const WCHAR*)"M\x00i\x00c\x00r\x00o\x00s\x00o\x00f\x00t\x00 " \ - "\x00P\x00r\x00i\x00m\x00i\x00t\x00i\x00v\x00e\x00 " \ - "\x00P\x00r\x00o\x00v\x00i\x00d\x00e\x00r\x00\x00" +#define MS_PRIMITIVE_PROVIDER \ + (const WCHAR*)"M\x00i\x00" \ + "c\x00r\x00o\x00s\x00o\x00" \ + "f\x00t\x00 " \ + "\x00P\x00r\x00i\x00m\x00i\x00t\x00i\x00v\x00" \ + "e\x00 " \ + "\x00P\x00r\x00o\x00v\x00i\x00" \ + "d\x00" \ + "e\x00r\x00\x00" #define BCRYPT_ALG_HANDLE_HMAC_FLAG 0x00000008 #define BCRYPT_PROV_DISPATCH 0x00000001 -#define BCRYPT_OBJECT_LENGTH \ - (const WCHAR*)"O\x00b\x00j\x00e\x00c\x00t\x00L\x00e\x00n\x00g\x00t\x00h\x00\x00" -#define BCRYPT_ALGORITHM_NAME \ - (const WCHAR*)"A\x00l\x00g\x00o\x00r\x00i\x00t\x00h\x00m\x00N\x00a\x00m\x00e\x00\x00" -#define BCRYPT_PROVIDER_HANDLE \ - (const WCHAR*)"P\x00r\x00o\x00v\x00i\x00d\x00e\x00r\x00H\x00a\x00n\x00d\x00l\x00e\x00\x00" -#define BCRYPT_CHAINING_MODE \ - (const WCHAR*)"C\x00h\x00a\x00i\x00n\x00i\x00n\x00g\x00M\x00o\x00d\x00e\x00\x00" -#define BCRYPT_BLOCK_LENGTH \ - (const WCHAR*)"B\x00l\x00o\x00c\x00k\x00L\x00e\x00n\x00g\x00t\x00h\x00\x00" -#define BCRYPT_KEY_LENGTH (const WCHAR*)"K\x00e\x00y\x00L\x00e\x00n\x00g\x00t\x00h\x00\x00" -#define BCRYPT_KEY_OBJECT_LENGTH \ - (const WCHAR*)"K\x00e\x00y\x00O\x00b\x00j\x00e\x00c\x00t\x00L\x00e\x00n\x00g\x00t\x00h\x00" \ +#define BCRYPT_OBJECT_LENGTH \ + (const WCHAR*)"O\x00" \ + "b\x00j\x00" \ + "e\x00" \ + "c\x00t\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00\x00" +#define BCRYPT_ALGORITHM_NAME \ + (const WCHAR*)"A\x00l\x00g\x00o\x00r\x00i\x00t\x00h\x00m\x00N\x00" \ + "a\x00m\x00" \ + "e\x00\x00" +#define BCRYPT_PROVIDER_HANDLE \ + (const WCHAR*)"P\x00r\x00o\x00v\x00i\x00" \ + "d\x00" \ + "e\x00r\x00H\x00" \ + "a\x00n\x00" \ + "d\x00l\x00" \ + "e\x00\x00" +#define BCRYPT_CHAINING_MODE \ + (const WCHAR*)"C\x00h\x00" \ + "a\x00i\x00n\x00i\x00n\x00g\x00M\x00o\x00" \ + "d\x00" \ + "e\x00\x00" +#define BCRYPT_BLOCK_LENGTH \ + (const WCHAR*)"B\x00l\x00o\x00" \ + "c\x00k\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00\x00" +#define BCRYPT_KEY_LENGTH \ + (const WCHAR*)"K\x00" \ + "e\x00y\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00\x00" +#define BCRYPT_KEY_OBJECT_LENGTH \ + (const WCHAR*)"K\x00" \ + "e\x00y\x00O\x00" \ + "b\x00j\x00" \ + "e\x00" \ + "c\x00t\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00" \ "\x00" -#define BCRYPT_KEY_STRENGTH \ - (const WCHAR*)"K\x00e\x00y\x00S\x00t\x00r\x00e\x00n\x00g\x00t\x00h\x00\x00" -#define BCRYPT_KEY_LENGTHS (const WCHAR*)"K\x00e\x00y\x00L\x00e\x00n\x00g\x00t\x00h\x00s\x00\x00" -#define BCRYPT_BLOCK_SIZE_LIST \ - (const WCHAR*)"B\x00l\x00o\x00c\x00k\x00S\x00i\x00z\x00e\x00L\x00i\x00s\x00t\x00\x00" -#define BCRYPT_EFFECTIVE_KEY_LENGTH \ - (const WCHAR*)"E\x00f\x00f\x00e\x00c\x00t\x00i\x00v\x00e\x00K\x00e\x00y\x00L\x00e\x00n\x00g" \ +#define BCRYPT_KEY_STRENGTH \ + (const WCHAR*)"K\x00" \ + "e\x00y\x00S\x00t\x00r\x00" \ + "e\x00n\x00g\x00t\x00h\x00\x00" +#define BCRYPT_KEY_LENGTHS \ + (const WCHAR*)"K\x00" \ + "e\x00y\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00s\x00\x00" +#define BCRYPT_BLOCK_SIZE_LIST \ + (const WCHAR*)"B\x00l\x00o\x00" \ + "c\x00k\x00S\x00i\x00z\x00" \ + "e\x00L\x00i\x00s\x00t\x00\x00" +#define BCRYPT_EFFECTIVE_KEY_LENGTH \ + (const WCHAR*)"E\x00" \ + "f\x00" \ + "f\x00" \ + "e\x00" \ + "c\x00t\x00i\x00v\x00" \ + "e\x00K\x00" \ + "e\x00y\x00L\x00" \ + "e\x00n\x00g" \ "\x00t\x00h\x00\x00" -#define BCRYPT_HASH_LENGTH \ - (const WCHAR*)"H\x00a\x00s\x00h\x00D\x00i\x00g\x00e\x00s\x00t\x00L\x00e\x00n\x00g\x00t\x00h" \ +#define BCRYPT_HASH_LENGTH \ + (const WCHAR*)"H\x00" \ + "a\x00s\x00h\x00" \ + "D\x00i\x00g\x00" \ + "e\x00s\x00t\x00L\x00" \ + "e\x00n\x00g\x00t\x00h" \ "\x00\x00" -#define BCRYPT_HASH_OID_LIST \ - (const WCHAR*)"H\x00a\x00s\x00h\x00O\x00I\x00D\x00L\x00i\x00s\x00t\x00\x00" -#define BCRYPT_PADDING_SCHEMES \ - (const WCHAR*)"P\x00a\x00d\x00d\x00i\x00n\x00g\x00S\x00c\x00h\x00e\x00m\x00e\x00s\x00\x00" -#define BCRYPT_SIGNATURE_LENGTH \ - (const WCHAR*)"S\x00i\x00g\x00n\x00a\x00t\x00u\x00r\x00e\x00L\x00e\x00n\x00g\x00t\x00h\x00" \ +#define BCRYPT_HASH_OID_LIST \ + (const WCHAR*)"H\x00" \ + "a\x00s\x00h\x00O\x00I\x00" \ + "D\x00L\x00i\x00s\x00t\x00\x00" +#define BCRYPT_PADDING_SCHEMES \ + (const WCHAR*)"P\x00" \ + "a\x00" \ + "d\x00" \ + "d\x00i\x00n\x00g\x00S\x00" \ + "c\x00h\x00" \ + "e\x00m\x00" \ + "e\x00s\x00\x00" +#define BCRYPT_SIGNATURE_LENGTH \ + (const WCHAR*)"S\x00i\x00g\x00n\x00" \ + "a\x00t\x00u\x00r\x00" \ + "e\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00" \ "\x00" -#define BCRYPT_HASH_BLOCK_LENGTH \ - (const WCHAR*)"H\x00a\x00s\x00h\x00B\x00l\x00o\x00c\x00k\x00L\x00e\x00n\x00g\x00t\x00h\x00" \ +#define BCRYPT_HASH_BLOCK_LENGTH \ + (const WCHAR*)"H\x00" \ + "a\x00s\x00h\x00" \ + "B\x00l\x00o\x00" \ + "c\x00k\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00" \ "\x00" -#define BCRYPT_AUTH_TAG_LENGTH \ - (const WCHAR*)"A\x00u\x00t\x00h\x00T\x00a\x00g\x00L\x00e\x00n\x00g\x00t\x00h\x00\x00" -#define BCRYPT_PRIMITIVE_TYPE \ - (const WCHAR*)"P\x00r\x00i\x00m\x00i\x00t\x00i\x00v\x00e\x00T\x00y\x00p\x00e\x00\x00" -#define BCRYPT_IS_KEYED_HASH \ - (const WCHAR*)"I\x00s\x00K\x00e\x00y\x00e\x00d\x00H\x00a\x00s\x00h\x00\x00" +#define BCRYPT_AUTH_TAG_LENGTH \ + (const WCHAR*)"A\x00u\x00t\x00h\x00T\x00" \ + "a\x00g\x00L\x00" \ + "e\x00n\x00g\x00t\x00h\x00\x00" +#define BCRYPT_PRIMITIVE_TYPE \ + (const WCHAR*)"P\x00r\x00i\x00m\x00i\x00t\x00i\x00v\x00" \ + "e\x00T\x00y\x00p\x00" \ + "e\x00\x00" +#define BCRYPT_IS_KEYED_HASH \ + (const WCHAR*)"I\x00s\x00K\x00" \ + "e\x00y\x00" \ + "e\x00" \ + "d\x00H\x00" \ + "a\x00s\x00h\x00\x00" #ifdef __cplusplus extern "C" @@ -177,4 +314,4 @@ extern "C" #endif #endif /* _WIN32 */ -#endif /* WINPR_BCRYPT_MEMORY_H */ +#endif /* WINPR_BCRYPT_H */