Module Name: src Committed By: tls Date: Sun Aug 10 06:56:47 UTC 2014
Modified Files: src/sys/opencrypto [tls-earlyentropy]: cryptodev.c cryptosoft.c Log Message: Rebase. To generate a diff of this commit: cvs rdiff -u -r1.78 -r1.78.2.1 src/sys/opencrypto/cryptodev.c cvs rdiff -u -r1.44 -r1.44.2.1 src/sys/opencrypto/cryptosoft.c Please note that diffs are not public domain; they are subject to the copyright notices on the relevant files.
Modified files: Index: src/sys/opencrypto/cryptodev.c diff -u src/sys/opencrypto/cryptodev.c:1.78 src/sys/opencrypto/cryptodev.c:1.78.2.1 --- src/sys/opencrypto/cryptodev.c:1.78 Sun Mar 16 05:20:30 2014 +++ src/sys/opencrypto/cryptodev.c Sun Aug 10 06:56:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptodev.c,v 1.78 2014/03/16 05:20:30 dholland Exp $ */ +/* $NetBSD: cryptodev.c,v 1.78.2.1 2014/08/10 06:56:47 tls Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptodev.c,v 1.4.2.4 2003/06/03 00:09:02 sam Exp $ */ /* $OpenBSD: cryptodev.c,v 1.53 2002/07/10 22:21:30 mickey Exp $ */ @@ -64,7 +64,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.78 2014/03/16 05:20:30 dholland Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cryptodev.c,v 1.78.2.1 2014/08/10 06:56:47 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1119,6 +1119,7 @@ struct cdevsw crypto_cdevsw = { .d_poll = cryptoselect /*nopoll*/, .d_mmap = nommap, .d_kqfilter = nokqfilter, + .d_discard = nodiscard, .d_flag = D_OTHER }; @@ -2084,6 +2085,8 @@ void cryptoattach(int); void cryptoattach(int num) { + crypto_init(); + pool_init(&fcrpl, sizeof(struct fcrypt), 0, 0, 0, "fcrpl", NULL, IPL_NET); /* XXX IPL_NET ("splcrypto") */ pool_init(&csepl, sizeof(struct csession), 0, 0, 0, "csepl", Index: src/sys/opencrypto/cryptosoft.c diff -u src/sys/opencrypto/cryptosoft.c:1.44 src/sys/opencrypto/cryptosoft.c:1.44.2.1 --- src/sys/opencrypto/cryptosoft.c:1.44 Wed Jan 1 16:06:01 2014 +++ src/sys/opencrypto/cryptosoft.c Sun Aug 10 06:56:47 2014 @@ -1,4 +1,4 @@ -/* $NetBSD: cryptosoft.c,v 1.44 2014/01/01 16:06:01 pgoyette Exp $ */ +/* $NetBSD: cryptosoft.c,v 1.44.2.1 2014/08/10 06:56:47 tls Exp $ */ /* $FreeBSD: src/sys/opencrypto/cryptosoft.c,v 1.2.2.1 2002/11/21 23:34:23 sam Exp $ */ /* $OpenBSD: cryptosoft.c,v 1.35 2002/04/26 08:43:50 deraadt Exp $ */ @@ -24,7 +24,7 @@ */ #include <sys/cdefs.h> -__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.44 2014/01/01 16:06:01 pgoyette Exp $"); +__KERNEL_RCSID(0, "$NetBSD: cryptosoft.c,v 1.44.2.1 2014/08/10 06:56:47 tls Exp $"); #include <sys/param.h> #include <sys/systm.h> @@ -1333,6 +1333,9 @@ swcrypto_attach(device_t parent, device_ { swcr_init(); + + if (!pmf_device_register(self, NULL, NULL)) + aprint_error_dev(self, "couldn't establish power handler\n"); } int swcrypto_detach(device_t, int); @@ -1340,6 +1343,7 @@ int swcrypto_detach(device_t, int); int swcrypto_detach(device_t self, int flag) { + pmf_device_deregister(self); if (swcr_id >= 0) crypto_unregister_all(swcr_id); return 0;