[openssl-commits] [openssl] master update

[matthias.st.pierre at ncp-e.com]

The branch master has been updated
       via  c79a022da973140c141eeebff9170ca5702be0f9 (commit)
      from  da84249be6492ccfc5ecad32ac367fd06e9bdbef (commit)


- Log -----------------------------------------------------------------
commit c79a022da973140c141eeebff9170ca5702be0f9
Author: Jung-uk Kim <jkim at FreeBSD.org>
Date:   Thu Dec 13 18:18:16 2018 -0500

    Do not complain when /dev/crypto does not exist.
    
    FreeBSD does not enable cryptodev(4) by default.  OpenBSD disabled support
    for /dev/crypto by default from 4.9 and removed it from 5.7.  Now the engine
    is properly enabled by default on BSD platforms (see #7885), it continuously
    complains:
    
    Could not open /dev/crypto: No such file or directory
    
    Hide the nagging error message behind ENGINE_DEVCRYPTO_DEBUG.
    
    CLA: trivial
    
    Reviewed-by: Richard Levitte <levitte at openssl.org>
    Reviewed-by: Paul Dale <paul.dale at oracle.com>
    Reviewed-by: Matthias St. Pierre <Matthias.St.Pierre at ncp-e.com>
    (Merged from https://github.com/openssl/openssl/pull/7896)

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

Summary of changes:
 crypto/engine/eng_devcrypto.c | 7 ++++++-
 1 file changed, 6 insertions(+), 1 deletion(-)

diff --git a/crypto/engine/eng_devcrypto.c b/crypto/engine/eng_devcrypto.c
index bfdb8fc..ec6337d 100644
--- a/crypto/engine/eng_devcrypto.c
+++ b/crypto/engine/eng_devcrypto.c
@@ -25,6 +25,8 @@
 
 #include "internal/engine.h"
 
+/* #define ENGINE_DEVCRYPTO_DEBUG */
+
 #ifdef CRYPTO_ALGORITHM_MIN
 # define CHECK_BSD_STYLE_MACROS
 #endif
@@ -1156,7 +1158,10 @@ void engine_load_devcrypto_int()
     ENGINE *e = NULL;
 
     if ((cfd = open("/dev/crypto", O_RDWR, 0)) < 0) {
-        fprintf(stderr, "Could not open /dev/crypto: %s\n", strerror(errno));
+#ifndef ENGINE_DEVCRYPTO_DEBUG
+        if (errno != ENOENT)
+#endif
+            fprintf(stderr, "Could not open /dev/crypto: %s\n", strerror(errno));
         return;
     }