Merge pull request #170 from hackomatic/wip

Fix compilation with Microsoft Visual C.

6 files changed, 51 insertions, 37 deletions

diff --git a/gost_ameth.c b/gost_ameth.c
index 50d0804..199aef2 100644
--- a/gost_ameth.c
+++ b/gost_ameth.c
@@ -720,10 +720,11 @@ static int pub_encode_gost_ec(X509_PUBKEY *pub, const EVP_PKEY *pk)
     BIGNUM *X = NULL, *Y = NULL, *order = NULL;
     const EC_KEY *ec = EVP_PKEY_get0((EVP_PKEY *)pk);
     int ptype = V_ASN1_UNDEF;
+    ASN1_STRING *params;
 
     algobj = OBJ_nid2obj(EVP_PKEY_base_id(pk));
 
-    ASN1_STRING *params = encode_gost_algor_params(pk);
+    params = encode_gost_algor_params(pk);
     pval = params;
     ptype = V_ASN1_SEQUENCE;
 
diff --git a/gost_ec_keyx.c b/gost_ec_keyx.c
index cc94d67..b82c6f1 100644
--- a/gost_ec_keyx.c
+++ b/gost_ec_keyx.c
@@ -18,10 +18,10 @@
 #include "gost_lcl.h"
 
 /* Implementation of CryptoPro VKO 34.10-2001/2012 algorithm */
