D19372.id54442.diff
No OneTemporary
Actions

Size

1 KB

Referenced Files

None

Subscribers

None

D19372.id54442.diff
View Options

	Index: tools/tools/crypto/cryptocheck.c
	===================================================================
	--- tools/tools/crypto/cryptocheck.c
	+++ tools/tools/crypto/cryptocheck.c
	@@ -111,6 +111,7 @@
	*/

	#include <sys/param.h>
	+#include <sys/sysctl.h>
	#include <assert.h>
	#include <err.h>
	#include <fcntl.h>
	@@ -125,6 +126,7 @@

	#include <crypto/cryptodev.h>

	+
	/* XXX: Temporary hack */
	#ifndef COP_F_CIPHER_FIRST
	#define COP_F_CIPHER_FIRST 0x0001 /* Cipher before MAC. */
	@@ -275,13 +277,41 @@
	return (fd);
	}

	+/*
	+ * Called on exit to change kern.cryptodevallowsoft back to 0
	+ */
	+#define CRYPT_SOFT_ALLOW "kern.cryptodevallowsoft"
	+
	+static void
	+reset_user_soft(void)
	+{
	+ int off = 0;
	+ sysctlbyname(CRYPT_SOFT_ALLOW, NULL, NULL, &off, sizeof(off));
	+}
	+
	+static void
	+check_user_soft(void)
	+{
	+ int curstate;
	+ int on = 1;
	+ size_t cursize = sizeof(curstate);
	+
	+ if (sysctlbyname(CRYPT_SOFT_ALLOW, &curstate, &cursize,
	+ &on, sizeof(on)) == 0) {
	+ if (curstate == 0)
	+ atexit(reset_user_soft);
	+ }
	+}
	+
	static int
	crlookup(const char *devname)
	{
	struct crypt_find_op find;

	- if (strncmp(devname, "soft", 4) == 0)
	+ if (strncmp(devname, "soft", 4) == 0) {
	+ check_user_soft();
	return CRYPTO_FLAG_SOFTWARE;
	+ }

	find.crid = -1;
	strlcpy(find.name, devname, sizeof(find.name));