X-Git-Url: http://wagner.pp.ru/gitweb/?a=blobdiff_plain;f=gost_crypt.c;h=66a09a9aa502a590ff0f70fc2fa5b1ee31dd7c59;hb=672de3d14873849c4d84a1c71f723c848fa09521;hp=d094c5ee74edaa80e82f5ed149161c72e56e1830;hpb=5186d798730c1ecec7ed40126beaf493804fcf45;p=openssl-gost%2Fengine.git

diff --git a/gost_crypt.c b/gost_crypt.c
index d094c5e..66a09a9 100644
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@ -47,12 +47,12 @@ static int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params);
 static int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr);
 
 static int magma_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                                const unsigned char *iv, int enc);
+                             const unsigned char *iv, int enc);
 /* Handles block of data in CBC mode */
 static int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                              const unsigned char *in, size_t inl);
+                               const unsigned char *in, size_t inl);
 static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                       const unsigned char *in, size_t inl);
+                               const unsigned char *in, size_t inl);
 
 static EVP_CIPHER *_hidden_Gost28147_89_cipher = NULL;
 const EVP_CIPHER *cipher_gost(void)
@@ -152,8 +152,7 @@ const EVP_CIPHER *cipher_gost_cpacnt(void)
                                                     gost89_set_asn1_parameters)
             || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_gost89_cnt,
                                                     gost89_get_asn1_parameters)
-            || !EVP_CIPHER_meth_set_ctrl(_hidden_gost89_cnt,
-                                         gost_cipher_ctl))) {
+            || !EVP_CIPHER_meth_set_ctrl(_hidden_gost89_cnt, gost_cipher_ctl))) {
         EVP_CIPHER_meth_free(_hidden_gost89_cnt);
         _hidden_gost89_cnt = NULL;
     }
@@ -209,8 +208,7 @@ const EVP_CIPHER *cipher_magma_ctr(void)
                                           EVP_CIPH_CUSTOM_IV |
                                           EVP_CIPH_RAND_KEY |
                                           EVP_CIPH_ALWAYS_CALL_INIT)
-            || !EVP_CIPHER_meth_set_init(_hidden_magma_ctr,
-                                         magma_cipher_init)
+            || !EVP_CIPHER_meth_set_init(_hidden_magma_ctr, magma_cipher_init)
             || !EVP_CIPHER_meth_set_do_cipher(_hidden_magma_ctr,
                                               magma_cipher_do_ctr)
             || !EVP_CIPHER_meth_set_cleanup(_hidden_magma_ctr,
@@ -222,8 +220,7 @@ const EVP_CIPHER *cipher_magma_ctr(void)
                                                     gost89_set_asn1_parameters)
             || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_magma_ctr,
                                                     gost89_get_asn1_parameters)
-            || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_ctr,
-                                         gost_cipher_ctl))) {
+            || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_ctr, gost_cipher_ctl))) {
         EVP_CIPHER_meth_free(_hidden_magma_ctr);
         _hidden_magma_ctr = NULL;
     }
@@ -243,8 +240,7 @@ const EVP_CIPHER *cipher_magma_cbc(void)
                                           EVP_CIPH_CUSTOM_IV |
                                           EVP_CIPH_RAND_KEY |
                                           EVP_CIPH_ALWAYS_CALL_INIT)
-            || !EVP_CIPHER_meth_set_init(_hidden_magma_cbc,
-                                         magma_cipher_init)
+            || !EVP_CIPHER_meth_set_init(_hidden_magma_cbc, magma_cipher_init)
             || !EVP_CIPHER_meth_set_do_cipher(_hidden_magma_cbc,
                                               magma_cipher_do_cbc)
             || !EVP_CIPHER_meth_set_cleanup(_hidden_magma_cbc,
@@ -256,8 +252,7 @@ const EVP_CIPHER *cipher_magma_cbc(void)
                                                     gost89_set_asn1_parameters)
             || !EVP_CIPHER_meth_set_get_asn1_params(_hidden_magma_cbc,
                                                     gost89_get_asn1_parameters)
