QuasarApp/openssl
4
0
Fork 0
mirror of https://github.com/QuasarApp/openssl.git synced 2025-04-29 11:14:36 +00:00
Code Issues Projects Releases Wiki Activity

Deal with API changes.

Browse Source 
Reviewed-by: Rich Salz <rsalz@openssl.org>
This commit is contained in:
Ben Laurie 2016-06-24 13:34:51 +01:00
parent 0def528bc5
commit 24bf6f3c7f
4 changed files with 57 additions and 48 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

8
crypto/dsa/dsa_locl.h
View File

@ -44,11 +44,11 @@ struct dsa_method {
BIGNUM **rp); BIGNUM **rp);
int (*dsa_do_verify) (const unsigned char *dgst, int dgst_len, int (*dsa_do_verify) (const unsigned char *dgst, int dgst_len,
DSA_SIG *sig, DSA *dsa); DSA_SIG *sig, DSA *dsa);
int (*dsa_mod_exp) (DSA *dsa, BIGNUM *rr, BIGNUM *a1, BIGNUM *p1, int (*dsa_mod_exp) (DSA *dsa, BIGNUM *rr, const BIGNUM *a1,
BIGNUM *a2, BIGNUM *p2, BIGNUM *m, BN_CTX *ctx, const BIGNUM *p1, const BIGNUM *a2, const BIGNUM *p2,
BN_MONT_CTX *in_mont); const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *in_mont);
/* Can be null */ /* Can be null */
int (*bn_mod_exp) (DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p, int (*bn_mod_exp) (DSA *dsa, BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx); const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx);
int (*init) (DSA *dsa); int (*init) (DSA *dsa);
int (*finish) (DSA *dsa); int (*finish) (DSA *dsa);

13
crypto/dsa/dsa_meth.c
View File

