summaryrefslogtreecommitdiff
path: root/ics-openvpn-stripped/main/openssl/crypto/dsa
diff options
context:
space:
mode:
authorParménides GV <parmegv@sdf.org>2014-12-12 11:49:24 +0100
committerParménides GV <parmegv@sdf.org>2014-12-12 11:49:24 +0100
commit0e7e4005460964cf8dac080e3d99e1df2a1bdc4d (patch)
tree63fdba4f03bf47b0faa62b9d24cdff9a5a79a8b7 /ics-openvpn-stripped/main/openssl/crypto/dsa
parent61dc26ab57ad4e2dba341998cabec3f411865e46 (diff)
Updated ics-openvpn to rev924.
Diffstat (limited to 'ics-openvpn-stripped/main/openssl/crypto/dsa')
-rw-r--r--ics-openvpn-stripped/main/openssl/crypto/dsa/dsa_ameth.c7
1 files changed, 6 insertions, 1 deletions
diff --git a/ics-openvpn-stripped/main/openssl/crypto/dsa/dsa_ameth.c b/ics-openvpn-stripped/main/openssl/crypto/dsa/dsa_ameth.c
index 376156ec..5af76ead 100644
--- a/ics-openvpn-stripped/main/openssl/crypto/dsa/dsa_ameth.c
+++ b/ics-openvpn-stripped/main/openssl/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)
@@ -701,4 +707,3 @@ const EVP_PKEY_ASN1_METHOD dsa_asn1_meths[] =
old_dsa_priv_encode
}
};
-