-            || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_cbc,
-                                         gost_cipher_ctl))) {
+            || !EVP_CIPHER_meth_set_ctrl(_hidden_magma_cbc, gost_cipher_ctl))) {
         EVP_CIPHER_meth_free(_hidden_magma_cbc);
         _hidden_magma_cbc = NULL;
     }
@@ -306,9 +301,8 @@ EVP_MD *imit_gost_cpa(void)
             || !EVP_MD_meth_set_result_size(md, 4)
             || !EVP_MD_meth_set_input_blocksize(md, 8)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(struct
-                                                    ossl_gost_imit_ctx))
-            || !EVP_MD_meth_set_flags(md, 0)
+                                             sizeof(struct ossl_gost_imit_ctx))
+            || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_XOF)
             || !EVP_MD_meth_set_init(md, gost_imit_init_cpa)
             || !EVP_MD_meth_set_update(md, gost_imit_update)
             || !EVP_MD_meth_set_final(md, gost_imit_final)
@@ -338,9 +332,8 @@ EVP_MD *imit_gost_cp_12(void)
             || !EVP_MD_meth_set_result_size(md, 4)
             || !EVP_MD_meth_set_input_blocksize(md, 8)
             || !EVP_MD_meth_set_app_datasize(md,
-                                             sizeof(struct
-                                                    ossl_gost_imit_ctx))
-            || !EVP_MD_meth_set_flags(md, 0)
+                                             sizeof(struct ossl_gost_imit_ctx))
+            || !EVP_MD_meth_set_flags(md, EVP_MD_FLAG_XOF)
             || !EVP_MD_meth_set_init(md, gost_imit_init_cp_12)
             || !EVP_MD_meth_set_update(md, gost_imit_update)
             || !EVP_MD_meth_set_final(md, gost_imit_final)
@@ -431,8 +424,7 @@ const struct gost_cipher_info *get_encryption_params(ASN1_OBJECT *obj)
 static int gost_cipher_set_param(struct ossl_gost_cipher_ctx *c, int nid)
 {
     const struct gost_cipher_info *param;
-    param =
-        get_encryption_params((nid == NID_undef ? NULL : OBJ_nid2obj(nid)));
+    param = get_encryption_params((nid == NID_undef ? NULL : OBJ_nid2obj(nid)));
     if (!param)
         return 0;
 
@@ -467,9 +459,9 @@ static int gost_cipher_init_param(EVP_CIPHER_CTX *ctx,
 }
 
 static int magma_cipher_init_param(EVP_CIPHER_CTX *ctx,
-                                  const unsigned char *key,
-                                  const unsigned char *iv, int enc,
-                                  int paramNID, int mode)
+                                   const unsigned char *key,
+                                   const unsigned char *iv, int enc,
+                                   int paramNID, int mode)
 {
     struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
     if (EVP_CIPHER_CTX_get_app_data(ctx) == NULL) {
@@ -485,6 +477,13 @@ static int magma_cipher_init_param(EVP_CIPHER_CTX *ctx,
     }
     memcpy(EVP_CIPHER_CTX_iv_noconst(ctx),
            EVP_CIPHER_CTX_original_iv(ctx), EVP_CIPHER_CTX_iv_length(ctx));
+    if (EVP_CIPHER_CTX_nid(ctx) == NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm
+     || EVP_CIPHER_CTX_nid(ctx) == NID_id_tc26_cipher_gostr3412_2015_magma_ctracpkm_omac) {
+       c->key_meshing = 1024;
+    } else {
+       c->key_meshing = 0;
+    }
+
     return 1;
 }
 
@@ -539,10 +538,10 @@ int gost_cipher_init_cbc(EVP_CIPHER_CTX *ctx, const unsigned char *key,
 
 /* Initializes EVP_CIPHER_CTX with default values */
 int magma_cipher_init(EVP_CIPHER_CTX *ctx, const unsigned char *key,
-                         const unsigned char *iv, int enc)
+                      const unsigned char *iv, int enc)
 {
     return magma_cipher_init_param(ctx, key, iv, enc, NID_undef,
-                                  EVP_CIPH_CBC_MODE);
+                                   EVP_CIPH_CBC_MODE);
 }
 
 /*
@@ -618,11 +617,13 @@ int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
         }
     } else {
         while (inl > 0) {
+            unsigned char tmpiv[8];
             gostdecrypt(&(c->cctx), in_ptr, b);
+            memcpy(tmpiv, in_ptr, 8);
             for (i = 0; i < 8; i++) {
                 out_ptr[i] = iv[i] ^ b[i];
             }
-            memcpy(iv, in_ptr, 8);
+            memcpy(iv, tmpiv, 8);
             out_ptr += 8;
             in_ptr += 8;
             inl -= 8;
@@ -633,10 +634,10 @@ int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
 
 /* MAGMA encryption in CBC mode */
 int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                       const unsigned char *in, size_t inl)
