From owner-p4-projects@FreeBSD.ORG  Tue Dec  5 04:46:06 2006
Return-Path: <owner-p4-projects@FreeBSD.ORG>
X-Original-To: p4-projects@freebsd.org
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 6792016A416; Tue,  5 Dec 2006 04:46:06 +0000 (UTC)
X-Original-To: perforce@freebsd.org
Delivered-To: perforce@freebsd.org
Received: from mx1.FreeBSD.org (mx1.freebsd.org [69.147.83.52])
	by hub.freebsd.org (Postfix) with ESMTP id 22FBC16A412
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 04:46:06 +0000 (UTC)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (repoman.freebsd.org [69.147.83.41])
	by mx1.FreeBSD.org (Postfix) with ESMTP id 1B84243CA6
	for <perforce@freebsd.org>; Tue,  5 Dec 2006 04:45:29 +0000 (GMT)
	(envelope-from sam@freebsd.org)
Received: from repoman.freebsd.org (localhost [127.0.0.1])
	by repoman.freebsd.org (8.13.6/8.13.6) with ESMTP id kB54k5cT050545
	for <perforce@freebsd.org>; Tue, 5 Dec 2006 04:46:05 GMT
	(envelope-from sam@freebsd.org)
Received: (from perforce@localhost)
	by repoman.freebsd.org (8.13.6/8.13.4/Submit) id kB54k5L1050542
	for perforce@freebsd.org; Tue, 5 Dec 2006 04:46:05 GMT
	(envelope-from sam@freebsd.org)
Date: Tue, 5 Dec 2006 04:46:05 GMT
Message-Id: <200612050446.kB54k5L1050542@repoman.freebsd.org>
X-Authentication-Warning: repoman.freebsd.org: perforce set sender to
	sam@freebsd.org using -f
From: Sam Leffler <sam@FreeBSD.org>
To: Perforce Change Reviews <perforce@freebsd.org>
Cc: 
Subject: PERFORCE change 111108 for review
X-BeenThere: p4-projects@freebsd.org
X-Mailman-Version: 2.1.5
Precedence: list
List-Id: p4 projects tree changes <p4-projects.freebsd.org>
List-Unsubscribe: <http://lists.freebsd.org/mailman/listinfo/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: Tue, 05 Dec 2006 04:46:06 -0000

http://perforce.freebsd.org/chv.cgi?CH=111108

Change 111108 by sam@sam_ebb on 2006/12/05 04:46:00

	crypto_userasymcrypto is supposed to control whether users
	can submit asym crypto operations but it only controlled
	the return value of getfeat (returning 0 so user apps assumed
	there were no algorithms available in the kernel); clearly
	this is wrong, if you want to disallow operations you have
	to have check this variable for key op ioctls

Affected files ...

.. //depot/projects/crypto/sys/opencrypto/cryptodev.c#4 edit

Differences ...

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

@@ -316,6 +316,8 @@
 		break;
 	case CIOCKEY:
 	case CIOCKEY2:
+		if (!crypto_userasymcrypto)
+			return (EPERM);		/* XXX compat? */
 		kop = (struct crypt_kop *)data;
 		if (cmd == CIOCKEY) {
 			/* for backwards compatibility */