Import OpenSSL 1.1.0h
This commit is contained in:
@@ -82,6 +82,7 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
|
||||
int penclen;
|
||||
ASN1_STRING *str = NULL;
|
||||
ASN1_INTEGER *pubint = NULL;
|
||||
ASN1_OBJECT *aobj;
|
||||
|
||||
dsa = pkey->pkey.dsa;
|
||||
if (pkey->save_parameters && dsa->p && dsa->q && dsa->g) {
|
||||
@@ -114,8 +115,11 @@ static int dsa_pub_encode(X509_PUBKEY *pk, const EVP_PKEY *pkey)
|
||||
goto err;
|
||||
}
|
||||
|
||||
if (X509_PUBKEY_set0_param(pk, OBJ_nid2obj(EVP_PKEY_DSA),
|
||||
ptype, str, penc, penclen))
|
||||
aobj = OBJ_nid2obj(EVP_PKEY_DSA);
|
||||
if (aobj == NULL)
|
||||
goto err;
|
||||
|
||||
if (X509_PUBKEY_set0_param(pk, aobj, ptype, str, penc, penclen))
|
||||
return 1;
|
||||
|
||||
err:
|
||||
@@ -175,6 +179,7 @@ static int dsa_priv_decode(EVP_PKEY *pkey, const PKCS8_PRIV_KEY_INFO *p8)
|
||||
goto dsaerr;
|
||||
}
|
||||
|
||||
BN_set_flags(dsa->priv_key, BN_FLG_CONSTTIME);
|
||||
if (!BN_mod_exp(dsa->pub_key, dsa->g, dsa->priv_key, dsa->p, ctx)) {
|
||||
DSAerr(DSA_F_DSA_PRIV_DECODE, DSA_R_BN_ERROR);
|
||||
goto dsaerr;
|
||||
|
||||
Reference in New Issue
Block a user