diff options
| author | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
|---|---|---|
| committer | jkim <jkim@FreeBSD.org> | 2014-06-09 06:00:28 +0000 |
| commit | 309e057bcfb01861779d20e3ce027661dcae0910 (patch) | |
| tree | 806791a3db00c226152a7ed55c647916c51c974b /crypto/openssl/engines | |
| parent | 679c7dcca69d7c267e21eb3b50c5cfa2e1f53f35 (diff) | |
| download | FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.zip FreeBSD-src-309e057bcfb01861779d20e3ce027661dcae0910.tar.gz | |
MFC: r267256
Merge OpenSSL 1.0.1h.
Approved by: so (delphij)
Diffstat (limited to 'crypto/openssl/engines')
| -rw-r--r-- | crypto/openssl/engines/ccgost/gost_ameth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/openssl/engines/ccgost/gost_ameth.c b/crypto/openssl/engines/ccgost/gost_ameth.c index 2cde1fc..8b9230b 100644 --- a/crypto/openssl/engines/ccgost/gost_ameth.c +++ b/crypto/openssl/engines/ccgost/gost_ameth.c @@ -269,7 +269,7 @@ static int pkey_ctrl_gost(EVP_PKEY *pkey, int op, case ASN1_PKEY_CTRL_CMS_ENVELOPE: if (arg1 == 0) { - X509_ALGOR *alg; + X509_ALGOR *alg = NULL; ASN1_STRING * params = encode_gost_algor_params(pkey); if (!params) { |
