Commit b53e44e5 authored by Bodo Möller's avatar Bodo Möller
Browse files

implement and use new macros BN_get_sign(), BN_set_sign() 

Submitted by: Nils Larsch
parent e5f4d827

CHANGES

+9 −0
Original line number Diff line number Diff line
@@ -4,6 +4,15 @@ 


 Changes between 0.9.7 and 0.9.8  [xx XXX 2002]



  *) Extend the BIGNUM API by creating new macros that behave like

     functions



          void BN_set_sign(BIGNUM *a, int neg);

          int BN_get_sign(const BIGNUM *a);



     and avoid the need to access 'a->neg' directly in applications.

     [Nils Larsch  <nla@trustcenter.de>]



  *) Implement fast modular reduction for pseudo-Mersenne primes

     used in NIST curves (crypto/bn/bn_nist.c, crypto/ec/ecp_nist.c).

     EC_GROUP_new_curve_GFp() will now automatically use this

crypto/asn1/a_enum.c

+2 −2
Original line number Diff line number Diff line
@@ -147,7 +147,7 @@ ASN1_ENUMERATED *BN_to_ASN1_ENUMERATED(BIGNUM *bn, ASN1_ENUMERATED *ai) 
		ASN1err(ASN1_F_BN_TO_ASN1_ENUMERATED,ERR_R_NESTED_ASN1_ERROR);

		goto err;

		}

	if(bn->neg) ret->type = V_ASN1_NEG_ENUMERATED;

	if(BN_get_sign(bn)) ret->type = V_ASN1_NEG_ENUMERATED;

	else ret->type=V_ASN1_ENUMERATED;

	j=BN_num_bits(bn);

	len=((j == 0)?0:((j/8)+1));
@@ -175,6 +175,6 @@ BIGNUM *ASN1_ENUMERATED_to_BN(ASN1_ENUMERATED *ai, BIGNUM *bn) 


	if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL)

		ASN1err(ASN1_F_ASN1_ENUMERATED_TO_BN,ASN1_R_BN_LIB);

	else if(ai->type == V_ASN1_NEG_ENUMERATED) ret->neg = 1;

	else if(ai->type == V_ASN1_NEG_ENUMERATED) BN_set_sign(ret,1);

	return(ret);

	}

crypto/asn1/a_int.c

+4 −2
Original line number Diff line number Diff line
@@ -393,7 +393,8 @@ ASN1_INTEGER *BN_to_ASN1_INTEGER(BIGNUM *bn, ASN1_INTEGER *ai) 
		ASN1err(ASN1_F_BN_TO_ASN1_INTEGER,ERR_R_NESTED_ASN1_ERROR);

		goto err;

		}

	if(bn->neg) ret->type = V_ASN1_NEG_INTEGER;

	if (BN_get_sign(bn))

		ret->type = V_ASN1_NEG_INTEGER;

	else ret->type=V_ASN1_INTEGER;

	j=BN_num_bits(bn);

	len=((j == 0)?0:((j/8)+1));
@@ -426,7 +427,8 @@ BIGNUM *ASN1_INTEGER_to_BN(ASN1_INTEGER *ai, BIGNUM *bn) 


	if ((ret=BN_bin2bn(ai->data,ai->length,bn)) == NULL)

		ASN1err(ASN1_F_ASN1_INTEGER_TO_BN,ASN1_R_BN_LIB);

	else if(ai->type == V_ASN1_NEG_INTEGER) ret->neg = 1;

	else if(ai->type == V_ASN1_NEG_INTEGER)

		BN_set_sign(ret, 1);

	return(ret);

	}

crypto/asn1/t_pkey.c

+1 −1
Original line number Diff line number Diff line
@@ -575,7 +575,7 @@ static int print(BIO *bp, const char *number, BIGNUM *num, unsigned char *buf, 
	const char *neg;



	if (num == NULL) return(1);

	neg=(num->neg)?"-":"";

	neg = (BN_get_sign(num))?"-":"";

	if (off)

		{

		if (off > 128) off=128;

crypto/bn/bn.h

+42 −20
Original line number Diff line number Diff line
@@ -320,6 +320,11 @@ typedef struct bn_recp_ctx_st 


#define BN_one(a)	(BN_set_word((a),1))

#define BN_zero(a)	(BN_set_word((a),0))

/* BN_set_sign(BIGNUM *, int) sets the sign of a BIGNUM

 * (0 for a non-negative value, 1 for negative) */

#define BN_set_sign(a,b) ((a)->neg = (b))

/* BN_get_sign(BIGNUM *) returns the sign of the BIGNUM */

#define BN_get_sign(a)   ((a)->neg)



/*#define BN_ascii2bn(a)	BN_hex2bn(a) */

/*#define BN_bn2ascii(a)	BN_bn2hex(a) */
@@ -470,35 +475,52 @@ int BN_div_recp(BIGNUM *dv, BIGNUM *rem, const BIGNUM *m, 


/* Functions for arithmetic over binary polynomials represented by BIGNUMs. 

 *

 * The BIGNUM::neg property of BIGNUMs representing binary polynomials is ignored.

 * The BIGNUM::neg property of BIGNUMs representing binary polynomials is

 * ignored.

 *

 * Note that input arguments are not const so that their bit arrays can

 * be expanded to the appropriate size if needed.

 */



int	BN_GF2m_add(BIGNUM *r, const BIGNUM *a, const BIGNUM *b); /*r = a + b*/

#define BN_GF2m_sub(r, a, b) BN_GF2m_add(r, a, b)

int	BN_GF2m_mod(BIGNUM *r, const BIGNUM *a, const BIGNUM *p); /*r=a mod p*/

int	BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx); /* r = (a * b) mod p */

int	BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx); /* r = (a * a) mod p */

int BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx); /* r = (1 / b) mod p */

int BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx); /* r = (a / b) mod p */

int BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const BIGNUM *p, BN_CTX *ctx); /* r = (a ^ b) mod p */

int BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx); /* r = sqrt(a) mod p */

int BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p, BN_CTX *ctx); /* r^2 + r = a mod p */

int	BN_GF2m_mod_mul(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const BIGNUM *p, BN_CTX *ctx); /* r = (a * b) mod p */

int	BN_GF2m_mod_sqr(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

	BN_CTX *ctx); /* r = (a * a) mod p */

int	BN_GF2m_mod_inv(BIGNUM *r, const BIGNUM *b, const BIGNUM *p,

	BN_CTX *ctx); /* r = (1 / b) mod p */

int	BN_GF2m_mod_div(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const BIGNUM *p, BN_CTX *ctx); /* r = (a / b) mod p */

int	BN_GF2m_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const BIGNUM *p, BN_CTX *ctx); /* r = (a ^ b) mod p */

int	BN_GF2m_mod_sqrt(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

	BN_CTX *ctx); /* r = sqrt(a) mod p */

int	BN_GF2m_mod_solve_quad(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,

	BN_CTX *ctx); /* r^2 + r = a mod p */

#define BN_GF2m_cmp(a, b) BN_ucmp((a), (b))

/* Some functions allow for representation of the irreducible polynomials

 * as an unsigned int[], say p.  The irreducible f(t) is then of the form:

 *     t^p[0] + t^p[1] + ... + t^p[k]

 * where m = p[0] > p[1] > ... > p[k] = 0.

 */

int	BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[]); /* r = a mod p */

int	BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const unsigned int p[], BN_CTX *ctx); /* r = (a * b) mod p */

int	BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[], BN_CTX *ctx); /* r = (a * a) mod p */

int BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const unsigned int p[], BN_CTX *ctx); /* r = (1 / b) mod p */

int BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const unsigned int p[], BN_CTX *ctx); /* r = (a / b) mod p */

int BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b, const unsigned int p[], BN_CTX *ctx); /* r = (a ^ b) mod p */

int BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[], BN_CTX *ctx); /* r = sqrt(a) mod p */

int BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[], BN_CTX *ctx); /* r^2 + r = a mod p */

int	BN_GF2m_mod_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[]);

	/* r = a mod p */

int	BN_GF2m_mod_mul_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const unsigned int p[], BN_CTX *ctx); /* r = (a * b) mod p */

int	BN_GF2m_mod_sqr_arr(BIGNUM *r, const BIGNUM *a, const unsigned int p[],

	BN_CTX *ctx); /* r = (a * a) mod p */

int	BN_GF2m_mod_inv_arr(BIGNUM *r, const BIGNUM *b, const unsigned int p[],

	BN_CTX *ctx); /* r = (1 / b) mod p */

int	BN_GF2m_mod_div_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const unsigned int p[], BN_CTX *ctx); /* r = (a / b) mod p */

int	BN_GF2m_mod_exp_arr(BIGNUM *r, const BIGNUM *a, const BIGNUM *b,

	const unsigned int p[], BN_CTX *ctx); /* r = (a ^ b) mod p */

int	BN_GF2m_mod_sqrt_arr(BIGNUM *r, const BIGNUM *a,

	const unsigned int p[], BN_CTX *ctx); /* r = sqrt(a) mod p */

int	BN_GF2m_mod_solve_quad_arr(BIGNUM *r, const BIGNUM *a,

	const unsigned int p[], BN_CTX *ctx); /* r^2 + r = a mod p */

int	BN_GF2m_poly2arr(const BIGNUM *a, unsigned int p[], int max);

int	BN_GF2m_arr2poly(const unsigned int p[], BIGNUM *a);