From owner-p4-projects  Thu Jun 13  8:43: 4 2002
Delivered-To: p4-projects@freebsd.org
Received: by hub.freebsd.org (Postfix, from userid 32767)
	id 0EFEA37B447; Thu, 13 Jun 2002 08:42:54 -0700 (PDT)
Delivered-To: perforce@freebsd.org
Received: from freefall.freebsd.org (freefall.FreeBSD.org [216.136.204.21])
	by hub.freebsd.org (Postfix) with ESMTP id D1B1937B42C
	for <perforce@freebsd.org>; Thu, 13 Jun 2002 08:42:52 -0700 (PDT)
Received: (from perforce@localhost)
	by freefall.freebsd.org (8.11.6/8.11.6) id g5DFg4B22397
	for perforce@freebsd.org; Thu, 13 Jun 2002 08:42:04 -0700 (PDT)
	(envelope-from des@freebsd.org)
Date: Thu, 13 Jun 2002 08:42:04 -0700 (PDT)
Message-Id: <200206131542.g5DFg4B22397@freefall.freebsd.org>
X-Authentication-Warning: freefall.freebsd.org: perforce set sender to des@freebsd.org using -f
From: Dag-Erling Smorgrav <des@FreeBSD.org>
Subject: PERFORCE change 12824 for review
To: Perforce Change Reviews <perforce@freebsd.org>
Sender: owner-p4-projects@FreeBSD.ORG
Precedence: bulk
List-ID: <p4-projects.FreeBSD.ORG>
List-Archive: <http://docs.freebsd.org/mail/> (Web Archive)
List-Help: <mailto:majordomo@FreeBSD.ORG?subject=help> (List Instructions)
List-Subscribe: <mailto:majordomo@FreeBSD.ORG?subject=subscribe%20p4-projects>
List-Unsubscribe: <mailto:majordomo@FreeBSD.ORG?subject=unsubscribe%20p4-projects>
X-Loop: FreeBSD.ORG

http://people.freebsd.org/~peter/p4db/chv.cgi?CH=12824

Change 12824 by des@des.at.des.thinksec.com on 2002/06/13 08:41:03

	All the slot types we (plan to) support are hardware slots.
	
	Note that USB slots are *not* automatically removable in the PKCS#11
	sense.  If my interpretation of PKCS#11 is correct, USB key storage
	tokens are considered "fixed" devices because you can't dissociate
	the token from the reader.

Affected files ...

... //depot/projects/cryptoki/lib/C_GetSlotInfo.c#5 edit

Differences ...

==== //depot/projects/cryptoki/lib/C_GetSlotInfo.c#5 (text+ko) ====

@@ -31,7 +31,7 @@
  * OUT OF THE USE OF THIS SOFTWARE, EVEN IF ADVISED OF THE POSSIBILITY OF
  * SUCH DAMAGE.
  *
- * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#4 $
+ * $P4: //depot/projects/cryptoki/lib/C_GetSlotInfo.c#5 $
  */
 
 #include <string.h>
@@ -52,5 +52,12 @@
 	strncpy(pInfo->slotDescription, _ck_Slots[slotID].cks_dev,
 	    strlen(_ck_Slots[slotID].cks_dev));
 	memset(pInfo->manufacturerID, ' ', sizeof pInfo->manufacturerID);
+	switch (_ck_Slots[slotID].cks_type) {
+	case serial:
+	case parallel:
+	case ugen:
+		pInfo->flags |= CKF_HW_SLOT;
+		break;
+	}
 	return (CKR_OK);
 }

To Unsubscribe: send mail to majordomo@FreeBSD.org
with "unsubscribe p4-projects" in the body of the message