Merge branch 'magma_impl' into openssl_1_0_2_alt

diff --cc CMakeLists.txt
Simple merge

diff --cc gost_ameth.c
Simple merge

diff --cc gost_eng.c
index 517a7da2e6a0d2f95b5dd69373ce0e2783fb0a2b,1f2565400bfce17c944ede17d6b2922ce231f300..caedf9afe1f2302214faeea6764d18cd2a96ec2a
--- 1/gost_eng.c
--- 2/gost_eng.c
+++ b/gost_eng.c
@@@ -102,33 -114,38 +114,39 @@@ static int gost_engine_finish(ENGINE* e
  }
  
  static int gost_engine_destroy(ENGINE* e) {
 -  digest_gost_destroy();
 -  digest_gost2012_256_destroy();
 -  digest_gost2012_512_destroy();
 -
 -  imit_gost_cpa_destroy();
 -  imit_gost_cp_12_destroy();
 -  magma_omac_destroy();
 -  grasshopper_omac_destroy();
 -
 -  cipher_gost_destroy();
 -
 -  gost_param_free();
 -
 -  pmeth_GostR3410_2001 = NULL;
 -  pmeth_Gost28147_MAC = NULL;
 -  pmeth_GostR3410_2012_256 = NULL;
 -  pmeth_GostR3410_2012_512 = NULL;
 -  pmeth_Gost28147_MAC_12 = NULL;
 -  pmeth_magma_mac = NULL;
 -  pmeth_grasshopper_mac = NULL;
 -
 -  ameth_GostR3410_2001 = NULL;
 -  ameth_Gost28147_MAC = NULL;
 -  ameth_GostR3410_2012_256 = NULL;
 -  ameth_GostR3410_2012_512 = NULL;
 -  ameth_Gost28147_MAC_12 = NULL;
 -  ameth_magma_mac = NULL;
 -  ameth_grasshopper_mac = NULL;
 -
 -  ERR_unload_GOST_strings();
 -
 -  return 1;
 +    digest_gost_destroy();
 +    digest_gost2012_256_destroy();
 +    digest_gost2012_512_destroy();
 +
 +    imit_gost_cpa_destroy();
 +    imit_gost_cp_12_destroy();
++    magma_omac_destroy();
++    grasshopper_omac_destroy();
 +
 +    cipher_gost_destroy();
 +    cipher_gost_grasshopper_destroy();
 +
 +    gost_param_free();
 +
 +    pmeth_GostR3410_2001 = NULL;
 +    pmeth_Gost28147_MAC = NULL;
 +    pmeth_GostR3410_2012_256 = NULL;
 +    pmeth_GostR3410_2012_512 = NULL;
 +    pmeth_Gost28147_MAC_12 = NULL;
++    pmeth_magma_mac = NULL;
++    pmeth_grasshopper_mac = NULL;
 +
 +    ameth_GostR3410_2001 = NULL;
 +    ameth_Gost28147_MAC = NULL;
 +    ameth_GostR3410_2012_256 = NULL;
 +    ameth_GostR3410_2012_512 = NULL;
 +    ameth_Gost28147_MAC_12 = NULL;
++    ameth_magma_mac = NULL;
++    ameth_grasshopper_mac = NULL;
 +
 +      ERR_unload_GOST_strings();
 +      
 +    return 1;
  }
  
  static int bind_gost(ENGINE* e, const char* id) {

diff --cc gost_grasshopper_cipher.c
Simple merge