Check GOST parameters are not NULL (CVE-2012-0027)

[oweals/openssl.git] / engines / ccgost / gost_lcl.h

diff --git a/engines/ccgost/gost_lcl.h b/engines/ccgost/gost_lcl.h
index 0396df141ace6cde47769cefe103c95baa556563..437a48cc86ca65736edda3b4a2477935dbe68798 100644 (file)
--- a/engines/ccgost/gost_lcl.h
+++ b/engines/ccgost/gost_lcl.h
@@ -47,6 +47,7 @@
            int sign_param_nid; /* Should be set whenever parameters are filled */
                EVP_MD *md;
                unsigned char *shared_ukm;
+               int peer_key_used;
        };
 
        struct gost_mac_pmeth_data {
@@ -89,15 +90,15 @@ typedef struct { /* FIXME incomplete */
    -- Richard Levitte */
 #ifdef OPENSSL_SYS_VMS
 #undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_it
-#defined GOST_CLIENT_KEY_EXCHANGE_PARAMS_it    GOST_CLIENT_KEY_EXC_PARAMS_it
+#define GOST_CLIENT_KEY_EXCHANGE_PARAMS_it     GOST_CLIENT_KEY_EXC_PARAMS_it
 #undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_new
-#defined GOST_CLIENT_KEY_EXCHANGE_PARAMS_new   GOST_CLIENT_KEY_EXC_PARAMS_new
+#define GOST_CLIENT_KEY_EXCHANGE_PARAMS_new    GOST_CLIENT_KEY_EXC_PARAMS_new
 #undef GOST_CLIENT_KEY_EXCHANGE_PARAMS_free
-#defined GOST_CLIENT_KEY_EXCHANGE_PARAMS_free  GOST_CLIENT_KEY_EXC_PARAMS_free
+#define GOST_CLIENT_KEY_EXCHANGE_PARAMS_free   GOST_CLIENT_KEY_EXC_PARAMS_free
 #undef d2i_GOST_CLIENT_KEY_EXCHANGE_PARAMS
-#defined d2i_GOST_CLIENT_KEY_EXCHANGE_PARAMS   d2i_GOST_CLIENT_KEY_EXC_PARAMS
+#define d2i_GOST_CLIENT_KEY_EXCHANGE_PARAMS    d2i_GOST_CLIENT_KEY_EXC_PARAMS
 #undef i2d_GOST_CLIENT_KEY_EXCHANGE_PARAMS
-#defined i2d_GOST_CLIENT_KEY_EXCHANGE_PARAMS   i2d_GOST_CLIENT_KEY_EXC_PARAMS
+#define i2d_GOST_CLIENT_KEY_EXCHANGE_PARAMS    i2d_GOST_CLIENT_KEY_EXC_PARAMS
 #endif /* End of hack */
 DECLARE_ASN1_FUNCTIONS(GOST_CLIENT_KEY_EXCHANGE_PARAMS)
 typedef struct {