diff options
| author | marha <marha@users.sourceforge.net> | 2012-01-27 20:31:28 +0100 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2012-01-27 20:31:28 +0100 |
| commit | c6a1477b0092762299491d79b3a8cb094c6456da (patch) | |
| tree | 8458d152a6d4cecd8b2d88f3e7e6950128a53fb7 /openssl/engines/ccgost/gost94_keyx.c | |
| parent | eb4c088eb71f93b9639f4ff651523d794f1433f7 (diff) | |
| download | vcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.tar.gz vcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.tar.bz2 vcxsrv-c6a1477b0092762299491d79b3a8cb094c6456da.zip | |
update to openssl 1.0.0g
Diffstat (limited to 'openssl/engines/ccgost/gost94_keyx.c')
| -rw-r--r-- | openssl/engines/ccgost/gost94_keyx.c | 4 |
1 files changed, 4 insertions, 0 deletions
diff --git a/openssl/engines/ccgost/gost94_keyx.c b/openssl/engines/ccgost/gost94_keyx.c index 624be586a..0d7d3ffe6 100644 --- a/openssl/engines/ccgost/gost94_keyx.c +++ b/openssl/engines/ccgost/gost94_keyx.c @@ -261,6 +261,10 @@ int pkey_GOST94cp_decrypt(EVP_PKEY_CTX *ctx, unsigned char *key, size_t *key_len } param = get_encryption_params(gkt->key_agreement_info->cipher); + if(!param){ + goto err; + } + gost_init(&cctx,param->sblock); OPENSSL_assert(gkt->key_agreement_info->eph_iv->length==8); memcpy(wrappedKey,gkt->key_agreement_info->eph_iv->data,8); |