Cleanup OPENSSL_NO_xxx, part 1

[openssl.git] / crypto / evp / pmeth_gn.c

diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c
index 17e0d5473a561545e8bdf493b35a3f713eac725e..ab46e5a7d9374036e189ddb85cdee21b01663472 100644 (file)
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -1,5 +1,5 @@
 /* pmeth_gn.c */
-/* Written by Dr Stephen N Henson (shenson@bigfoot.com) for the OpenSSL
+/* Written by Dr Stephen N Henson (steve@openssl.org) for the OpenSSL
  * project 2006.
  */
 /* ====================================================================
@@ -61,6 +61,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/evp.h>
+#include "internal/bn_int.h"
 #include "evp_locl.h"
 
 int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx)
@@ -177,7 +178,7 @@ EVP_PKEY_gen_cb *EVP_PKEY_CTX_get_cb(EVP_PKEY_CTX *ctx)
 
 static int trans_cb(int a, int b, BN_GENCB *gcb)
        {
-       EVP_PKEY_CTX *ctx = gcb->arg;
+       EVP_PKEY_CTX *ctx = BN_GENCB_get_arg(gcb);
        ctx->keygen_info[0] = a;
        ctx->keygen_info[1] = b;
        return ctx->pkey_gencb(ctx);
@@ -185,7 +186,7 @@ static int trans_cb(int a, int b, BN_GENCB *gcb)
 
 void evp_pkey_set_cb_translate(BN_GENCB *cb, EVP_PKEY_CTX *ctx)
        {
-       BN_GENCB_set(cb, trans_cb, ctx)
+       BN_GENCB_set(cb, trans_cb, ctx);
        }
 
 int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
@@ -198,7 +199,7 @@ int EVP_PKEY_CTX_get_keygen_info(EVP_PKEY_CTX *ctx, int idx)
        }
 
 EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
-                               unsigned char *key, int keylen)
+                               const unsigned char *key, int keylen)
        {
        EVP_PKEY_CTX *mac_ctx = NULL;
        EVP_PKEY *mac_key = NULL;
@@ -208,7 +209,8 @@ EVP_PKEY *EVP_PKEY_new_mac_key(int type, ENGINE *e,
        if (EVP_PKEY_keygen_init(mac_ctx) <= 0)
                goto merr;
        if (EVP_PKEY_CTX_ctrl(mac_ctx, -1, EVP_PKEY_OP_KEYGEN,
-                               EVP_PKEY_CTRL_SET_MAC_KEY, keylen, key) <= 0)
+                               EVP_PKEY_CTRL_SET_MAC_KEY,
+                               keylen, (void *)key) <= 0)
                goto merr;
        if (EVP_PKEY_keygen(mac_ctx, &mac_key) <= 0)
                goto merr;