diff options
| author | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2011-09-30 08:46:36 +0200 |
| commit | 73d82f7ac0d1add2697128c2e26c2432ffe172a5 (patch) | |
| tree | c6436b57a2191c57320396c37449109ebad745ec /openssl/engines/ccgost/gost_crypt.c | |
| parent | 4a9e1f51655e03da1507dabce7c4c3960e7ca607 (diff) | |
| parent | 60adbfdea1ee754341d64454274e7aa83bae8971 (diff) | |
| download | vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.gz vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.tar.bz2 vcxsrv-73d82f7ac0d1add2697128c2e26c2432ffe172a5.zip | |
Merge remote-tracking branch 'origin/released'
Conflicts:
openssl/Makefile
Diffstat (limited to 'openssl/engines/ccgost/gost_crypt.c')
| -rw-r--r-- | openssl/engines/ccgost/gost_crypt.c | 3 |
1 files changed, 2 insertions, 1 deletions
diff --git a/openssl/engines/ccgost/gost_crypt.c b/openssl/engines/ccgost/gost_crypt.c index 4977d1dcf..cde58c0e9 100644 --- a/openssl/engines/ccgost/gost_crypt.c +++ b/openssl/engines/ccgost/gost_crypt.c @@ -495,7 +495,8 @@ int gost89_get_asn1_parameters(EVP_CIPHER_CTX *ctx,ASN1_TYPE *params) int gost_imit_init_cpa(EVP_MD_CTX *ctx) { struct ossl_gost_imit_ctx *c = ctx->md_data; - memset(c->buffer,0,16); + memset(c->buffer,0,sizeof(c->buffer)); + memset(c->partial_block,0,sizeof(c->partial_block)); c->count = 0; c->bytes_left=0; c->key_meshing=1; |