[openssl] master update

[beldmit at gmail.com]

The branch master has been updated
       via  bed963d58d837c5cbf0707bffe250cafffc64690 (commit)
      from  b0aae913246af1d07e728d24f53f55028f61c696 (commit)


- Log -----------------------------------------------------------------
commit bed963d58d837c5cbf0707bffe250cafffc64690
Author: UndefBehavior <demansong at gmail.com>
Date:   Fri Feb 26 13:36:08 2021 +0300

    Fix build of /dev/crypto engine with no-dynamic-engine option
    
    CLA: trivial
    
    Reviewed-by: Tomas Mraz <tomas at openssl.org>
    Reviewed-by: Paul Dale <pauli at openssl.org>
    Reviewed-by: Dmitry Belyavskiy <beldmit at gmail.com>
    (Merged from https://github.com/openssl/openssl/pull/14329)

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

Summary of changes:
 engines/e_devcrypto.c | 1 -
 1 file changed, 1 deletion(-)

diff --git a/engines/e_devcrypto.c b/engines/e_devcrypto.c
index e1c4372f72..76255a978d 100644
--- a/engines/e_devcrypto.c
+++ b/engines/e_devcrypto.c
@@ -1361,7 +1361,6 @@ void engine_load_devcrypto_int(void)
      */
     ERR_pop_to_mark();
 }
-}
 
 #else