From ac777f046da7151386d667391362ecb553ceee90 Mon Sep 17 00:00:00 2001 From: Yashpal Dutta Date: Wed, 16 Apr 2014 22:53:04 +0545 Subject: [PATCH 12/26] RSA Keygen Fix Upstream-status: Pending If Kernel driver doesn't support RSA Keygen or same returns error handling the keygen operation, the keygen is gracefully handled by software supported rsa_keygen handler Signed-off-by: Yashpal Dutta Tested-by: Cristian Stoica --- crypto/engine/eng_cryptodev.c | 12 +++++++----- 1 file changed, 7 insertions(+), 5 deletions(-) diff --git a/crypto/engine/eng_cryptodev.c b/crypto/engine/eng_cryptodev.c index b2919a8..ed5f20f 100644 --- a/crypto/engine/eng_cryptodev.c +++ b/crypto/engine/eng_cryptodev.c @@ -1915,7 +1915,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) int i; if ((fd = get_asym_dev_crypto()) < 0) - return fd; + goto sw_try; if(!rsa->n && ((rsa->n=BN_new()) == NULL)) goto err; if(!rsa->d && ((rsa->d=BN_new()) == NULL)) goto err; @@ -1936,7 +1936,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) /* p length */ kop.crk_param[kop.crk_iparams].crp_p = calloc(p_len + 1, sizeof(char)); if (!kop.crk_param[kop.crk_iparams].crp_p) - goto err; + goto sw_try; kop.crk_param[kop.crk_iparams].crp_nbits = p_len * 8; memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, p_len + 1); kop.crk_iparams++; @@ -1944,7 +1944,7 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) /* q length */ kop.crk_param[kop.crk_iparams].crp_p = calloc(q_len + 1, sizeof(char)); if (!kop.crk_param[kop.crk_iparams].crp_p) - goto err; + goto sw_try; kop.crk_param[kop.crk_iparams].crp_nbits = q_len * 8; memset(kop.crk_param[kop.crk_iparams].crp_p, 0xff, q_len + 1); kop.crk_iparams++; @@ -2009,8 +2009,10 @@ static int cryptodev_rsa_keygen(RSA *rsa, int bits, BIGNUM *e, BN_GENCB *cb) } sw_try: { - const RSA_METHOD *meth = RSA_PKCS1_SSLeay(); - ret = (meth->rsa_keygen)(rsa, bits, e, cb); + const RSA_METHOD *meth = rsa->meth; + rsa->meth = RSA_PKCS1_SSLeay(); + ret = RSA_generate_key_ex(rsa, bits, e, cb); + rsa->meth = meth; } return ret; -- 2.3.5