From owner-p4-projects@FreeBSD.ORG  Fri Nov  7 00:14:13 2014
Return-Path: <owner-p4-projects@FreeBSD.ORG>
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
 id EAE392AA; Fri,  7 Nov 2014 00:14:12 +0000 (UTC)
Delivered-To: perforce@freebsd.org
Received: from mx1.freebsd.org (mx1.freebsd.org
 [IPv6:2001:1900:2254:206a::19:1])
 (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits))
 (No client certificate requested)
 by hub.freebsd.org (Postfix) with ESMTPS id ABCB92A8
 for <perforce@freebsd.org>; Fri,  7 Nov 2014 00:14:12 +0000 (UTC)
Received: from skunkworks.freebsd.org (skunkworks.freebsd.org
 [IPv6:2001:1900:2254:2068::682:0])
 (using TLSv1.2 with cipher ECDHE-RSA-AES256-GCM-SHA384 (256/256 bits))
 (Client did not present a certificate)
 by mx1.freebsd.org (Postfix) with ESMTPS id 987BE77C
 for <perforce@freebsd.org>; Fri,  7 Nov 2014 00:14:12 +0000 (UTC)
Received: from skunkworks.freebsd.org ([127.0.1.74])
 by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sA70ECKB008900
 for <perforce@freebsd.org>; Fri, 7 Nov 2014 00:14:12 GMT
 (envelope-from jmg@freebsd.org)
Received: (from perforce@localhost)
 by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sA70ECLA008897
 for perforce@freebsd.org; Fri, 7 Nov 2014 00:14:12 GMT
 (envelope-from jmg@freebsd.org)
Date: Fri, 7 Nov 2014 00:14:12 GMT
Message-Id: <201411070014.sA70ECLA008897@skunkworks.freebsd.org>
X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to
 jmg@freebsd.org using -f
From: John-Mark Gurney <jmg@FreeBSD.org>
Subject: PERFORCE change 1202585 for review
To: Perforce Change Reviews <perforce@FreeBSD.org>
Precedence: bulk
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.18-1
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/options/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=unsubscribe>
List-Archive: <http://lists.freebsd.org/pipermail/p4-projects/>
List-Post: <mailto:p4-projects@freebsd.org>
List-Help: <mailto:p4-projects-request@freebsd.org?subject=help>
List-Subscribe: <http://lists.freebsd.org/mailman/listinfo/p4-projects>,
 <mailto:p4-projects-request@freebsd.org?subject=subscribe>
X-List-Received-Date: Fri, 07 Nov 2014 00:14:13 -0000

http://p4web.freebsd.org/@@1202585?ac=10

Change 1202585 by jmg@jmg_carbon2 on 2014/11/07 00:13:16

	improve the selection of the device...  If you ask for both
	_HARDWARE and _SOFTWARE devices, but software is disallowed
	per sysctl, silently remove _SOFTWARE... We'll still get an
	error if the _HARDWARE doesn't support it...
	
	This makes testing of both the hardware drivers and software
	drivers easier...  Most software will just set _HARDWARE and
	will continue to work...
	
	Sponsored by:	FreeBSD Foundation
	Sponsored by:	Netgate

Affected files ...

.. //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#10 edit

Differences ...

==== //depot/projects/opencrypto/sys/opencrypto/cryptodev.c#10 (text+ko) ====

@@ -338,15 +338,23 @@
  * by device name/class or through search constraints.
  */
 static int
-checkforsoftware(int crid)
+checkforsoftware(int *cridp)
 {
+	int crid;
+
+	crid = *cridp;
 
 	if (!crypto_devallowsoft) {
-		if (crid & CRYPTOCAP_F_SOFTWARE)
-			return EINVAL;		/* XXX */
+		if (crid & CRYPTOCAP_F_SOFTWARE) {
+			if (crid & CRYPTOCAP_F_HARDWARE) {
+				*cridp = CRYPTOCAP_F_HARDWARE;
+				return 0;
+			}
+			return EINVAL;
+		}
 		if ((crid & CRYPTOCAP_F_HARDWARE) == 0 &&
 		    (crypto_getcaps(crid) & CRYPTOCAP_F_HARDWARE) == 0)
-			return EINVAL;		/* XXX */
+			return EINVAL;
 	}
 	return 0;
 }
@@ -537,7 +545,7 @@
 #endif
 			) {
 			crid = SES2(sop)->crid;
-			error = checkforsoftware(crid);
+			error = checkforsoftware(&crid);
 			if (error) {
 				CRYPTDEB("checkforsoftware");
 				goto bail;