summaryrefslogtreecommitdiffstats
path: root/engines
diff options
context:
space:
mode:
authorDr. Stephen Henson <steve@openssl.org>2009-07-01 11:29:25 +0000
committerDr. Stephen Henson <steve@openssl.org>2009-07-01 11:29:25 +0000
commit9458530d450e80637c17d5a984ded8f0e4e0fa33 (patch)
treebbe0eee20b7620a440b829e383c6310970be1fad /engines
parent9de014a7f81dde6cd98a99b1277446a1df4f5842 (diff)
Update from 1.0.0-stable
Diffstat (limited to 'engines')
-rw-r--r--engines/ccgost/gost_crypt.c8
1 files changed, 8 insertions, 0 deletions
diff --git a/engines/ccgost/gost_crypt.c b/engines/ccgost/gost_crypt.c
index 954d150e51..39bb696446 100644
--- a/engines/ccgost/gost_crypt.c
+++ b/engines/ccgost/gost_crypt.c
@@ -390,6 +390,14 @@ int gost_cipher_ctl(EVP_CIPHER_CTX *ctx,int type,int arg,void *ptr)
}
break;
}
+ case EVP_CTRL_PBE_PRF_NID:
+ if (ptr) {
+ *((int *)ptr)= NID_id_HMACGostR3411_94;
+ return 1;
+ } else {
+ return 0;
+ }
+
default:
GOSTerr(GOST_F_GOST_CIPHER_CTL,GOST_R_UNSUPPORTED_CIPHER_CTL_COMMAND);
return -1;