Merge remote-tracking branch 'origin/openssl_1_1_0'

[openssl-gost/engine.git] / gost_crypt.c

diff --git a/gost_crypt.c b/gost_crypt.c
index f9ed2cf22b0c8125252ef354b653e096476b0251..a15317127f94acab9b852fcc927b5642876ebba3 100644 (file)
--- a/gost_crypt.c
+++ b/gost_crypt.c
@@ -487,7 +487,6 @@ static void gost_cnt_next(void *ctx, unsigned char *iv, unsigned char *buf)
 int gost_cipher_do_cbc(EVP_CIPHER_CTX *ctx, unsigned char *out,
                        const unsigned char *in, size_t inl)
 {
-    OPENSSL_assert(inl % 8 == 0);
     unsigned char b[8];
     const unsigned char *in_ptr = in;
     unsigned char *out_ptr = out;
@@ -692,6 +691,12 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx, int type, int arg, void *ptr)
         } else {
             return 0;
         }
+    case EVP_CTRL_SET_SBOX:
+        if (ptr) {
+            struct ossl_gost_cipher_ctx *c = ctx->cipher_data;
+            int nid;
+            int cur_meshing;
+            int ret;
 
     case EVP_CTRL_SET_SBOX:
         if (ptr) {