From 68c29f61a404db3d620278878d77ca90ad853b8d Mon Sep 17 00:00:00 2001 From: Matt Caswell Date: Tue, 28 Oct 2014 22:59:34 +0000 Subject: [PATCH] Implement internally opaque bn access from evp Reviewed-by: Tim Hudson --- crypto/evp/Makefile | 4 ++-- crypto/evp/pmeth_gn.c | 4 ++-- 2 files changed, 4 insertions(+), 4 deletions(-) diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile index 7f44688262..1062afc4a3 100644 --- a/crypto/evp/Makefile +++ b/crypto/evp/Makefile @@ -769,8 +769,8 @@ pmeth_gn.o: ../../include/openssl/obj_mac.h ../../include/openssl/objects.h pmeth_gn.o: ../../include/openssl/opensslconf.h pmeth_gn.o: ../../include/openssl/opensslv.h ../../include/openssl/ossl_typ.h pmeth_gn.o: ../../include/openssl/safestack.h ../../include/openssl/stack.h -pmeth_gn.o: ../../include/openssl/symhacks.h ../cryptlib.h evp_locl.h -pmeth_gn.o: pmeth_gn.c +pmeth_gn.o: ../../include/openssl/symhacks.h ../cryptlib.h +pmeth_gn.o: ../include/internal/bn_int.h evp_locl.h pmeth_gn.c pmeth_lib.o: ../../e_os.h ../../include/openssl/asn1.h pmeth_lib.o: ../../include/openssl/bio.h ../../include/openssl/buffer.h pmeth_lib.o: ../../include/openssl/crypto.h ../../include/openssl/e_os2.h diff --git a/crypto/evp/pmeth_gn.c b/crypto/evp/pmeth_gn.c index b006a3710a..ab46e5a7d9 100644 --- a/crypto/evp/pmeth_gn.c +++ b/crypto/evp/pmeth_gn.c @@ -61,7 +61,7 @@ #include "cryptlib.h" #include #include -#include +#include "internal/bn_int.h" #include "evp_locl.h" int EVP_PKEY_paramgen_init(EVP_PKEY_CTX *ctx) @@ -178,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); -- 2.34.1