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

[Matt Caswell]

The branch OpenSSL_1_0_2-stable has been updated
       via  bb9ca2af564e86a89bfc3c01ddae7ceafe5ed3b7 (commit)
       via  87402d4ce31321a4d0345e566adc6b6e4f77645f (commit)
      from  a3d684ffca282796511cb8f3593a59a80109eed8 (commit)


- Log -----------------------------------------------------------------
commit bb9ca2af564e86a89bfc3c01ddae7ceafe5ed3b7
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date:   Fri Aug 12 18:01:04 2016 +0300

    fix several typos in README.gost
    
    CLA: trivial
    
    Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1449)

commit 87402d4ce31321a4d0345e566adc6b6e4f77645f
Author: Cristian Stoica <cristian.stoica at nxp.com>
Date:   Fri Aug 12 17:53:25 2016 +0300

    merge two mutual exclusive #ifdefs to improve clarity
    
    CLA: trivial
    
    Signed-off-by: Cristian Stoica <cristian.stoica at nxp.com>
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Matt Caswell <matt at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/1449)

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

Summary of changes:
 engines/ccgost/README.gost | 19 +++++++++----------
 engines/ccgost/gost_eng.c  |  7 +++----
 2 files changed, 12 insertions(+), 14 deletions(-)

diff --git a/engines/ccgost/README.gost b/engines/ccgost/README.gost
index c96cccc..80f7900 100644
--- a/engines/ccgost/README.gost
+++ b/engines/ccgost/README.gost
@@ -193,7 +193,7 @@ Russian clients and RSA/DSA ciphersuites for foreign clients.
 
  openssl dgst -mac gost-mac -macopt key:<32 bytes of key> datafile
 
- Note absense of an option that specifies digest algorithm. gost-mac
+ Note absence of an option that specifies digest algorithm. gost-mac
  algorithm supports only one digest (which is actually part of
  implementation of this mac) and OpenSSL is clever enough to find out
  this.
@@ -216,8 +216,8 @@ openssl pksc12 -export -inkey gost.pem -in gost_cert.pem -keypbe gost89\
 7. Testing speed of symmetric ciphers.
    
 To test performance of GOST symmetric ciphers you should use -evp switch
-of the openssl speed command. Engine-provided ciphers couldn't be
-accessed by cipher-specific functions, only via generic evp interface
+of the openssl speed command. Engine-provided ciphers can be accessed only via
+generic evp interface and not by cipher-specific functions.
 
  openssl speed -evp gost89
  openssl speed -evp gost89-cnt
@@ -225,7 +225,7 @@ accessed by cipher-specific functions, only via generic evp interface
 
 PROGRAMMING INTERFACES DETAILS
 
-Applications never should access engine directly. They only use provided
+Applications should never access engine directly. They should only use provided
 EVP_PKEY API. But there are some details, which should be taken into
 account.
 
@@ -281,12 +281,11 @@ If UKM is not set by this control command, encrypt operation would
 generate random UKM.
 
 
-This sources include implementation of GOST 28147-89 and GOST R 34.11-94
-which are completely indepentent from OpenSSL and can be used separately
-(files gost89.c, gost89.h, gosthash.c, gosthash.h) Utility gostsum (file
-gostsum.c) is provided as example of such separate usage. This is
-program, simular to md5sum and sha1sum utilities, but calculates GOST R
-34.11-94 hash.
+These sources include implementation of GOST 28147-89 and GOST R 34.11-94
+which are completely independent from OpenSSL and can be used separately
+(files gost89.c, gost89.h, gosthash.c, gosthash.h). Utility gostsum (file
+gostsum.c) is provided as an example of such separate usage. This program is
+similar to md5sum and sha1sum utilities, but calculates GOST R 34.11-94 hash.
 
 Makefile doesn't include rule for compiling gostsum.
 Use command
diff --git a/engines/ccgost/gost_eng.c b/engines/ccgost/gost_eng.c
index 5924791..ea52c4d 100644
--- a/engines/ccgost/gost_eng.c
+++ b/engines/ccgost/gost_eng.c
@@ -157,10 +157,6 @@ static int bind_gost(ENGINE *e, const char *id)
     return ret;
 }
 
-#ifndef OPENSSL_NO_DYNAMIC_ENGINE
-IMPLEMENT_DYNAMIC_BIND_FN(bind_gost)
-    IMPLEMENT_DYNAMIC_CHECK_FN()
-#endif                          /* ndef OPENSSL_NO_DYNAMIC_ENGINE */
 static int gost_digests(ENGINE *e, const EVP_MD **digest,
                         const int **nids, int nid)
 {
@@ -278,4 +274,7 @@ void ENGINE_load_gost(void)
     ENGINE_free(toadd);
     ERR_clear_error();
 }
+#else
+IMPLEMENT_DYNAMIC_BIND_FN(bind_gost)
+IMPLEMENT_DYNAMIC_CHECK_FN()
 #endif