Commit ea77fc33 authored by Geoff Thorpe's avatar Geoff Thorpe
Browse files

... and this should likewise fix up those RSA implementations that weren't 

already built and tested.
parent 46ef873f

crypto/engine/eng_cryptodev.c

+3 −3
Original line number Diff line number Diff line
@@ -100,7 +100,7 @@ static int cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, 
    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);

static int cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I,

    RSA *rsa);

static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa);

static int cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);

static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a,

    const BIGNUM *p, const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);

static int cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
@@ -767,7 +767,7 @@ cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) 
}



static int

cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa)

cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)

{

	struct crypt_kop kop;

	int ret = 1;
@@ -796,7 +796,7 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa) 


	if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL) == -1) {

		const RSA_METHOD *meth = RSA_PKCS1_SSLeay();

		ret = (*meth->rsa_mod_exp)(r0, I, rsa);

		ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);

	}

err:

	zapparams(&kop);

engines/e_gmp.c

+2 −2
Original line number Diff line number Diff line
@@ -101,7 +101,7 @@ static int e_gmp_ctrl(ENGINE *e, int cmd, long i, void *p, void (*f)(void)); 


#ifndef OPENSSL_NO_RSA

/* RSA stuff */

static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa);

static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx);

static int e_gmp_rsa_finish(RSA *r);

#endif
@@ -361,7 +361,7 @@ static int e_gmp_rsa_finish(RSA *rsa) 
	return 1;

	}



static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa)

static int e_gmp_rsa_mod_exp(BIGNUM *r, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)

	{

	E_GMP_RSA_CTX *hptr;

	int to_return = 0;