Commit 9b141126 authored by Ulf Möller's avatar Ulf Möller
Browse files

New functions BN_CTX_start(), BN_CTX_get(), BN_CTX_end() to access 

temporary BIGNUMs. BN_CTX still uses a fixed number of BIGNUMs, but
the BN_CTX implementation could now easily be changed.
parent 7e708ebe

CHANGES

+8 −0
Original line number Diff line number Diff line
@@ -4,6 +4,14 @@ 


 Changes between 0.9.4 and 0.9.5  [xx XXX 2000]



  *) New functions BN_CTX_start(), BN_CTX_get() and BT_CTX_end() to

     get temporary BIGNUMs from a BN_CTX.

     [Ulf Möller]



  *) Correct return values in BN_mod_exp_mont() and BN_mod_exp2_mont()

     for p == 0.

     [Ulf Möller]



  *) Change the SSLeay_add_all_*() functions to OpenSSL_add_all_*() and

     include a #define from the old name to the new. The original intent

     was that statically linked binaries could for example just call

crypto/bn/Makefile.ssl

+2 −2
Original line number Diff line number Diff line
@@ -34,12 +34,12 @@ TEST=bntest.c exptest.c 
APPS=



LIB=$(TOP)/libcrypto.a

LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_lib.c bn_mul.c \

LIBSRC=	bn_add.c bn_div.c bn_exp.c bn_lib.c bn_ctx.c bn_mul.c \

	bn_print.c bn_rand.c bn_shift.c bn_word.c bn_blind.c \

	bn_gcd.c bn_prime.c bn_err.c bn_sqr.c bn_asm.c bn_recp.c bn_mont.c \

	bn_mpi.c bn_exp2.c



LIBOBJ=	bn_add.o bn_div.o bn_exp.o bn_lib.o bn_mul.o \

LIBOBJ=	bn_add.o bn_div.o bn_exp.o bn_lib.o bn_ctx.o bn_mul.o \

	bn_print.o bn_rand.o bn_shift.o bn_word.o bn_blind.o \

	bn_gcd.o bn_prime.o bn_err.o bn_sqr.o $(BN_ASM) bn_recp.o bn_mont.o \

	bn_mpi.o bn_exp2.o

crypto/bn/bn.h

+7 −0
Original line number Diff line number Diff line
@@ -245,6 +245,8 @@ typedef struct bignum_ctx 
	int tos;

	BIGNUM bn[BN_CTX_NUM+1];

	int flags;

	int depth;

	int pos[BN_CTX_NUM+1];

	} BN_CTX;



typedef struct bn_blinding_st
@@ -335,6 +337,9 @@ char * BN_options(void); 
BN_CTX *BN_CTX_new(void);

void	BN_CTX_init(BN_CTX *c);

void	BN_CTX_free(BN_CTX *c);

void	BN_CTX_start(BN_CTX *ctx);

BIGNUM *BN_CTX_get(BN_CTX *ctx);

void	BN_CTX_end(BN_CTX *ctx);

int     BN_rand(BIGNUM *rnd, int bits, int top,int bottom);

int     BN_pseudo_rand(BIGNUM *rnd, int bits, int top,int bottom);

int	BN_num_bits(const BIGNUM *a);
@@ -463,6 +468,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, 
#define BN_F_BN_BLINDING_UPDATE				 103

#define BN_F_BN_BN2DEC					 104

#define BN_F_BN_BN2HEX					 105

#define BN_F_BN_CTX_GET					 116

#define BN_F_BN_CTX_NEW					 106

#define BN_F_BN_DIV					 107

#define BN_F_BN_EXPAND2					 108
@@ -484,6 +490,7 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m, 
#define BN_R_INVALID_LENGTH				 106

#define BN_R_NOT_INITIALIZED				 107

#define BN_R_NO_INVERSE					 108

#define BN_R_TOO_MANY_TEMPORARY_VARIABLES		 109



#ifdef  __cplusplus

}

crypto/bn/bn_ctx.c

0 → 100644
+123 −0
Original line number Diff line number Diff line 
/* crypto/bn/bn_ctx.c */

/* Written by Ulf Moeller for the OpenSSL project. */

/* ====================================================================

 * Copyright (c) 1998-2000 The OpenSSL Project.  All rights reserved.

 *

 * Redistribution and use in source and binary forms, with or without

 * modification, are permitted provided that the following conditions

 * are met:

 *

 * 1. Redistributions of source code must retain the above copyright

 *    notice, this list of conditions and the following disclaimer. 

 *

 * 2. Redistributions in binary form must reproduce the above copyright

 *    notice, this list of conditions and the following disclaimer in

 *    the documentation and/or other materials provided with the

 *    distribution.

 *

 * 3. All advertising materials mentioning features or use of this

 *    software must display the following acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit. (http://www.openssl.org/)"

 *

 * 4. The names "OpenSSL Toolkit" and "OpenSSL Project" must not be used to

 *    endorse or promote products derived from this software without

 *    prior written permission. For written permission, please contact

 *    openssl-core@openssl.org.

 *

 * 5. Products derived from this software may not be called "OpenSSL"

 *    nor may "OpenSSL" appear in their names without prior written

 *    permission of the OpenSSL Project.

 *

 * 6. Redistributions of any form whatsoever must retain the following

 *    acknowledgment:

 *    "This product includes software developed by the OpenSSL Project

 *    for use in the OpenSSL Toolkit (http://www.openssl.org/)"

 *

 * THIS SOFTWARE IS PROVIDED BY THE OpenSSL PROJECT ``AS IS'' AND ANY

 * EXPRESSED OR IMPLIED WARRANTIES, INCLUDING, BUT NOT LIMITED TO, THE

 * IMPLIED WARRANTIES OF MERCHANTABILITY AND FITNESS FOR A PARTICULAR

 * PURPOSE ARE DISCLAIMED.  IN NO EVENT SHALL THE OpenSSL PROJECT OR

 * ITS CONTRIBUTORS BE LIABLE FOR ANY DIRECT, INDIRECT, INCIDENTAL,

 * SPECIAL, EXEMPLARY, OR CONSEQUENTIAL DAMAGES (INCLUDING, BUT

 * NOT LIMITED TO, PROCUREMENT OF SUBSTITUTE GOODS OR SERVICES;

 * LOSS OF USE, DATA, OR PROFITS; OR BUSINESS INTERRUPTION)

 * HOWEVER CAUSED AND ON ANY THEORY OF LIABILITY, WHETHER IN CONTRACT,

 * STRICT LIABILITY, OR TORT (INCLUDING NEGLIGENCE OR OTHERWISE)

 * ARISING IN ANY WAY OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED

 * OF THE POSSIBILITY OF SUCH DAMAGE.

 * ====================================================================

 *

 * This product includes cryptographic software written by Eric Young

 * (eay@cryptsoft.com).  This product includes software written by Tim

 * Hudson (tjh@cryptsoft.com).

 *

 */



#include <stdio.h>

#include <assert.h>

#include "cryptlib.h"

#include <openssl/bn.h>





BN_CTX *BN_CTX_new(void)

	{

	BN_CTX *ret;



	ret=(BN_CTX *)Malloc(sizeof(BN_CTX));

	if (ret == NULL)

		{

		BNerr(BN_F_BN_CTX_NEW,ERR_R_MALLOC_FAILURE);

		return(NULL);

		}



	BN_CTX_init(ret);

	ret->flags=BN_FLG_MALLOCED;

	return(ret);

	}



void BN_CTX_init(BN_CTX *ctx)

	{

	int i;

	ctx->tos = 0;

	ctx->flags = 0;

	ctx->depth = 0;

	for (i = 0; i < BN_CTX_NUM; i++)

		BN_init(&(ctx->bn[i]));

	}



void BN_CTX_free(BN_CTX *ctx)

	{

	int i;



	if (ctx == NULL) return;

	assert(ctx->depth == 0);



	for (i=0; i < BN_CTX_NUM; i++)

		BN_clear_free(&(ctx->bn[i]));

	if (ctx->flags & BN_FLG_MALLOCED)

		Free(ctx);

	}



void BN_CTX_start(BN_CTX *ctx)

	{

	ctx->pos[ctx->depth++] = ctx->tos;

	}



BIGNUM *BN_CTX_get(BN_CTX *ctx)

	{

	if (ctx->tos >= BN_CTX_NUM)

		{

		BNerr(BN_F_BN_CTX_GET,BN_R_TOO_MANY_TEMPORARY_VARIABLES);

		return NULL;

		}

	return (&(ctx->bn[ctx->tos++]));

	}



void BN_CTX_end(BN_CTX *ctx)

	{

	if (ctx == NULL) return;

	assert(ctx->depth > 0);

	ctx->depth--;

	ctx->tos = ctx->pos[ctx->depth];

	}

crypto/bn/bn_div.c

+36 −20
Original line number Diff line number Diff line
@@ -62,11 +62,12 @@ 
#include "bn_lcl.h"



/* The old slow way */

#if 0

#if 1

int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d,

	   BN_CTX *ctx)

	{

	int i,nm,nd;

	int ret = 0;

	BIGNUM *D;



	bn_check_top(m);
@@ -85,14 +86,17 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, 
		return(1);

		}



	D= &(ctx->bn[ctx->tos]);

	if (dv == NULL) dv= &(ctx->bn[ctx->tos+1]);

	if (rem == NULL) rem= &(ctx->bn[ctx->tos+2]);

	BN_CTX_start(ctx);

	D = BN_CTX_get(ctx);

	if (dv == NULL) dv = BN_CTX_get(ctx);

	if (rem == NULL) rem = BN_CTX_get(ctx);

	if (D == NULL || dv == NULL || rem == NULL)

		goto end;



	nd=BN_num_bits(d);

	nm=BN_num_bits(m);

	if (BN_copy(D,d) == NULL) return(0);

	if (BN_copy(rem,m) == NULL) return(0);

	if (BN_copy(D,d) == NULL) goto end;

	if (BN_copy(rem,m) == NULL) goto end;



	/* The next 2 are needed so we can do a dv->d[0]|=1 later

	 * since BN_lshift1 will only work once there is a value :-) */
@@ -100,21 +104,24 @@ int BN_div(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, 
	bn_wexpand(dv,1);

	dv->top=1;



	if (!BN_lshift(D,D,nm-nd)) return(0);

	if (!BN_lshift(D,D,nm-nd)) goto end;

	for (i=nm-nd; i>=0; i--)

		{

		if (!BN_lshift1(dv,dv)) return(0);

		if (!BN_lshift1(dv,dv)) goto end;

		if (BN_ucmp(rem,D) >= 0)

			{

			dv->d[0]|=1;

			if (!BN_usub(rem,rem,D)) return(0);

			if (!BN_usub(rem,rem,D)) goto end;

			}

/* CAN IMPROVE (and have now :=) */

		if (!BN_rshift1(D,D)) return(0);

		if (!BN_rshift1(D,D)) goto end;

		}

	rem->neg=BN_is_zero(rem)?0:m->neg;

	dv->neg=m->neg^d->neg;

	return(1);

	ret = 1;

 end:

	BN_CTX_end(ctx);

	return(ret);

	}



#else
@@ -145,13 +152,15 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor, 
		return(1);

		}



	tmp= &(ctx->bn[ctx->tos]);

	BN_CTX_start(ctx);

	tmp=BN_CTX_get(ctx);

	tmp->neg=0;

	snum= &(ctx->bn[ctx->tos+1]);

	sdiv= &(ctx->bn[ctx->tos+2]);

	snum=BN_CTX_get(ctx);

	sdiv=BN_CTX_get(ctx);

	if (dv == NULL)

		res= &(ctx->bn[ctx->tos+3]);

		res=BN_CTX_get(ctx);

	else	res=dv;

	if (res == NULL) goto err;



	/* First we normalise the numbers */

	norm_shift=BN_BITS2-((BN_num_bits(divisor))%BN_BITS2);
@@ -329,8 +338,10 @@ int BN_div(BIGNUM *dv, BIGNUM *rm, const BIGNUM *num, const BIGNUM *divisor, 
		BN_rshift(rm,snum,norm_shift);

		rm->neg=num->neg;

		}

	BN_CTX_end(ctx);

	return(1);

err:

	BN_CX_end(ctx);

	return(0);

	}
@@ -346,22 +357,27 @@ int BN_mod(BIGNUM *rem, const BIGNUM *m, const BIGNUM *d, BN_CTX *ctx) 
	if (BN_ucmp(m,d) < 0)

		return((BN_copy(rem,m) == NULL)?0:1);



	dv= &(ctx->bn[ctx->tos]);

	BN_CTX_start(ctx);

	dv=BN_CTX_get(ctx);



	if (!BN_copy(rem,m)) return(0);

	if (!BN_copy(rem,m)) goto err;



	nm=BN_num_bits(rem);

	nd=BN_num_bits(d);

	if (!BN_lshift(dv,d,nm-nd)) return(0);

	if (!BN_lshift(dv,d,nm-nd)) goto err;

	for (i=nm-nd; i>=0; i--)

		{

		if (BN_cmp(rem,dv) >= 0)

			{

			if (!BN_sub(rem,rem,dv)) return(0);

			if (!BN_sub(rem,rem,dv)) goto err;

			}

		if (!BN_rshift1(dv,dv)) return(0);

		if (!BN_rshift1(dv,dv)) goto err;

		}

	BN_CTX_end(ctx);

	return(1);

 err:

	BN_CTX_end(ctx);

	return(0);

#else

	return(BN_div(NULL,rem,m,d,ctx));

#endif