[openssl-commits] [openssl] master update

[Richard Levitte]

The branch master has been updated
       via  b35bb37a3d6ecf11b43ef8717600ab61718c3cc2 (commit)
      from  603ebe03529101424670051aa0c616dc6e037b28 (commit)


- Log -----------------------------------------------------------------
commit b35bb37a3d6ecf11b43ef8717600ab61718c3cc2
Author: MerQGh <34228890+MerQGh at users.noreply.github.com>
Date:   Mon Dec 4 09:20:51 2017 +0300

    Update eng_fat.c
    
    This line will allow use private keys, which created by Crypto Pro, to
    sign with OpenSSL.
    
    CLA: trivial
    
    Reviewed-by: Rich Salz <rsalz at openssl.org>
    Reviewed-by: Tim Hudson <tjh at openssl.org>
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    (Merged from https://github.com/openssl/openssl/pull/4836)

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

Summary of changes:
 crypto/engine/eng_fat.c | 1 +
 1 file changed, 1 insertion(+)

diff --git a/crypto/engine/eng_fat.c b/crypto/engine/eng_fat.c
index 0ca4132..591fddc 100644
--- a/crypto/engine/eng_fat.c
+++ b/crypto/engine/eng_fat.c
@@ -108,6 +108,7 @@ int ENGINE_register_complete(ENGINE *e)
 #endif
     ENGINE_register_RAND(e);
     ENGINE_register_pkey_meths(e);
+    ENGINE_register_pkey_asn1_meths(e);
     return 1;
 }