From: Dmitry Belyavskiy <beldmit@gmail.com>
Date: Thu, 10 Mar 2016 17:17:41 +0000 (+0300)
Subject: Backport of the ctrl-function from the 1_1_0 branch
X-Git-Tag: v1.1.0.2~28
X-Git-Url: http://wagner.pp.ru/gitweb/?a=commitdiff_plain;h=c89b75723868791467e949c968988f8cab1c9cf9;p=openssl-gost%2Fengine.git

Backport of the ctrl-function from the 1_1_0 branch
---

diff --git a/gost_crypt.c b/gost_crypt.c
index 8132a1e..8587bd1 100644
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@ -558,7 +558,52 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
         } else {
             return 0;
         }
+#ifdef EVP_CTRL_SET_SBOX
+    case EVP_CTRL_SET_SBOX:
+        if (ptr) {
+            struct ossl_gost_cipher_ctx *c = ctx->cipher_data;
+            int nid;
+            int cur_meshing;
+            int ret;
+
+            if (c == NULL) {
+                return -1;
+            }
+
+            if (c->count != 0) {
+                return -1;
+            }
 
+            nid = OBJ_txt2nid(ptr);
+            if (nid == NID_undef) {
+                return 0;
+            }
+
+            cur_meshing = c->key_meshing;
+            ret = gost_cipher_set_param(c, nid);
+            c->key_meshing = cur_meshing;
+            return ret;
+        } else {
+          return 0;
+        }
+#endif
+#ifdef EVP_CTRL_KEY_MESH
+    case EVP_CTRL_KEY_MESH:
+        {
+            struct ossl_gost_cipher_ctx *c = ctx->cipher_data;
+
+            if (c == NULL) {
+                return -1;
+            }
+
+            if (c->count != 0) {
+                return -1;
+            }
+
+            c->key_meshing = arg;
+            return 1;
+        }				
+#endif
     default:
         GOSTerr(GOST_F_GOST_CIPHER_CTL,
                 GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND);