Commit 775c63fc authored by Ulf Möller's avatar Ulf Möller
Browse files

Reorganize bn_mul.c (no bugfix yet), remove obsolete files in BN library.

parent db209ec2

Configure

+1 −1
Original line number Diff line number Diff line
@@ -102,7 +102,7 @@ my %table=( 
"debug-ben-strict",	"gcc:-DBN_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DCONST_STRICT -O2 -Wall -Wshadow -Werror -Wpointer-arith -Wcast-qual -Wwrite-strings -pipe::(unknown):::::",

"debug-rse","cc:-DTERMIOS -DL_ENDIAN -pipe -O -g -ggdb3 -Wall::(unknown)::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-bodo",	"gcc:-DBIO_PAIR_DEBUG -DL_ENDIAN -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -m486 -pedantic -Wshadow -Wall::-D_REENTRANT::BN_LLONG $x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-ulf",	"gcc:-DL_ENDIAN -DREF_CHECK -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-steve",	"gcc:-DL_ENDIAN -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -DPEDANTIC -g -O2 -m486 -pedantic -Wall -Werror -Wshadow -pipe::-D_REENTRANT::$x86_gcc_des $x86_gcc_opts:$x86_elf_asm",

"debug-levitte-linux-elf","gcc:-DRL_DEBUG -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG -DNO_ASM -DL_ENDIAN -DTERMIO -D_POSIX_SOURCE -ggdb -g3 -m486 -pedantic -ansi -Wall -Wshadow -Wid-clash-31 -pipe::-D_REENTRANT:::",

"dist",		"cc:-O::(unknown):::::",

TABLE

+1 −1
Original line number Diff line number Diff line
@@ -801,7 +801,7 @@ $rc5_obj = asm/r586-elf.o 


*** debug-ulf

$cc           = gcc

$cflags       = -DL_ENDIAN -DREF_CHECK -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe

$cflags       = -DL_ENDIAN -DREF_CHECK -DBN_DEBUG -DBN_CTX_DEBUG -DCRYPTO_MDEBUG_ALL -g -O2 -m486 -Wall -Werror -Wshadow -pipe

$unistd       = 

$thread_cflag = -D_REENTRANT

$lflags       =

crypto/bn/Makefile.ssl

+4 −7
Original line number Diff line number Diff line
@@ -59,15 +59,12 @@ all: lib 
bn_prime.h: bn_prime.pl

	$(PERL) bn_prime.pl >bn_prime.h



knuth: bn_knuth.c

	cc -pg -I.. -I../../include bn_knuth.c -o knuth $(LIB) #../../../libefence.a



knuth.fast: bn_knuth.c

	cc -pg -fast -I.. -I../../include bn_knuth.c -o knuth $(LIB) #../../../libefence.a



divtest: divtest.c

divtest: divtest.c ../../libcrypto.a

	cc -I../../include divtest.c -o divtest ../../libcrypto.a



bnbug: bnbug.c ../../libcrypto.a

	cc -g -I../../include bnbug.c -o bnbug ../../libcrypto.a



lib:	$(LIBOBJ)

	$(AR) $(LIB) $(LIBOBJ)

	$(RANLIB) $(LIB)

crypto/bn/asm/README

+1 −8
Original line number Diff line number Diff line 
All assember in this directory are just version of the file

crypto/bn/bn_mulw.c.

crypto/bn/bn_asm.c.



Quite a few of these files are just the assember output from gcc since on 

quite a few machines they are 2 times faster than the system compiler.
@@ -15,13 +15,6 @@ On the 2 alpha C compilers I had access to, it was not possible to do 
were 64 bits).  So the hand assember gives access to the 128 bit result and

a 2 times speedup :-).



The x86xxxx.obj files are the assembled version of x86xxxx.asm files.

I had such a hard time finding a macro assember for Microsoft, I decided to

include the object file to save others the hassle :-).



I have also included uu encoded versions of the .obj incase they get

trashed.



There are 2 versions of assember for the HP PA-RISC.

pa-risc.s is the origional one which works fine.

pa-risc2.s is a new version that often generates warnings but if the

crypto/bn/bn.h

+35 −25
Original line number Diff line number Diff line
@@ -289,7 +289,6 @@ typedef struct bn_recp_ctx_st 
#define BN_prime_checks 0 /* default: select number of iterations

			     based on the size of the number */





/* number of Miller-Rabin iterations for an error rate  of less than 2^-80

 * for random 'b'-bit input, b >= 100 (taken from table 4.4 in the Handbook

 * of Applied Cryptography [Menezes, van Oorschot, Vanstone; CRC Press 1996];
@@ -319,20 +318,6 @@ typedef struct bn_recp_ctx_st 
/*#define BN_ascii2bn(a)	BN_hex2bn(a) */

