unbreak sshd with privsep: open /dev/crypto, keep fd, and call

CRIOGET per EVP_Init(); ok niklas@, miod@

2 files changed, 40 insertions, 10 deletions

diff --git a/src/lib/libcrypto/engine/hw_cryptodev.c b/src/lib/libcrypto/engine/hw_cryptodev.c
index 859af048ee..b8217cdea1 100644
--- a/src/lib/libcrypto/engine/hw_cryptodev.c
+++ b/src/lib/libcrypto/engine/hw_cryptodev.c
@@ -112,17 +112,32 @@ static struct {
  * Return a fd if /dev/crypto seems usable, 0 otherwise.
  */
 static int
+open_dev_crypto()
+{
+        static int fd = -1;
+
+        if (fd == -1) {
+                if (fd = open("/dev/crypto", O_RDWR, 0) == -1)
+                        return (-1);
+                /* close on exec */
+                if (fcntl(fd, F_SETFD, 1) == -1) {
+                        close(fd);
+                        fd = -1;
+                        return (-1);
+                }
+        }
+        return (fd);
+}
+
+static int
 get_dev_crypto()
 {
         int fd, retfd;
 
-        if ((fd = open("/dev/crypto", O_RDWR, 0)) == -1)
+        if ((fd = open_dev_crypto()) == -1)
                 return (-1);
-        if (ioctl(fd, CRIOGET, &retfd) == -1) {
-                close(fd);
+        if (ioctl(fd, CRIOGET, &retfd) == -1)
                 return (-1);
-        }
-        close(fd);
 
         /* close on exec */
         if (fcntl(retfd, F_SETFD, 1) == -1) {
diff --git a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c b/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
index 859af048ee..b8217cdea1 100644
--- a/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
+++ b/src/lib/libssl/src/crypto/engine/hw_cryptodev.c
@@ -112,17 +112,32 @@ static struct {
  * Return a fd if /dev/crypto seems usable, 0 otherwise.
  */
 static int
+open_dev_crypto()
+{
+        static int fd = -1;
+
+        if (fd == -1) {
+                if (fd = open("/dev/crypto", O_RDWR, 0) == -1)
+                        return (-1);
+                /* close on exec */
+                if (fcntl(fd, F_SETFD, 1) == -1) {
+                        close(fd);
+                        fd = -1;
+                        return (-1);
+                }
+        }
+        return (fd);
+}
+
+static int
 get_dev_crypto()
 {
         int fd, retfd;
 
-        if ((fd = open("/dev/crypto", O_RDWR, 0)) == -1)
+        if ((fd = open_dev_crypto()) == -1)
                 return (-1);
-        if (ioctl(fd, CRIOGET, &retfd) == -1) {
-                close(fd);
+        if (ioctl(fd, CRIOGET, &retfd) == -1)
                 return (-1);
-        }
-        close(fd);
 
         /* close on exec */
         if (fcntl(retfd, F_SETFD, 1) == -1) {