Thu Dec 5 17:52:06 2019 UTC ()

PR/54740: Izumi Tsutsui: Disable cryptoengine unavailable message when
device is not configured (ENXIO).


(christos)

diff -r1.4 -r1.5 src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c

--- src/crypto/external/bsd/openssl/dist/crypto/engine/Attic/eng_devcrypto.c 2019/03/12 16:58:13	1.4
+++ src/crypto/external/bsd/openssl/dist/crypto/engine/Attic/eng_devcrypto.c 2019/12/05 17:52:06	1.5

 @@ -751,27 +751,27 @@ static int devcrypto_unload(ENGINE *e)
     return 1;
+}
 /*
  * This engine is always built into libcrypto, so it doesn't offer any
  * ability to be dynamically loadable.
  */
 void engine_load_devcrypto_int()
+{
     ENGINE *e = NULL;
     if ((cfd = open("/dev/crypto", O_RDWR, 0)) < 0) {
 #ifndef ENGINE_DEVCRYPTO_DEBUG
-        if (errno != ENOENT)
+        if (errno != ENOENT && errno != ENXIO)
 #endif
             fprintf(stderr, "Could not open /dev/crypto: %s\n", strerror(errno));
         return;
+    }
     if ((e = ENGINE_new()) == NULL
         || !ENGINE_set_destroy_function(e, devcrypto_unload)) {
         ENGINE_free(e);
         /*
          * We know that devcrypto_unload() won't be called when one of the
          * above two calls have failed, so we close cfd explicitly here to
          * avoid leaking resources.
          */