From: Vitaly Chikunov <vt@altlinux.org>
Date: Fri, 3 Dec 2021 09:38:19 +0000 (+0300)
Subject: MSVC: Avoid use `htonl' since it requires linking with Winsock
X-Git-Tag: v3.0.1~29
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=ea08f653579978ba0e39d5a71bce9ed47452f0e3;p=openssl-gost%2Fengine.git

MSVC: Avoid use `htonl' since it requires linking with Winsock

No need external library (Ws2_32.lib) if we can easily implement it.
Error messages:

  gost_core.lib(gost_keyexpimp.obj) : error LNK2019: unresolved external symbol htonl referenced in function gost_kdftree2012_256
  gost.dll : fatal error LNK1120: 1 unresolved externals

Signed-off-by: Vitaly Chikunov <vt@altlinux.org>
---

diff --git a/gost_keyexpimp.c b/gost_keyexpimp.c
index eb10331..481d5b5 100644
--- a/gost_keyexpimp.c
+++ b/gost_keyexpimp.c
@@ -5,11 +5,7 @@
  * Contents licensed under the terms of the OpenSSL license
  * See https://www.openssl.org/source/license.html for details
  */
-#ifdef _WIN32
-#include <winsock.h>
-#else
-#include <arpa/inet.h>
-#endif
+
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
@@ -18,6 +14,18 @@
 #include "gost_lcl.h"
 #include "e_gost_err.h"
 
+static uint32_t be32(uint32_t host)
+{
+#ifdef L_ENDIAN
+    return (host & 0xff000000) >> 24 |
+           (host & 0x00ff0000) >> 8  |
+           (host & 0x0000ff00) << 8  |
+           (host & 0x000000ff) << 24;
+#else
+    return host;
+#endif
+}
+
 int omac_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr);
 /*
  * Function expects that out is a preallocated buffer of length
@@ -201,7 +209,7 @@ int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len,
     unsigned char *ptr = keyout;
     HMAC_CTX *ctx;
     unsigned char *len_ptr = NULL;
-    uint32_t len_repr = htonl(keyout_len * 8);
+    uint32_t len_repr = be32(keyout_len * 8);
     size_t len_repr_len = 4;
 
     ctx = HMAC_CTX_new();
@@ -223,7 +231,7 @@ int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len,
     }
 
     for (i = 1; i <= iters; i++) {
-        uint32_t iter_net = htonl(i);
+        uint32_t iter_net = be32(i);
         unsigned char *rep_ptr =
             ((unsigned char *)&iter_net) + (4 - representation);