Update to 3.11.0, which supports OpenSSL 1.0.x and 1.1.x.

1 files changed, 30 insertions, 30 deletions

diff --git a/security/opencryptoki/files/patch-usr-sbin-pkcsslotd-socket_server.c b/security/opencryptoki/files/patch-usr-sbin-pkcsslotd-socket_server.c
index 5b8ae7d9b4f7..85029168445c 100644
--- a/security/opencryptoki/files/patch-usr-sbin-pkcsslotd-socket_server.c
+++ b/security/opencryptoki/files/patch-usr-sbin-pkcsslotd-socket_server.c
@@ -1,6 +1,6 @@
---- usr/sbin/pkcsslotd/socket_server.c.orig	2016-04-30 02:26:46.000000000 +0900
-+++ usr/sbin/pkcsslotd/socket_server.c	2016-06-12 07:33:22.000000000 +0900
-@@ -300,6 +300,9 @@
+--- usr/sbin/pkcsslotd/socket_server.c.orig	2018-11-16 14:53:03 UTC
++++ usr/sbin/pkcsslotd/socket_server.c
+@@ -19,6 +19,9 @@
  #include <sys/select.h>
  #include <sys/stat.h>
  #include <grp.h>
@@ -10,36 +10,36 @@
  
  #include "log.h"
  #include "slotmgr.h"
-@@ -314,11 +317,23 @@
- 	struct group *grp;
- 	int socketfd;
+@@ -34,11 +37,23 @@ int CreateListenerSocket(void)
+     struct group *grp;
+     int socketfd;
  
 +#ifdef SOCK_NONBLOCK
- 	socketfd = socket(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
+     socketfd = socket(PF_UNIX, SOCK_STREAM | SOCK_NONBLOCK, 0);
 +#else
-+	socketfd = socket(PF_UNIX, SOCK_STREAM, 0);
++    socketfd = socket(PF_UNIX, SOCK_STREAM, 0);
 +#endif
- 	if (socketfd < 0) {
- 		ErrLog("Failed to create listener socket, errno 0x%X.", errno);
- 		return -1;
- 	}
+     if (socketfd < 0) {
+         ErrLog("Failed to create listener socket, errno 0x%X.", errno);
+         return -1;
+     }
 +#ifndef  SOCK_NONBLOCK
-+	if (fcntl(socketfd, F_SETFL,
-+	    fcntl(socketfd, F_GETFL) | O_NONBLOCK) < 0) {
-+		ErrLog("Failed to set listener non-block, errno 0x%X.", errno);
-+		close(socketfd);
-+		return -1;
-+	}
++    if (fcntl(socketfd, F_SETFL,
++        fcntl(socketfd, F_GETFL) | O_NONBLOCK) < 0) {
++            ErrLog("Failed to set listener non-block, errno 0x%X.", errno);
++            close(socketfd);
++            return -1;
++    }
 +#endif
- 	if (unlink(SOCKET_FILE_PATH) && errno != ENOENT) {
- 		ErrLog("Failed to unlink socket file, errno 0x%X.", errno);
- 		close(socketfd);
-@@ -337,7 +352,7 @@
- 
- 	// make socket file part of the pkcs11 group, and write accessable
- 	// for that group
--	grp = getgrnam("pkcs11");
-+	grp = getgrnam(PKCS11GROUP);
- 	if (!grp) {
- 		ErrLog("Group PKCS#11 does not exist");
- 		DetachSocketListener(socketfd);
+     if (unlink(SOCKET_FILE_PATH) && errno != ENOENT) {
+         ErrLog("Failed to unlink socket file, errno 0x%X.", errno);
+         close(socketfd);
+@@ -57,7 +72,7 @@ int CreateListenerSocket(void)
+     }
+     // make socket file part of the pkcs11 group, and write accessable
+     // for that group
+-    grp = getgrnam("pkcs11");
++    grp = getgrnam(PKCS11GROUP);
+     if (!grp) {
+         ErrLog("Group PKCS#11 does not exist");
+         DetachSocketListener(socketfd);