From b5f878936f3e5b951f85d9ee49bdfadddd87b173 Mon Sep 17 00:00:00 2001
From: Mike McCormack <mike@codeweavers.com>
Date: Wed, 14 Sep 2005 10:07:15 +0000
Subject: [PATCH] Fix gcc 4.0 warnings.

---
 dlls/crypt32/tests/encode.c | 48 ++++++++++++++++++++++++-------------
 1 file changed, 31 insertions(+), 17 deletions(-)

diff --git a/dlls/crypt32/tests/encode.c b/dlls/crypt32/tests/encode.c
index 753a6f0dc65..92728546940 100644
--- a/dlls/crypt32/tests/encode.c
+++ b/dlls/crypt32/tests/encode.c
@@ -1782,32 +1782,46 @@ static const BYTE aKey[] = { 0, 1, 2, 3, 4, 5, 6, 7, 8, 9, 0xa, 0xb, 0xc, 0xd,
  0xe, 0xf };
 static const BYTE params[] = { 0x02, 0x01, 0x01 };
 
+static const unsigned char bin64[] = {
+    0x30,0x0b,0x30,0x06,0x06,0x02,0x2a,0x03,0x05,0x00,0x03,0x01,0x00,0};
+static const unsigned char bin65[] = {
+    0x30,0x09,0x30,0x04,0x06,0x02,0x2a,0x03,0x03,0x01,0x00,0};
+static const unsigned char bin66[] = {
+    0x30,0x0f,0x30,0x0a,0x06,0x06,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x05,0x00,0x03,0x01,0x00,0};
+static const unsigned char bin67[] = {
+    0x30,0x0d,0x30,0x08,0x06,0x06,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x03,0x01,0x00,0};
+static const unsigned char bin68[] = {
+    0x30,0x1f,0x30,0x0a,0x06,0x06,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x05,0x00,0x03,0x11,0x00,0x00,0x01,
+    0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0};
+static const unsigned char bin69[] = {
+    0x30,0x1d,0x30,0x08,0x06,0x06,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x03,0x11,0x00,0x00,0x01,
+    0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,0x0f,0};
+static const unsigned char bin70[] = {
+    0x30,0x20,0x30,0x0b,0x06,0x06,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x01,0x01,
+    0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,
+    0x0f,0};
+static const unsigned char bin71[] = {
+    0x30,0x20,0x30,0x0b,0x06,0x06,0x2a,0x86,0x48,0x86,0xf7,0x0d,0x02,0x01,0x01,
+    0x03,0x11,0x00,0x00,0x01,0x02,0x03,0x04,0x05,0x06,0x07,0x08,0x09,0x0a,0x0b,0x0c,0x0d,0x0e,
+    0x0f,0};
+static unsigned char bin72[] = { 0x05,0x00,0};
+
 static const struct encodedPublicKey pubKeys[] = {
  /* with a bogus OID */
  { { { "1.2.3", { 0, NULL } }, { 0, NULL, 0 } },
-  "\x30\x0b\x30\x06\x06\x02\x2a\x03\x05\x00\x03\x01\x00",
-  "\x30\x09\x30\x04\x06\x02\x2a\x03\x03\x01\x00",
-  { { "1.2.3", { 2, "\x05\x00" } }, { 0, NULL, 0 } } },
+  bin64, bin65,
+  { { "1.2.3", { 2, bin72 } }, { 0, NULL, 0 } } },
  /* some normal keys */
  { { { szOID_RSA, { 0, NULL } }, { 0, NULL, 0} },
-  "\x30\x0f\x30\x0a\x06\x06\x2a\x86\x48\x86\xf7\x0d\x05\x00\x03\x01\x00",
-  "\x30\x0d\x30\x08\x06\x06\x2a\x86\x48\x86\xf7\x0d\x03\x01\x00",
-  { { szOID_RSA, { 2, "\x05\x00" } }, { 0, NULL, 0 } } },
+  bin66, bin67,
+  { { szOID_RSA, { 2, bin72 } }, { 0, NULL, 0 } } },
  { { { szOID_RSA, { 0, NULL } }, { sizeof(aKey), (BYTE *)aKey, 0} },
-  "\x30\x1f\x30\x0a\x06\x06\x2a\x86\x48\x86\xf7\x0d\x05\x00\x03\x11\x00\x00\x01"
-  "\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-  "\x30\x1d\x30\x08\x06\x06\x2a\x86\x48\x86\xf7\x0d\x03\x11\x00\x00\x01"
-  "\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e\x0f",
-  { { szOID_RSA, { 2, "\x05\x00" } }, { sizeof(aKey), (BYTE *)aKey, 0} } },
+  bin68, bin69,
+  { { szOID_RSA, { 2, bin72 } }, { sizeof(aKey), (BYTE *)aKey, 0} } },
  /* with add'l parameters--note they must be DER-encoded */
  { { { szOID_RSA, { sizeof(params), (BYTE *)params } }, { sizeof(aKey),
   (BYTE *)aKey, 0 } },
-  "\x30\x20\x30\x0b\x06\x06\x2a\x86\x48\x86\xf7\x0d\x02\x01\x01"
-  "\x03\x11\x00\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e"
-  "\x0f",
-  "\x30\x20\x30\x0b\x06\x06\x2a\x86\x48\x86\xf7\x0d\x02\x01\x01"
-  "\x03\x11\x00\x00\x01\x02\x03\x04\x05\x06\x07\x08\x09\x0a\x0b\x0c\x0d\x0e"
-  "\x0f",
+  bin70, bin71,
   { { szOID_RSA, { sizeof(params), (BYTE *)params } }, { sizeof(aKey),
   (BYTE *)aKey, 0 } } },
 };