diff options
| author | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
|---|---|---|
| committer | marha <marha@users.sourceforge.net> | 2010-06-17 08:30:55 +0000 |
| commit | eb8e32daea99b6e3ebf134efeeba184c23817f08 (patch) | |
| tree | ffbda57952ba3f40612e6409bd9a95f9a0a892dc /openssl/engines/ccgost/gost_ameth.c | |
| parent | ed16af1abc515d7cc3ff9c5794aef89551fe7494 (diff) | |
| parent | fef0b61e18b9c7475e4d6e67ddfc55db46573f4e (diff) | |
| download | vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.gz vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.tar.bz2 vcxsrv-eb8e32daea99b6e3ebf134efeeba184c23817f08.zip | |
svn merge ^/branches/released .
Diffstat (limited to 'openssl/engines/ccgost/gost_ameth.c')
| -rw-r--r-- | openssl/engines/ccgost/gost_ameth.c | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/openssl/engines/ccgost/gost_ameth.c b/openssl/engines/ccgost/gost_ameth.c index 16a99ac2b..f620a216c 100644 --- a/openssl/engines/ccgost/gost_ameth.c +++ b/openssl/engines/ccgost/gost_ameth.c @@ -801,7 +801,7 @@ static int mac_ctrl_gost(EVP_PKEY *pkey, int op, long arg1, void *arg2) switch (op) { case ASN1_PKEY_CTRL_DEFAULT_MD_NID: - *(int *)arg2 = NID_undef; + *(int *)arg2 = NID_id_Gost28147_89_MAC; return 2; } return -2; |