+                        const unsigned char *in, size_t inl)
 {
     unsigned char b[8];
-		unsigned char d[8];
+    unsigned char d[8];
     const unsigned char *in_ptr = in;
     unsigned char *out_ptr = out;
     int i;
@@ -646,12 +647,12 @@ int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
         while (inl > 0) {
 
             for (i = 0; i < 8; i++) {
-                b[7-i] = iv[i] ^ in_ptr[i];
+                b[7 - i] = iv[i] ^ in_ptr[i];
             }
             gostcrypt(&(c->cctx), b, d);
 
             for (i = 0; i < 8; i++) {
-                out_ptr[7-i] = d[i];
+                out_ptr[7 - i] = d[i];
             }
             memcpy(iv, out_ptr, 8);
             out_ptr += 8;
@@ -661,11 +662,11 @@ int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
     } else {
         while (inl > 0) {
             for (i = 0; i < 8; i++) {
-                d[7-i] = in_ptr[i];
+                d[7 - i] = in_ptr[i];
             }
             gostdecrypt(&(c->cctx), d, b);
             for (i = 0; i < 8; i++) {
-                out_ptr[i] = iv[i] ^ b[7-i];
+                out_ptr[i] = iv[i] ^ b[7 - i];
             }
             memcpy(iv, in_ptr, 8);
             out_ptr += 8;
@@ -679,57 +680,76 @@ int magma_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
 /* increment counter (64-bit int) by 1 */
 static void ctr64_inc(unsigned char *counter)
 {
-	inc_counter(counter, 8);
+    inc_counter(counter, 8);
+}
+
+#define MAGMA_BLOCK_SIZE 8
+#define MAGMA_BLOCK_MASK (MAGMA_BLOCK_SIZE - 1)
+static inline void apply_acpkm_magma(struct ossl_gost_cipher_ctx *
+                                           ctx, unsigned int *num)
+{
+    if (!ctx->key_meshing || (*num < ctx->key_meshing))
+        return;
+    acpkm_magma_key_meshing(&ctx->cctx);
+    *num &= MAGMA_BLOCK_MASK;
 }
 
 /* MAGMA encryption in CTR mode */
 static int magma_cipher_do_ctr(EVP_CIPHER_CTX *ctx, unsigned char *out,
-                       const unsigned char *in, size_t inl)
+                               const unsigned char *in, size_t inl)
 {
     const unsigned char *in_ptr = in;
     unsigned char *out_ptr = out;
-    size_t i = 0;
     size_t j;
     struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
     unsigned char *buf = EVP_CIPHER_CTX_buf_noconst(ctx);
     unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
+    unsigned int num = EVP_CIPHER_CTX_num(ctx);
+    size_t blocks, i, lasted = inl;
+    unsigned char b[8];
 /* Process partial blocks */
-    if (EVP_CIPHER_CTX_num(ctx)) {
-        for (j = EVP_CIPHER_CTX_num(ctx), i = 0; j < 8 && i < inl;
-             j++, i++, in_ptr++, out_ptr++) {
-            *out_ptr = buf[j] ^ (*in_ptr);
-        }
-        if (j == 8) {
-            EVP_CIPHER_CTX_set_num(ctx, 0);
-        } else {
-            EVP_CIPHER_CTX_set_num(ctx, j);
-            return 1;
-        }
+    while ((num & MAGMA_BLOCK_MASK) && lasted) {
+        *out_ptr++ = *in_ptr++ ^ buf[7 - (num & MAGMA_BLOCK_MASK)];
+        --lasted;
+        num++;
     }
+    blocks = lasted / MAGMA_BLOCK_SIZE;
 
 /* Process full blocks */
-		for (; i + 8 < inl; i += 8, in_ptr += 8, out_ptr += 8) {
-			gostcrypt(&(c->cctx), iv, buf);
-			for (j = 0; j < 8; j++) {
-				out_ptr[j] = buf[j] ^ in_ptr[j];
-			}
-			ctr64_inc(iv);
-		}
+    for (i = 0; i < blocks; i++) {
+        apply_acpkm_magma(c, &num);
+        for (j = 0; j < 8; j++) {
+            b[7 - j] = iv[j];
+        }
+        gostcrypt(&(c->cctx), b, buf);
+        for (j = 0; j < 8; j++) {
+            out_ptr[j] = buf[7 - j] ^ in_ptr[j];
+        }
+        ctr64_inc(iv);
+        c->count += MAGMA_BLOCK_SIZE;
+        in_ptr += MAGMA_BLOCK_SIZE;
+        out_ptr += MAGMA_BLOCK_SIZE;
+        num += MAGMA_BLOCK_SIZE;
+        lasted -= MAGMA_BLOCK_SIZE;
+    }
 
 /* Process the rest of plaintext */
-    if (i < inl) {
-			gostcrypt(&(c->cctx), iv, buf);
-			ctr64_inc(iv);
-      for (j = 0; i < inl; j++, i++) {
-         out_ptr[j] = buf[j] ^ in_ptr[j];
-      }
+    if (lasted > 0) {
+        apply_acpkm_magma(c, &num);
+        for (j = 0; j < 8; j++) {
+            b[7 - j] = iv[j];
+        }
+        gostcrypt(&(c->cctx), b, buf);
 
-      EVP_CIPHER_CTX_set_num(ctx, j);
-    } else {
-       EVP_CIPHER_CTX_set_num(ctx, 0);
-		}
+        for (i = 0; i < lasted; i++)
+            out_ptr[i] = buf[7 - i] ^ in_ptr[i];
+        ctr64_inc(iv);
+        c->count += j;
+        num += lasted;
+    }
+    EVP_CIPHER_CTX_set_num(ctx, num);
 
-	return 1; 
+    return 1;
 }
 
 /* GOST encryption in CFB mode */
@@ -761,7 +781,7 @@ int gost_cipher_do_cfb(EVP_CIPHER_CTX *ctx, unsigned char *out,
         }
     }
 
-    for (; i + 8 < inl; i += 8, in_ptr += 8, out_ptr += 8) {
+    for (; (inl - i) >= 8; i += 8, in_ptr += 8, out_ptr += 8) {
         /*
          * block cipher current iv
          */
@@ -822,7 +842,7 @@ static int gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out,
         }
     }
 
-    for (; i + 8 < inl; i += 8, in_ptr += 8, out_ptr += 8) {
+    for (; (inl - i) >= 8; i += 8, in_ptr += 8, out_ptr += 8) {
         /*
          * block cipher current iv
          */
@@ -854,9 +874,8 @@ static int gost_cipher_do_cnt(EVP_CIPHER_CTX *ctx, unsigned char *out,
 /* Cleaning up of EVP_CIPHER_CTX */
 int gost_cipher_cleanup(EVP_CIPHER_CTX *ctx)
 {
-    gost_destroy(&
-                 ((struct ossl_gost_cipher_ctx *)
-                  EVP_CIPHER_CTX_get_cipher_data(ctx))->cctx);
+    gost_destroy(&((struct ossl_gost_cipher_ctx *)
+                   EVP_CIPHER_CTX_get_cipher_data(ctx))->cctx);
     EVP_CIPHER_CTX_set_app_data(ctx, NULL);
     return 1;
 }
@@ -878,7 +897,7 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
 #endif
     case EVP_CTRL_RAND_KEY:
         {
-            if (RAND_bytes
+            if (RAND_priv_bytes
                 ((unsigned char *)ptr, EVP_CIPHER_CTX_key_length(ctx)) <= 0) {
                 GOSTerr(GOST_F_GOST_CIPHER_CTL, GOST_R_RNG_ERROR);
                 return -1;
@@ -949,8 +968,7 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
             return 1;
         }
     default:
-        GOSTerr(GOST_F_GOST_CIPHER_CTL,
-                GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND);
+        GOSTerr(GOST_F_GOST_CIPHER_CTL, GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND);
         return -1;
     }
     return 1;
@@ -1004,7 +1022,6 @@ int gost89_set_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params)
 /* Store parameters into ASN1 structure */
 int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params)
 {
-    int ret = -1;
     int len;
     GOST_CIPHER_PARAMS *gcp = NULL;
     unsigned char *p;
@@ -1012,7 +1029,7 @@ int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx, ASN1_TYPE *params)
     int nid;
 
     if (ASN1_TYPE_get(params) != V_ASN1_SEQUENCE) {
-        return ret;
+        return -1;
     }
 
     p = params->value.sequence->data;
@@ -1074,15 +1091,14 @@ static int gost_imit_init_cp_12(EVP_MD_CTX *ctx)
 static void mac_block_mesh(struct ossl_gost_imit_ctx *c,
                            const unsigned char *data)
 {
-    unsigned char buffer[8];
     /*
-     * We are using local buffer for iv because CryptoPro doesn't interpret
+     * We are using NULL for iv because CryptoPro doesn't interpret
      * internal state of MAC algorithm as iv during keymeshing (but does
      * initialize internal state from iv in key transport
      */
     assert(c->count % 8 == 0 && c->count <= 1024);
     if (c->key_meshing && c->count == 1024) {
-        cryptopro_key_meshing(&(c->cctx), buffer);
+        cryptopro_key_meshing(&(c->cctx), NULL);
     }
     mac_block(&(c->cctx), c->buffer, data);
     c->count = c->count % 1024 + 8;
@@ -1092,12 +1108,13 @@ int gost_imit_update(EVP_MD_CTX *ctx, const void *data, size_t count)
 {
     struct ossl_gost_imit_ctx *c = EVP_MD_CTX_md_data(ctx);
     const unsigned char *p = data;
-    size_t bytes = count, i;
+    size_t bytes = count;
     if (!(c->key_set)) {
         GOSTerr(GOST_F_GOST_IMIT_UPDATE, GOST_R_MAC_KEY_NOT_SET);
         return 0;
     }
     if (c->bytes_left) {
+        size_t i;
         for (i = c->bytes_left; i < 8 && bytes > 0; bytes--, i++, p++) {
             c->partial_block[i] = *p;
         }
@@ -1151,8 +1168,7 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
         return 1;
     case EVP_MD_CTRL_SET_KEY:
         {
-            struct ossl_gost_imit_ctx *gost_imit_ctx =
-                EVP_MD_CTX_md_data(ctx);
+            struct ossl_gost_imit_ctx *gost_imit_ctx = EVP_MD_CTX_md_data(ctx);
 
             if (EVP_MD_meth_get_init(EVP_MD_CTX_md(ctx)) (ctx) <= 0) {
                 GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_MAC_KEY_NOT_SET);
@@ -1164,8 +1180,7 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
                 struct gost_mac_key *key = (struct gost_mac_key *)ptr;
                 if (key->mac_param_nid != NID_undef) {
                     const struct gost_cipher_info *param =
-                        get_encryption_params(OBJ_nid2obj
-                                              (key->mac_param_nid));
+                        get_encryption_params(OBJ_nid2obj(key->mac_param_nid));
                     if (param == NULL) {
                         GOSTerr(GOST_F_GOST_IMIT_CTRL,
                                 GOST_R_INVALID_MAC_PARAMS);
@@ -1185,7 +1200,7 @@ int gost_imit_ctrl(EVP_MD_CTX *ctx, int type, int arg, void *ptr)
             GOSTerr(GOST_F_GOST_IMIT_CTRL, GOST_R_INVALID_MAC_KEY_SIZE);
             return 0;
         }
-    case EVP_MD_CTRL_MAC_LEN:
+    case EVP_MD_CTRL_XOF_LEN:
         {
             struct ossl_gost_imit_ctx *c = EVP_MD_CTX_md_data(ctx);
             if (arg < 1 || arg > 8) {