merge upstream

diff --cc gost_ameth.c
Simple merge

diff --cc gost_crypt.c
index 4358265b7016e25e4a8b0ac1e52c6d43cee687a0,f9ed2cf22b0c8125252ef354b653e096476b0251..d375a3dc89dd1b237900acf719f1fd371b72afd7
--- 1/gost_crypt.c
--- 2/gost_crypt.c
+++ b/gost_crypt.c
@@@ -489,12 -492,11 +491,12 @@@ int gost_cipher_do_cbc(EVP_CIPHER_CTX *
      const unsigned char *in_ptr = in;
      unsigned char *out_ptr = out;
      int i;
-     struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_cipher_data(ctx);
+     struct ossl_gost_cipher_ctx *c = EVP_CIPHER_CTX_get_cipher_data(ctx);
      unsigned char *iv = EVP_CIPHER_CTX_iv_noconst(ctx);
 +    OPENSSL_assert(inl % 8 == 0);
      if (EVP_CIPHER_CTX_encrypting(ctx)) {
          while (inl > 0) {
-             
+ 
              for (i = 0; i < 8; i++) {
                  b[i] = iv[i] ^ in_ptr[i];
              }

diff --cc gost_grasshopper_cipher.c
Simple merge