1 files changed, 14 insertions, 3 deletions

diff --git a/src/lib/libcrypto/bn/bn_ctx.c b/src/lib/libcrypto/bn/bn_ctx.c
index 46132fd180..7daf19eb84 100644
--- a/src/lib/libcrypto/bn/bn_ctx.c
+++ b/src/lib/libcrypto/bn/bn_ctx.c
@@ -61,15 +61,16 @@
 
 #include <stdio.h>
 #include <assert.h>
+
 #include "cryptlib.h"
-#include <openssl/bn.h>
+#include "bn_lcl.h"
 
 
 BN_CTX *BN_CTX_new(void)
         {
         BN_CTX *ret;
 
-        ret=(BN_CTX *)Malloc(sizeof(BN_CTX));
+        ret=(BN_CTX *)OPENSSL_malloc(sizeof(BN_CTX));
         if (ret == NULL)
                 {
                 BNerr(BN_F_BN_CTX_NEW,ERR_R_MALLOC_FAILURE);
@@ -83,6 +84,7 @@ BN_CTX *BN_CTX_new(void)
 
 void BN_CTX_init(BN_CTX *ctx)
         {
+#if 0 /* explicit version */
         int i;
         ctx->tos = 0;
         ctx->flags = 0;
@@ -90,6 +92,9 @@ void BN_CTX_init(BN_CTX *ctx)
         ctx->too_many = 0;
         for (i = 0; i < BN_CTX_NUM; i++)
                 BN_init(&(ctx->bn[i]));
+#else
+        memset(ctx, 0, sizeof *ctx);
+#endif
         }
 
 void BN_CTX_free(BN_CTX *ctx)
@@ -102,7 +107,7 @@ void BN_CTX_free(BN_CTX *ctx)
         for (i=0; i < BN_CTX_NUM; i++)
                 BN_clear_free(&(ctx->bn[i]));
         if (ctx->flags & BN_FLG_MALLOCED)
-                Free(ctx);
+                OPENSSL_free(ctx);
         }
 
 void BN_CTX_start(BN_CTX *ctx)
@@ -112,8 +117,14 @@ void BN_CTX_start(BN_CTX *ctx)
         ctx->depth++;
         }
 
+
 BIGNUM *BN_CTX_get(BN_CTX *ctx)
         {
+        /* Note: If BN_CTX_get is ever changed to allocate BIGNUMs dynamically,
+         * make sure that if BN_CTX_get fails once it will return NULL again
+         * until BN_CTX_end is called.  (This is so that callers have to check
+         * only the last return value.)
+         */
         if (ctx->depth > BN_CTX_NUM_POS || ctx->tos >= BN_CTX_NUM)
                 {
                 if (!ctx->too_many)