@ -146,29 +146,30 @@ int DSA_meth_set_verify(DSA_METHOD *dsam,
} }
int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam)) int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))
(DSA *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
BN_CTX *, BN_MONT_CTX *) const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *)
{ {
return dsam->dsa_mod_exp; return dsam->dsa_mod_exp;
} }
int DSA_meth_set_mod_exp(DSA_METHOD *dsam, int DSA_meth_set_mod_exp(DSA_METHOD *dsam,
int (*mod_exp) (DSA *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, int (*mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
BIGNUM *, BN_CTX *, BN_MONT_CTX *)) const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
BN_MONT_CTX *))
{ {
dsam->dsa_mod_exp = mod_exp; dsam->dsa_mod_exp = mod_exp;
return 1; return 1;
} }
int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam)) int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))
(DSA *, BIGNUM *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *, (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
BN_MONT_CTX *) BN_MONT_CTX *)
{ {
return dsam->bn_mod_exp; return dsam->bn_mod_exp;
} }
int DSA_meth_set_bn_mod_exp(DSA_METHOD *dsam, int DSA_meth_set_bn_mod_exp(DSA_METHOD *dsam,
int (*bn_mod_exp) (DSA *, BIGNUM *, BIGNUM *, const BIGNUM *, int (*bn_mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
const BIGNUM *, BN_CTX *, BN_MONT_CTX *)) const BIGNUM *, BN_CTX *, BN_MONT_CTX *))
{ {
dsam->bn_mod_exp = bn_mod_exp; dsam->bn_mod_exp = bn_mod_exp;

69
crypto/engine/eng_cryptodev.c
View File

@ -133,13 +133,13 @@ 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); BN_CTX *ctx);
#ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_DSA
static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, static int cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, const BIGNUM *a,
const BIGNUM *p, const BIGNUM *m, const BIGNUM *p, const BIGNUM *m,
BN_CTX *ctx, BN_MONT_CTX *m_ctx); BN_CTX *ctx, BN_MONT_CTX *m_ctx);
static int cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g, static int cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, const BIGNUM *g,
BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, const BIGNUM *u1, const BIGNUM *pub_key,
BIGNUM *p, BN_CTX *ctx, const BIGNUM *u2, const BIGNUM *p,
BN_MONT_CTX *mont); BN_CTX *ctx, BN_MONT_CTX *mont);
static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen, static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen,
DSA *dsa); DSA *dsa);
static int cryptodev_dsa_verify(const unsigned char *dgst, int dgst_len, static int cryptodev_dsa_verify(const unsigned char *dgst, int dgst_len,
@ -1353,8 +1353,8 @@ cryptodev_rsa_nocrt_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa,
BN_CTX *ctx) BN_CTX *ctx)
{ {
int r; int r;
BIGNUM *n = NULL; const BIGNUM *n = NULL;
BIGNUM *d = NULL; const BIGNUM *d = NULL;
ctx = BN_CTX_new(); ctx = BN_CTX_new();
RSA_get0_key(rsa, &n, NULL, &d); RSA_get0_key(rsa, &n, NULL, &d);
@ -1368,12 +1368,12 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
{ {
struct crypt_kop kop; struct crypt_kop kop;
int ret = 1; int ret = 1;
BIGNUM *p = NULL; const BIGNUM *p = NULL;
BIGNUM *q = NULL; const BIGNUM *q = NULL;
BIGNUM *dmp1 = NULL; const BIGNUM *dmp1 = NULL;
BIGNUM *dmq1 = NULL; const BIGNUM *dmq1 = NULL;
BIGNUM *iqmp = NULL; const BIGNUM *iqmp = NULL;
BIGNUM *n = NULL; const BIGNUM *n = NULL;
RSA_get0_factors(rsa, &p, &q); RSA_get0_factors(rsa, &p, &q);
RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp); RSA_get0_crt_params(rsa, &dmp1, &dmq1, &iqmp);
@ -1420,21 +1420,23 @@ cryptodev_rsa_mod_exp(BIGNUM *r0, const BIGNUM *I, RSA *rsa, BN_CTX *ctx)
#ifndef OPENSSL_NO_DSA #ifndef OPENSSL_NO_DSA
static int static int
cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, BIGNUM *a, const BIGNUM *p, cryptodev_dsa_bn_mod_exp(DSA *dsa, BIGNUM *r, const BIGNUM *a, const BIGNUM *p,
const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx) const BIGNUM *m, BN_CTX *ctx, BN_MONT_CTX *m_ctx)
{ {
return (cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx)); return cryptodev_bn_mod_exp(r, a, p, m, ctx, m_ctx);
} }
static int static int
cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g, cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, const BIGNUM *g,
BIGNUM *u1, BIGNUM *pub_key, BIGNUM *u2, BIGNUM *p, const BIGNUM *u1, const BIGNUM *pub_key,
BN_CTX *ctx, BN_MONT_CTX *mont) const BIGNUM *u2, const BIGNUM *p, BN_CTX *ctx,
BN_MONT_CTX *mont)
{ {
BIGNUM *t2, *dsag, *dsap, *dsapub_key; const BIGNUM *dsag, *dsap, *dsapub_key;
BIGNUM *t2;
int ret = 0; int ret = 0;
const DSA_METHOD *meth; const DSA_METHOD *meth;
int (*bn_mod_exp)(DSA *, BIGNUM *, BIGNUM *, const BIGNUM *, const BIGNUM *, int (*bn_mod_exp)(DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
BN_CTX *, BN_MONT_CTX *); BN_CTX *, BN_MONT_CTX *);
t2 = BN_new(); t2 = BN_new();
@ -1461,12 +1463,10 @@ cryptodev_dsa_dsa_mod_exp(DSA *dsa, BIGNUM *t1, BIGNUM *g,
/* let t2 = y ^ u2 mod p */ /* let t2 = y ^ u2 mod p */
if (!bn_mod_exp(dsa, t2, dsapub_key, u2, dsap, ctx, mont)) if (!bn_mod_exp(dsa, t2, dsapub_key, u2, dsap, ctx, mont))
goto err; goto err;
/* let u1 = t1 * t2 mod p */ /* let t1 = t1 * t2 mod p */
if (!BN_mod_mul(u1, t1, t2, dsap, ctx)) if (!BN_mod_mul(t1, t1, t2, dsap, ctx))
goto err; goto err;
BN_copy(t1, u1);
ret = 1; ret = 1;
err: err:
BN_free(t2); BN_free(t2);
@ -1477,14 +1477,14 @@ static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen,
DSA *dsa) DSA *dsa)
{ {
struct crypt_kop kop; struct crypt_kop kop;
BIGNUM *r = NULL, *s = NULL, *dsap = NULL, *dsaq = NULL, *dsag = NULL; BIGNUM *r, *s;
BIGNUM *priv_key = NULL; const BIGNUM *dsap = NULL, *dsaq = NULL, *dsag = NULL;
const BIGNUM *priv_key = NULL;
DSA_SIG *dsasig, *dsaret = NULL; DSA_SIG *dsasig, *dsaret = NULL;
dsasig = DSA_SIG_new(); dsasig = DSA_SIG_new();
if (dsasig == NULL) if (dsasig == NULL)
goto err; goto err;
DSA_SIG_get0(&r, &s, dsasig);
memset(&kop, 0, sizeof(kop)); memset(&kop, 0, sizeof(kop));
kop.crk_op = CRK_DSA_SIGN; kop.crk_op = CRK_DSA_SIGN;
@ -1504,8 +1504,15 @@ static DSA_SIG *cryptodev_dsa_do_sign(const unsigned char *dgst, int dlen,
goto err; goto err;
kop.crk_iparams = 5; kop.crk_iparams = 5;
r = BN_new();
if (r == NULL)
goto err;
s = BN_new();
if (s == NULL)
goto err;
if (cryptodev_asym(&kop, BN_num_bytes(dsaq), r, if (cryptodev_asym(&kop, BN_num_bytes(dsaq), r,
BN_num_bytes(dsaq), s) == 0) { BN_num_bytes(dsaq), s) == 0) {
DSA_SIG_set0(dsasig, r, s);
dsaret = dsasig; dsaret = dsasig;
} else { } else {
dsaret = DSA_meth_get_sign(DSA_OpenSSL())(dgst, dlen, dsa); dsaret = DSA_meth_get_sign(DSA_OpenSSL())(dgst, dlen, dsa);
@ -1524,7 +1531,7 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
{ {
struct crypt_kop kop; struct crypt_kop kop;
int dsaret = 1; int dsaret = 1;
BIGNUM *pr, *ps, *p = NULL, *q = NULL, *g = NULL, *pub_key = NULL; const BIGNUM *pr, *ps, *p = NULL, *q = NULL, *g = NULL, *pub_key = NULL;
memset(&kop, 0, sizeof(kop)); memset(&kop, 0, sizeof(kop));
kop.crk_op = CRK_DSA_VERIFY; kop.crk_op = CRK_DSA_VERIFY;
@ -1542,7 +1549,7 @@ cryptodev_dsa_verify(const unsigned char *dgst, int dlen,
DSA_get0_key(dsa, &pub_key, NULL); DSA_get0_key(dsa, &pub_key, NULL);
if (bn2crparam(pub_key, &kop.crk_param[4])) if (bn2crparam(pub_key, &kop.crk_param[4]))
goto err; goto err;
DSA_SIG_get0(&pr, &ps, sig); DSA_SIG_get0(sig, &pr, &ps);
if (bn2crparam(pr, &kop.crk_param[5])) if (bn2crparam(pr, &kop.crk_param[5]))
goto err; goto err;
if (bn2crparam(ps, &kop.crk_param[6])) if (bn2crparam(ps, &kop.crk_param[6]))
@ -1580,8 +1587,8 @@ cryptodev_dh_compute_key(unsigned char *key, const BIGNUM *pub_key, DH *dh)
struct crypt_kop kop; struct crypt_kop kop;
int dhret = 1; int dhret = 1;
int fd, keylen; int fd, keylen;
BIGNUM *p = NULL; const BIGNUM *p = NULL;
BIGNUM *priv_key = NULL; const BIGNUM *priv_key = NULL;
if ((fd = get_asym_dev_crypto()) < 0) { if ((fd = get_asym_dev_crypto()) < 0) {
const DH_METHOD *meth = DH_OpenSSL(); const DH_METHOD *meth = DH_OpenSSL();

15
include/openssl/dsa.h
View File

@ -202,16 +202,17 @@ int (*DSA_meth_get_verify(const DSA_METHOD *dsam))
int DSA_meth_set_verify(DSA_METHOD *dsam, int DSA_meth_set_verify(DSA_METHOD *dsam,
int (*verify) (const unsigned char *, int, DSA_SIG *, DSA *)); int (*verify) (const unsigned char *, int, DSA_SIG *, DSA *));
int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam)) int (*DSA_meth_get_mod_exp(const DSA_METHOD *dsam))
(DSA *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
BN_CTX *, BN_MONT_CTX *); const BIGNUM *, const BIGNUM *, BN_CTX *, BN_MONT_CTX *);
int DSA_meth_set_mod_exp(DSA_METHOD *dsam, int DSA_meth_set_mod_exp(DSA_METHOD *dsam,
int (*mod_exp) (DSA *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, BIGNUM *, int (*mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
BIGNUM *, BN_CTX *, BN_MONT_CTX *)); const BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *,
BN_MONT_CTX *));
int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam)) int (*DSA_meth_get_bn_mod_exp(const DSA_METHOD *dsam))
(DSA *, BIGNUM *, BIGNUM *, const BIGNUM *, const BIGNUM *, BN_CTX *, (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *, const BIGNUM *,
BN_MONT_CTX *); BN_CTX *, BN_MONT_CTX *);
int DSA_meth_set_bn_mod_exp(DSA_METHOD *dsam, int DSA_meth_set_bn_mod_exp(DSA_METHOD *dsam,
int (*bn_mod_exp) (DSA *, BIGNUM *, BIGNUM *, const BIGNUM *, int (*bn_mod_exp) (DSA *, BIGNUM *, const BIGNUM *, const BIGNUM *,
const BIGNUM *, BN_CTX *, BN_MONT_CTX *)); const BIGNUM *, BN_CTX *, BN_MONT_CTX *));
int (*DSA_meth_get_init(const DSA_METHOD *dsam))(DSA *); int (*DSA_meth_get_init(const DSA_METHOD *dsam))(DSA *);
int DSA_meth_set_init(DSA_METHOD *dsam, int (*init)(DSA *)); int DSA_meth_set_init(DSA_METHOD *dsam, int (*init)(DSA *));