summaryrefslogtreecommitdiff
path: root/crypto
diff options
context:
space:
mode:
authormartin <martin@NetBSD.org>2020-09-13 15:51:06 +0000
committermartin <martin@NetBSD.org>2020-09-13 15:51:06 +0000
commitcae86922c6b4820fa5aab8093a515cfd3c06a5a5 (patch)
tree33453116dd6c264796d98c69d19b0bb7b0b8d76c /crypto
parentb6508f8a675fabe6f369908e7cf2b196ade669dc (diff)
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 (limited to 'crypto')
-rw-r--r--crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c2
1 files changed, 1 insertions, 1 deletions
diff --git a/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c b/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
index 49e9ce1af33..ba490fd2a0a 100644
--- a/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
+++ b/crypto/external/bsd/openssl/dist/crypto/engine/eng_devcrypto.c
@@ -761,7 +761,7 @@ void engine_load_devcrypto_int()
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;