summaryrefslogtreecommitdiffstats
path: root/engines
diff options
context:
space:
mode:
authorRichard Levitte <levitte@openssl.org>2015-02-12 13:16:20 +0100
committerRichard Levitte <levitte@openssl.org>2015-02-13 13:39:05 +0100
commit774ccae63c3a41a3f0762cbc818271d3ef9f369f (patch)
treeba889c7df6983993ac6b1d7c09d7adc8467c5148 /engines
parentc81f425eaa09dcf3f1f55a008c0486d7b742f20d (diff)
Transfer a fix from 1.0.1
manually picked from e7b85bc40200961984925604ca444517359a6067 Reviewed-by: Stephen Henson <steve@openssl.org>
Diffstat (limited to 'engines')
-rw-r--r--engines/ccgost/gost_eng.c4
1 files changed, 4 insertions, 0 deletions
diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c
index 971a1ed319..5924791b77 100644
--- a/engines/ccgost/gost_eng.c
+++ b/engines/ccgost/gost_eng.c
@@ -76,6 +76,10 @@ static int bind_gost(ENGINE *e, const char *id)
int ret = 0;
if (id && strcmp(id, engine_gost_id))
return 0;
+ if (ameth_GostR3410_94) {
+ printf("GOST engine already loaded\n");
+ goto end;
+ }
if (!ENGINE_set_id(e, engine_gost_id)) {
printf("ENGINE_set_id failed\n");