Implement internally opaque bn access from evp

Reviewed-by: Tim Hudson <tjh@openssl.org>

diff --git a/crypto/evp/Makefile b/crypto/evp/Makefile
index 7f44688262bcbae8fe2d9114846056a8d7b10c95..1062afc4a3d96d0a39b347210135f227e84a113e 100644 (file)
--- 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 b006a3710a1473e12bec466ba0f0d1158ee60842..ab46e5a7d9374036e189ddb85cdee21b01663472 100644 (file)
--- a/crypto/evp/pmeth_gn.c
+++ b/crypto/evp/pmeth_gn.c
@@ -61,7 +61,7 @@
 #include "cryptlib.h"
 #include <openssl/objects.h>
 #include <openssl/evp.h>
-#include <openssl/bn.h>
+#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);