Source-Changes-HG archive

[Date Prev][Date Next][Thread Prev][Thread Next][Date Index][Thread Index][Old Index]

[src/netbsd-9]: src/crypto/external/bsd/openssl/dist/crypto/engine Pull up fo...



details:   https://anonhg.NetBSD.org/src/rev/e7e7fa6f2caa
branches:  netbsd-9
changeset: 964120:e7e7fa6f2caa
user:      martin <martin%NetBSD.org@localhost>
date:      Sun Sep 13 15:51:06 2020 +0000

description:
Pull up following revision(s) (requested by tsutsui in ticket #1084):

        crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c: revision 1.8

Restore a local change for PR/54740 lost during openssl 1.1.1e merge.
syslogd(8) complains "Could not open /dev/crypto: Device not configured"
again when pseudo-device crypto(4) is not configured in a kernel.

 http://cvsweb.netbsd.org/bsdweb.cgi/src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c#rev1.5
 http://cvsweb.netbsd.org/bsdweb.cgi/src/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c#rev1.7

Should be pullued up to netbsd-9.

diffstat:

 crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c |  2 +-
 1 files changed, 1 insertions(+), 1 deletions(-)

diffs (12 lines):

diff -r 5d22ba332416 -r e7e7fa6f2caa crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
--- a/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c    Sun Sep 13 12:26:36 2020 +0000
+++ b/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c    Sun Sep 13 15:51:06 2020 +0000
@@ -761,7 +761,7 @@
 
     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;



Home | Main Index | Thread Index | Old Index