[openssl-commits] [openssl] OpenSSL_1_0_2-stable update

[Richard Levitte]

The branch OpenSSL_1_0_2-stable has been updated
       via  681da86ebb46ef9ef769d0ea4ea61987ca4e96bc (commit)
      from  872f91c4036e35d292d423e751741ba76f8c5594 (commit)


- Log -----------------------------------------------------------------
commit 681da86ebb46ef9ef769d0ea4ea61987ca4e96bc
Author: Richard Levitte <levitte at openssl.org>
Date:   Thu Feb 12 13:16:20 2015 +0100

    Transfer a fix from 1.0.1
    
    manually picked from e7b85bc40200961984925604ca444517359a6067
    Reviewed-by: Stephen Henson <steve at openssl.org>
    
    (cherry picked from commit 774ccae63c3a41a3f0762cbc818271d3ef9f369f)

-----------------------------------------------------------------------

Summary of changes:
 engines/ccgost/gost_eng.c |    4 ++++
 1 file changed, 4 insertions(+)

diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c
index 971a1ed..5924791 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");