• R/O
  • HTTP
  • SSH
  • HTTPS

mingw-org-wsl: Commit

The MinGW.OSDN Windows System Libraries. Formerly designated as "MinGW.org Windows System Libraries", this encapsulates the "mingwrt" C runtime library extensions, and the "w32api" 32-bit MS-Windows API libraries.

Please note that this project no longer owns the "MinGW.org" domain name; any software which may be distributed from that domain is NOT supported by this project.


Commit MetaInfo

Revision73aedcc0f2e6ba370de0d86ab878ad76a0dda7b5 (tree)
Time2018-07-12 05:07:05
AuthorKeith Marshall <keith@user...>
CommiterKeith Marshall

Log Message

Correct <wincrypt.h> typographic errors; fix issue [#38391]

* include/wincrypt.h (CALG_TLS1PRF): Delete symbolic reference to...
(ALG_CLASS_DHASH): ...this; there is no such symbol; replace it with...
(ALG_CLASS_HASH): ...this, which represents the correct reference.
(struct _CRYPTOAPI_BLOB): Delete extraneous "typedef" keyword; this
struct definition is not directly associated with any type name.
(struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA): Likewise.

Change Summary

Incremental Difference

--- a/w32api/ChangeLog
+++ b/w32api/ChangeLog
@@ -1,3 +1,14 @@
1+2018-07-11 Keith Marshall <keith@users.osdn.me>
2+
3+ Correct <wincrypt.h> typographic errors; fix issue [#38391]
4+
5+ * include/wincrypt.h (CALG_TLS1PRF): Delete symbolic reference to...
6+ (ALG_CLASS_DHASH): ...this; there is no such symbol; replace it with...
7+ (ALG_CLASS_HASH): ...this, which represents the correct reference.
8+ (struct _CRYPTOAPI_BLOB): Delete extraneous "typedef" keyword; this
9+ struct definition is not directly associated with any type name.
10+ (struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA): Likewise.
11+
112 2018-02-26 Keith Marshall <keith@users.osdn.me>
213
314 Prepare and publish MinGW.org WSL-5.1 release.
--- a/w32api/include/wincrypt.h
+++ b/w32api/include/wincrypt.h
@@ -6,7 +6,7 @@
66 * $Id$
77 *
88 * Written by Anders Norlander <anorland@hem2.passagen.se>
9- * Copyright (C) 1998-2000, 2002-2004, 2006-2008, 2010, 2015,
9+ * Copyright (C) 1998-2000, 2002-2004, 2006-2008, 2010, 2015, 2018,
1010 * MinGW.org Project
1111 *
1212 *
@@ -172,16 +172,16 @@ _BEGIN_C_DECLS
172172 #define CALG_DSS_SIGN (ALG_CLASS_SIGNATURE | ALG_TYPE_DSS | ALG_SID_DSS_ANY)
173173 #define CALG_RSA_KEYX (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_RSA | ALG_SID_RSA_ANY)
174174 #define CALG_DES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DES)
175+#define CALG_DESX (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DESX)
175176 #define CALG_RC2 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_RC2)
176177 #define CALG_RC4 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_RC4)
177178 #define CALG_SEAL (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_STREAM | ALG_SID_SEAL)
178179 #define CALG_DH_EPHEM (ALG_CLASS_KEY_EXCHANGE | ALG_TYPE_STREAM | ALG_TYPE_DSS | ALG_SID_DSS_DMS)
179-#define CALG_DESX (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_DESX)
180-#define CALG_TLS1PRF (ALG_CLASS_DHASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF)
180+#define CALG_AES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES)
181181 #define CALG_AES_128 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_128)
182182 #define CALG_AES_192 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_192)
183183 #define CALG_AES_256 (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES_256)
184-#define CALG_AES (ALG_CLASS_DATA_ENCRYPT | ALG_TYPE_BLOCK | ALG_SID_AES)
184+#define CALG_TLS1PRF (ALG_CLASS_HASH | ALG_TYPE_ANY | ALG_SID_TLS1PRF)
185185
186186 /* dwFlags definitions for CryptAcquireContext
187187 */
@@ -827,7 +827,7 @@ typedef PVOID HCERTSTORE;
827827 typedef PVOID HCRYPTMSG;
828828 typedef PVOID HCERTCHAINENGINE;
829829
830-typedef struct _CRYPTOAPI_BLOB
830+struct _CRYPTOAPI_BLOB
831831 { DWORD cbData;
832832 BYTE *pbData;
833833 };
@@ -845,7 +845,7 @@ typedef struct _CRYPTOAPI_BLOB CRYPT_DIGEST_BLOB, *PCRYPT_DIGEST_BLOB;
845845 typedef struct _CRYPTOAPI_BLOB CRYPT_DER_BLOB, *PCRYPT_DER_BLOB;
846846 typedef struct _CRYPTOAPI_BLOB CRYPT_ATTR_BLOB, *PCRYPT_ATTR_BLOB;
847847
848-typedef struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA
848+struct _SSL_EXTRA_CERT_CHAIN_POLICY_PARA
849849 { /* not described in SDK; has the same layout as HTTPSPolicyCallbackData
850850 */
851851 DWORD cbStruct;
Show on old repository browser