X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=test_digest.c;h=68c0e3253f7366cea9d8525dd7199821d92d7093;hb=e0a500ab877ba72cb14026a24d462dd923b90ced;hp=a931a3509d577dacb0917d06185ac25c4230b5bc;hpb=55f0eb1b77c1c1bfc387927bad06210257f50f21;p=openssl-gost%2Fengine.git

diff --git a/test_digest.c b/test_digest.c
index a931a35..68c0e32 100644
--- a/test_digest.c
+++ b/test_digest.c
@@ -7,6 +7,11 @@
  * See https://www.openssl.org/source/license.html for details
  */
 
+#ifdef _MSC_VER
+# pragma warning(push, 3)
+# include <openssl/applink.c>
+# pragma warning(pop)
+#endif
 #include <openssl/opensslv.h>
 #include <openssl/engine.h>
 #include <openssl/provider.h>
@@ -29,17 +34,17 @@
 #endif
 
 /* Helpers to test OpenSSL API calls. */
-#define T(e) ({ if (!(e)) { \
-		ERR_print_errors_fp(stderr); \
-		OpenSSLDie(__FILE__, __LINE__, #e); \
-	    } \
-        })
-#define TE(e) ({ if (!(e)) { \
-		ERR_print_errors_fp(stderr); \
-		fprintf(stderr, "Error at %s:%d %s\n", __FILE__, __LINE__, #e); \
-		return -1; \
-	    } \
-        })
+#define T(e) \
+    if (!(e)) { \
+        ERR_print_errors_fp(stderr); \
+        OpenSSLDie(__FILE__, __LINE__, #e); \
+    }
+#define TE(e) \
+    if (!(e)) { \
+        ERR_print_errors_fp(stderr); \
+        fprintf(stderr, "Error at %s:%d %s\n", __FILE__, __LINE__, #e); \
+        return -1; \
+    }
 
 #define cRED	"\033[1;31m"
 #define cDRED	"\033[0;31m"
@@ -182,7 +187,7 @@ struct hash_testvec {
     const char *hmac;	   /* Expected output for HMAC tests. */
     const char *key;	   /* MAC key.*/
     int psize;		   /* Input (plaintext) size. */
-    int outsize;	   /* Compare to EVP_MD_size() /  EVP_MAC_size() if non-zero. */
+    size_t outsize;	   /* Compare to EVP_MD_size() / EVP_MAC_size() if non-zero. */
     int truncate;	   /* Truncated output (digest) size. */
     int key_size;	   /* MAC key size. */
     int block_size;	   /* Internal block size. */
@@ -635,7 +640,7 @@ static int do_mac(int iter, EVP_MAC *mac, const char *plaintext,
                   const struct hash_testvec *t)
 {
     if (!iter)
-        printf("[MAC %d] ", t->outsize);
+        printf("[MAC %zu] ", t->outsize);
 
     size_t acpkm = (size_t)t->acpkm;
     size_t acpkm_t = (size_t)t->acpkm_t;
@@ -691,7 +696,7 @@ static int do_digest(int iter, const EVP_MD *type, const char *plaintext,
                      const struct hash_testvec *t)
 {
     if (!iter)
-	printf("[MD %d] ", t->outsize);
+	printf("[MD %zu] ", t->outsize);
     if (t->outsize)
 	T(EVP_MD_size(type) == t->outsize);
     size_t outsize;