projects
/
oweals
/
openssl.git
/ commitdiff
commit
grep
author
committer
pickaxe
?
search:
re
summary
|
shortlog
|
log
|
commit
| commitdiff |
tree
raw
|
patch
| inline |
side by side
(parent:
dd5d744
)
RT3061: Don't SEGFAULT when trying to export a public DSA key as a private key.
author
Adam Langley
<agl@chromium.org>
Thu, 21 Feb 2013 22:11:55 +0000
(17:11 -0500)
committer
Emilia Kasper
<emilia@openssl.org>
Fri, 22 Aug 2014 13:25:30 +0000
(15:25 +0200)
Reviewed-by: Viktor Dukhovni <viktor@openssl.org>
Reviewed-by: Rich Salz <rsalz@openssl.org>
(cherry picked from commit
e19c93811f0db499c98d2888f1c0c0ab65e6238a
)
crypto/dsa/dsa_ameth.c
patch
|
blob
|
history
diff --git
a/crypto/dsa/dsa_ameth.c
b/crypto/dsa/dsa_ameth.c
index 6413aae46e26348331d4b7c724b46da32f87ef46..bf8718633f1a40e60b2c0c1f68a00ef7721b7094 100644
(file)
--- a/
crypto/dsa/dsa_ameth.c
+++ b/
crypto/dsa/dsa_ameth.c
@@
-307,6
+307,12
@@
static int dsa_priv_encode(PKCS8_PRIV_KEY_INFO *p8, const EVP_PKEY *pkey)
unsigned char *dp = NULL;
int dplen;
+ if (!pkey->pkey.dsa || !pkey->pkey.dsa->priv_key)
+ {
+ DSAerr(DSA_F_DSA_PRIV_ENCODE,DSA_R_MISSING_PARAMETERS);
+ goto err;
+ }
+
params = ASN1_STRING_new();
if (!params)
@@
-654,4
+660,3
@@
const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
old_dsa_priv_encode
}
};
-