From: Richard Levitte <levitte@openssl.org>
Date: Thu, 12 Feb 2015 12:16:20 +0000 (+0100)
Subject: Transfer a fix from 1.0.1
X-Git-Tag: OpenSSL_1_0_2a~79
X-Git-Url: https://git.librecmc.org/?a=commitdiff_plain;h=681da86ebb46ef9ef769d0ea4ea61987ca4e96bc;p=oweals%2Fopenssl.git

Transfer a fix from 1.0.1

manually picked from e7b85bc40200961984925604ca444517359a6067
Reviewed-by: Stephen Henson <steve@openssl.org>

(cherry picked from commit 774ccae63c3a41a3f0762cbc818271d3ef9f369f)
---

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");