wbrawner/openssl
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

PR: 2178

Browse source 
Submitted by: "Kennedy, Brendan" <brendan.kennedy@intel.com>

Handle error codes correctly: cryptodev returns 0 for success whereas OpenSSL
returns 1.
This commit is contained in:
Dr. Stephen Henson 2010-03-01 23:54:34 +00:00
parent 2e630b1847
commit 33bec62a20
1 changed files with 20 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

23
crypto/engine/eng_cryptodev.c
View file

@ -1017,10 +1017,18 @@ cryptodev_bn_mod_exp(BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
goto err; goto err;
kop.crk_iparams = 3; kop.crk_iparams = 3;
if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL) == -1) { if (cryptodev_asym(&kop, BN_num_bytes(m), r, 0, NULL)) {
printf("OCF asym process failed, Running in software\n");
const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
} else if (ECANCELED == kop.crk_status) {
printf("OCF hardware operation cancelled. Running in Software\n");
const RSA_METHOD *meth = RSA_PKCS1_SSLeay(); const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont); ret = meth->bn_mod_exp(r, a, p, m, ctx, in_mont);
} }
/* else cryptodev operation worked ok ==> ret = 1*/
err: err:
zapparams(&kop); zapparams(&kop);
return (ret); return (ret);
@ -1064,10 +1072,18 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
goto err; goto err;
kop.crk_iparams = 6; kop.crk_iparams = 6;
if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL) == -1) { if (cryptodev_asym(&kop, BN_num_bytes(rsa->n), r0, 0, NULL)) {
printf("OCF asym process failed, running in Software\n");
const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
} else if (ECANCELED == kop.crk_status) {
printf("OCF hardware operation cancelled. Running in Software\n");
const RSA_METHOD *meth = RSA_PKCS1_SSLeay(); const RSA_METHOD *meth = RSA_PKCS1_SSLeay();
ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx); ret = (*meth->rsa_mod_exp)(r0, I, rsa, ctx);
} }
/* else cryptodev operation worked ok ==> ret = 1*/
err: err:
zapparams(&kop); zapparams(&kop);
return (ret); return (ret);
@ -1203,7 +1219,8 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
kop.crk_iparams = 7; kop.crk_iparams = 7;
if (cryptodev_asym(&kop, 0, NULL, 0, NULL) == 0) { if (cryptodev_asym(&kop, 0, NULL, 0, NULL) == 0) {
dsaret = kop.crk_status; /*OCF success value is 0, if not zero, change dsaret to fail*/
if(0 != kop.crk_status) dsaret = 0;
} else { } else {
const DSA_METHOD *meth = DSA_OpenSSL(); const DSA_METHOD *meth = DSA_OpenSSL();