/*#define BN_bn2ascii(a)	BN_bn2hex(a) */



#define bn_expand(n,b) ((((((b+BN_BITS2-1))/BN_BITS2)) <= (n)->max)?\

	(n):bn_expand2((n),(b)/BN_BITS2+1))

#define bn_wexpand(n,b) (((b) <= (n)->max)?(n):bn_expand2((n),(b)))



#define bn_fix_top(a) \

        { \

        BN_ULONG *ftl; \

	if ((a)->top > 0) \

		{ \

		for (ftl= &((a)->d[(a)->top-1]); (a)->top > 0; (a)->top--) \

		if (*(ftl--)) break; \

		} \

	}



BIGNUM *BN_value_one(void);

char *	BN_options(void);

BN_CTX *BN_CTX_new(void);
@@ -385,19 +370,18 @@ int BN_mod_exp_simple(BIGNUM *r, BIGNUM *a, BIGNUM *p, 
	BIGNUM *m,BN_CTX *ctx);

int	BN_mask_bits(BIGNUM *a,int n);

int	BN_mod_mul(BIGNUM *ret, BIGNUM *a, BIGNUM *b, const BIGNUM *m, BN_CTX *ctx);

#ifndef WIN16

#ifndef NO_FP_API

int	BN_print_fp(FILE *fp, const BIGNUM *a);

#endif

#ifdef HEADER_BIO_H

int	BN_print(BIO *fp, const BIGNUM *a);

#else

int	BN_print(char *fp, const BIGNUM *a);

int	BN_print(void *fp, const BIGNUM *a);

#endif

int	BN_reciprocal(BIGNUM *r, BIGNUM *m, int len, BN_CTX *ctx);

int	BN_rshift(BIGNUM *r, BIGNUM *a, int n);

int	BN_rshift1(BIGNUM *r, BIGNUM *a);

void	BN_clear(BIGNUM *a);

BIGNUM *bn_expand2(BIGNUM *b, int bits);

BIGNUM *BN_dup(const BIGNUM *a);

int	BN_ucmp(const BIGNUM *a, const BIGNUM *b);

int	BN_set_bit(BIGNUM *a, int n);
@@ -418,13 +402,6 @@ int BN_is_prime_fasttest(const BIGNUM *p,int nchecks, 
		int do_trial_division);

void	ERR_load_BN_strings(void );



BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);

BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);

void     bn_sqr_words(BN_ULONG *rp, BN_ULONG *ap, int num);

BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);

BN_ULONG bn_add_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);

BN_ULONG bn_sub_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);



BN_MONT_CTX *BN_MONT_CTX_new(void );

void BN_MONT_CTX_init(BN_MONT_CTX *ctx);

int BN_mod_mul_montgomery(BIGNUM *r,BIGNUM *a,BIGNUM *b,BN_MONT_CTX *mont,
@@ -454,6 +431,39 @@ int BN_mod_exp_recp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, 
int	BN_div_recp(BIGNUM *dv, BIGNUM *rem, BIGNUM *m,

		BN_RECP_CTX *recp, BN_CTX *ctx);



/* library internal functions */



#define bn_expand(a,bits) ((((((bits+BN_BITS2-1))/BN_BITS2)) <= (a)->max)?\

	(a):bn_expand2((a),(bits)/BN_BITS2+1))

#define bn_wexpand(a,words) (((words) <= (a)->max)?(a):bn_expand2((a),(words)))

BIGNUM *bn_expand2(BIGNUM *a, int words);



#define bn_fix_top(a) \

        { \

        BN_ULONG *ftl; \

	if ((a)->top > 0) \

		{ \

		for (ftl= &((a)->d[(a)->top-1]); (a)->top > 0; (a)->top--) \

		if (*(ftl--)) break; \

		} \

	}



BN_ULONG bn_mul_add_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);

BN_ULONG bn_mul_words(BN_ULONG *rp, BN_ULONG *ap, int num, BN_ULONG w);

void     bn_sqr_words(BN_ULONG *rp, BN_ULONG *ap, int num);

BN_ULONG bn_div_words(BN_ULONG h, BN_ULONG l, BN_ULONG d);

BN_ULONG bn_add_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);

BN_ULONG bn_sub_words(BN_ULONG *rp, BN_ULONG *ap, BN_ULONG *bp,int num);



#ifdef BN_DEBUG

  void bn_dump1(FILE *o, const char *a, BN_ULONG *b,int n);

# define bn_print(a) {fprintf(stderr, #a "="); BN_print_fp(stderr,a); \

   fprintf(stderr,"\n");}

# define bn_dump(a,n) bn_dump1(stderr,#a,a,n);

#else

# define bn_print(a)

# define bn_dump(a,b)

#endif



/* BEGIN ERROR CODES */

/* The following lines are auto generated by the script mkerr.pl. Any changes