-static int VKO_compute_key(unsigned char *shared_key,
-                           const EC_POINT *pub_key, const EC_KEY *priv_key,
-                           const unsigned char *ukm, const size_t ukm_size,
-                           const int vko_dgst_nid)
+int VKO_compute_key(unsigned char *shared_key,
+                    const EC_POINT *pub_key, const EC_KEY *priv_key,
+                    const unsigned char *ukm, const size_t ukm_size,
+                    const int vko_dgst_nid)
 {
     unsigned char *databuf = NULL;
     BIGNUM *UKM = NULL, *p = NULL, *order = NULL, *X = NULL, *Y = NULL, *cofactor = NULL;
diff --git a/gost_grasshopper_cipher.c b/gost_grasshopper_cipher.c
index df58097..ba353c2 100644
--- a/gost_grasshopper_cipher.c
+++ b/gost_grasshopper_cipher.c
@@ -26,12 +26,7 @@ enum GRASSHOPPER_CIPHER_TYPE {
 };
 
 static EVP_CIPHER *gost_grasshopper_ciphers[6] = {
-    [GRASSHOPPER_CIPHER_ECB] = NULL,
-    [GRASSHOPPER_CIPHER_CBC] = NULL,
-    [GRASSHOPPER_CIPHER_OFB] = NULL,
-    [GRASSHOPPER_CIPHER_CFB] = NULL,
-    [GRASSHOPPER_CIPHER_CTR] = NULL,
-    [GRASSHOPPER_CIPHER_CTRACPKM] = NULL,
+    NULL, NULL, NULL, NULL, NULL, NULL,
 };
 
 static GRASSHOPPER_INLINE void
@@ -51,7 +46,7 @@ struct GRASSHOPPER_CIPHER_PARAMS {
 };
 
 static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[6] = {
-    [GRASSHOPPER_CIPHER_ECB] = {
+ {
                                 NID_grasshopper_ecb,
                                 gost_grasshopper_cipher_init_ecb,
                                 gost_grasshopper_cipher_do_ecb,
@@ -61,7 +56,7 @@ static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[6] = {
                                 0,
                                 true}
     ,
-    [GRASSHOPPER_CIPHER_CBC] = {
+    {
                                 NID_grasshopper_cbc,
                                 gost_grasshopper_cipher_init_cbc,
                                 gost_grasshopper_cipher_do_cbc,
@@ -71,7 +66,7 @@ static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[6] = {
                                 16,
                                 true}
     ,
-    [GRASSHOPPER_CIPHER_OFB] = {
+    {
                                 NID_grasshopper_ofb,
                                 gost_grasshopper_cipher_init_ofb,
                                 gost_grasshopper_cipher_do_ofb,
@@ -81,7 +76,7 @@ static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[6] = {
                                 16,
                                 false}
     ,
-    [GRASSHOPPER_CIPHER_CFB] = {
+    {
                                 NID_grasshopper_cfb,
                                 gost_grasshopper_cipher_init_cfb,
                                 gost_grasshopper_cipher_do_cfb,
@@ -91,7 +86,7 @@ static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[6] = {
                                 16,
                                 false}
     ,
-    [GRASSHOPPER_CIPHER_CTR] = {
+    {
                                 NID_grasshopper_ctr,
                                 gost_grasshopper_cipher_init_ctr,
                                 gost_grasshopper_cipher_do_ctr,
@@ -104,7 +99,7 @@ static struct GRASSHOPPER_CIPHER_PARAMS gost_cipher_params[6] = {
                                 16,
                                 false}
     ,
-    [GRASSHOPPER_CIPHER_CTRACPKM] = {
+    {
                                      NID_id_tc26_cipher_gostr3412_2015_kuznyechik_ctracpkm,
                                      gost_grasshopper_cipher_init_ctracpkm,
                                      gost_grasshopper_cipher_do_ctracpkm,
@@ -418,6 +413,9 @@ int gost_grasshopper_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out,
     unsigned int n = EVP_CIPHER_CTX_num(ctx);
     size_t lasted;
     size_t i;
+    size_t blocks;
+    grasshopper_w128_t *iv_buffer;
+    grasshopper_w128_t tmp;
 
     while (n && inl) {
         *(current_out++) = *(current_in++) ^ c->partial_buffer.b[n];
@@ -425,10 +423,9 @@ int gost_grasshopper_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out,
         n = (n + 1) % GRASSHOPPER_BLOCK_SIZE;
     }
     EVP_CIPHER_CTX_set_num(ctx, n);
-    size_t blocks = inl / GRASSHOPPER_BLOCK_SIZE;
+    blocks = inl / GRASSHOPPER_BLOCK_SIZE;
 
-    grasshopper_w128_t *iv_buffer = (grasshopper_w128_t *) iv;
-    grasshopper_w128_t tmp;
+    iv_buffer = (grasshopper_w128_t *) iv;
 
     // full parts
     for (i = 0; i < blocks; i++) {
@@ -480,15 +477,15 @@ int gost_grasshopper_cipher_do_ctracpkm(EVP_CIPHER_CTX *ctx,
     gost_grasshopper_cipher_ctx_ctr *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
     unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
     unsigned int num = EVP_CIPHER_CTX_num(ctx);
+    size_t blocks, i, lasted;
+    grasshopper_w128_t tmp;
 
     while ((num & GRASSHOPPER_BLOCK_MASK) && inl) {
         *out++ = *in++ ^ c->partial_buffer.b[num & GRASSHOPPER_BLOCK_MASK];
         --inl;
         num++;
     }
-    size_t blocks = inl / GRASSHOPPER_BLOCK_SIZE;
-    size_t i;
-    grasshopper_w128_t tmp;
+    blocks = inl / GRASSHOPPER_BLOCK_SIZE;
 
     // full parts
     for (i = 0; i < blocks; i++) {
@@ -507,7 +504,7 @@ int gost_grasshopper_cipher_do_ctracpkm(EVP_CIPHER_CTX *ctx,
     }
 
     // last part
-    size_t lasted = inl - blocks * GRASSHOPPER_BLOCK_SIZE;
+    lasted = inl - blocks * GRASSHOPPER_BLOCK_SIZE;
     if (lasted > 0) {
         apply_acpkm_grasshopper(c, &num);
         grasshopper_encrypt_block(&c->c.encrypt_round_keys,
@@ -688,13 +685,14 @@ int gost_grasshopper_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 int gost_grasshopper_cipher_cleanup(EVP_CIPHER_CTX *ctx)
 {
+    struct GRASSHOPPER_CIPHER_PARAMS *params;
     gost_grasshopper_cipher_ctx *c =
         (gost_grasshopper_cipher_ctx *) EVP_CIPHER_CTX_get_cipher_data(ctx);
 
     if (!c)
         return 1;
 
-    struct GRASSHOPPER_CIPHER_PARAMS *params = &gost_cipher_params[c->type];
+    params = &gost_cipher_params[c->type];
 
     gost_grasshopper_cipher_destroy(c);
     if (params->destroy_cipher != NULL) {
@@ -863,14 +861,18 @@ const GRASSHOPPER_INLINE EVP_CIPHER *cipher_gost_grasshopper(uint8_t mode,
     cipher = &gost_grasshopper_ciphers[num];
 
     if (*cipher == NULL) {
+        grasshopper_init_cipher_func init_cipher;
+        int nid, block_size, ctx_size, iv_size;
+        bool padding;
+
         params = &gost_cipher_params[num];
 
-        int nid = params->nid;
-        grasshopper_init_cipher_func init_cipher = params->init_cipher;
-        int block_size = params->block_size;
-        int ctx_size = params->ctx_size;
-        int iv_size = params->iv_size;
-        bool padding = params->padding;
+        nid = params->nid;
+        init_cipher = params->init_cipher;
+        block_size = params->block_size;
+        ctx_size = params->ctx_size;
+        iv_size = params->iv_size;
+        padding = params->padding;
 
         *cipher = cipher_gost_grasshopper_create(nid, block_size);
         if (*cipher == NULL) {
diff --git a/gost_keyexpimp.c b/gost_keyexpimp.c
index e8ee1eb..5564387 100644
--- a/gost_keyexpimp.c
+++ b/gost_keyexpimp.c
@@ -1,4 +1,8 @@
+#ifdef _WIN32
+#include <winsock.h>
+#else
 #include <arpa/inet.h>
+#endif
 #include <string.h>
 #include <openssl/evp.h>
 #include <openssl/hmac.h>
diff --git a/gost_lcl.h b/gost_lcl.h
index 15ff31e..bb25ce3 100644
--- a/gost_lcl.h
+++ b/gost_lcl.h
@@ -265,6 +265,12 @@ int gost_ec_verify(const unsigned char *dgst, int dgst_len,
                    ECDSA_SIG *sig, EC_KEY *ec);
 int gost_ec_compute_public(EC_KEY *ec);
 
+/* VKO */
+int VKO_compute_key(unsigned char *shared_key,
+                    const EC_POINT *pub_key, const EC_KEY *priv_key,
+                    const unsigned char *ukm, const size_t ukm_size,
+                    const int vko_dgst_nid);
+
 /* KDF TREE */
 int gost_kdftree2012_256(unsigned char *keyout, size_t keyout_len,
                          const unsigned char *key, size_t keylen,
diff --git a/gost_omac_acpkm.c b/gost_omac_acpkm.c
index 3820c90..793a6d3 100644
--- a/gost_omac_acpkm.c
+++ b/gost_omac_acpkm.c
@@ -150,13 +150,14 @@ static int CMAC_ACPKM_Init(CMAC_ACPKM_CTX *ctx, const void *key, size_t keylen,
     /* Non-NULL key means initialisation is complete */
     if (key) {
         unsigned char acpkm_iv[EVP_MAX_BLOCK_LENGTH];
+        int block_size, key_len;
 
         /* Initialize CTR for ACPKM-Master */
         if (!EVP_CIPHER_CTX_cipher(ctx->actx))
             return 0;
         /* block size of ACPKM cipher could be 1, but,
          * cbc cipher is same with correct block_size */
-        const int block_size = EVP_CIPHER_CTX_block_size(ctx->cctx);
+        block_size = EVP_CIPHER_CTX_block_size(ctx->cctx);
         /* Wide IV = 1^{n/2} || 0,
          * where a^r denotes the string that consists of r 'a' bits */
         memset(acpkm_iv, 0xff, block_size / 2);
@@ -164,7 +165,7 @@ static int CMAC_ACPKM_Init(CMAC_ACPKM_CTX *ctx, const void *key, size_t keylen,
         if (!EVP_EncryptInit_ex(ctx->actx, NULL, NULL, key, acpkm_iv))
             return 0;
         /* EVP_CIPHER key_len may be different from EVP_CIPHER_CTX key_len */
-        int key_len = EVP_CIPHER_key_length(EVP_CIPHER_CTX_cipher(ctx->actx));
+        key_len = EVP_CIPHER_key_length(EVP_CIPHER_CTX_cipher(ctx->actx));
 
         /* Generate first key material (K^1 || K^1_1) */
         if (!EVP_Cipher(ctx->actx, ctx->km, zero_iv, key_len + block_size))
@@ -254,7 +255,8 @@ static int CMAC_ACPKM_Update(CMAC_ACPKM_CTX *ctx, const void *in, size_t dlen)
 static int CMAC_ACPKM_Final(CMAC_ACPKM_CTX *ctx, unsigned char *out,
                             size_t *poutlen)
 {
-    int i, bl, lb;
+    int i, bl, lb, key_len;
+    unsigned char *k1, k2[EVP_MAX_BLOCK_LENGTH];
     if (ctx->nlast_block == -1)
         return 0;
     bl = EVP_CIPHER_CTX_block_size(ctx->cctx);
@@ -265,10 +267,9 @@ static int CMAC_ACPKM_Final(CMAC_ACPKM_CTX *ctx, unsigned char *out,
 
     if (!CMAC_ACPKM_Mesh(ctx))
         return 0;
-    int key_len = EVP_CIPHER_key_length(EVP_CIPHER_CTX_cipher(ctx->actx));
+    key_len = EVP_CIPHER_key_length(EVP_CIPHER_CTX_cipher(ctx->actx));
     /* Keys k1 and k2 */
-    unsigned char *k1 = ctx->km + key_len;
-    unsigned char k2[EVP_MAX_BLOCK_LENGTH];
+    k1 = ctx->km + key_len;
     make_kn(k2, ctx->km + key_len, bl);
 
     /* Is last block complete? */