aboutsummaryrefslogtreecommitdiff
diff options
context:
space:
mode:
authorDanny Smith <dannysmith@users.sourceforge.net>2003-10-12 23:34:13 +0000
committerDanny Smith <dannysmith@users.sourceforge.net>2003-10-12 23:34:13 +0000
commitb3355c65921f7db4c156c02fc2d5a5006f0f1921 (patch)
treead74494e75e07bb8d7039a0498073d8b3f0a1241
parent986ee16a0c1dd89da430140b4705539f065af448 (diff)
downloadnewlib-b3355c65921f7db4c156c02fc2d5a5006f0f1921.zip
newlib-b3355c65921f7db4c156c02fc2d5a5006f0f1921.tar.gz
newlib-b3355c65921f7db4c156c02fc2d5a5006f0f1921.tar.bz2
* include/wincrypt (KP_IV, KP_SALT, KP_PADDING, KP_MODE,
KP_MODE_BITS, KP_PERMISSIONS, KP_ALGID, KP_BLOCKLEN): Remove duplicate definitions. (KP_X, KP_Y): Correct typos.
-rw-r--r--winsup/w32api/ChangeLog7
-rw-r--r--winsup/w32api/include/wincrypt.h12
2 files changed, 9 insertions, 10 deletions
diff --git a/winsup/w32api/ChangeLog b/winsup/w32api/ChangeLog
index c0f7dbf..c153b3a 100644
--- a/winsup/w32api/ChangeLog
+++ b/winsup/w32api/ChangeLog
@@ -1,3 +1,10 @@
+2003-10-13 Danny Smith <dannysmith@users.sourceforge.net>
+
+ * include/wincrypt (KP_IV, KP_SALT, KP_PADDING, KP_MODE,
+ KP_MODE_BITS, KP_PERMISSIONS, KP_ALGID, KP_BLOCKLEN): Remove
+ duplicate definitions.
+ (KP_X, KP_Y): Correct typos.
+
2003-10-11 Manu B <manubee@users.sourceforge.net>
* include/afxres.h: New file.
diff --git a/winsup/w32api/include/wincrypt.h b/winsup/w32api/include/wincrypt.h
index 05b5e82..c3ebf2d 100644
--- a/winsup/w32api/include/wincrypt.h
+++ b/winsup/w32api/include/wincrypt.h
@@ -119,14 +119,6 @@ extern "C" {
#define AT_KEYEXCHANGE 1
#define AT_SIGNATURE 2
#define CRYPT_USERDATA 1
-#define KP_IV 1
-#define KP_SALT 2
-#define KP_PADDING 3
-#define KP_MODE 4
-#define KP_MODE_BITS 5
-#define KP_PERMISSIONS 6
-#define KP_ALGID 7
-#define KP_BLOCKLEN 8
#define PKCS5_PADDING 1
#define CRYPT_MODE_CBC 1
#define CRYPT_MODE_ECB 2
@@ -338,8 +330,8 @@ extern "C" {
#define KP_P 0x0000000b
#define KP_G 0x0000000c
#define KP_Q 0x0000000d
-#define KP_X 0x000000Oe
-#define KP_Y 0x000000Of
+#define KP_X 0x0000000e
+#define KP_Y 0x0000000f
#define KP_RA 0x00000010
#define KP_RB 0x00000011
#define KP_INFO 0x00000012