From owner-p4-projects@FreeBSD.ORG Fri Nov 7 00:50:53 2014 Return-Path: Delivered-To: p4-projects@freebsd.org Received: by hub.freebsd.org (Postfix, from userid 32767) id 77638DC8; Fri, 7 Nov 2014 00:50:53 +0000 (UTC) Delivered-To: perforce@freebsd.org Received: from mx1.freebsd.org (mx1.freebsd.org [8.8.178.115]) (using TLSv1.2 with cipher AECDH-AES256-SHA (256/256 bits)) (No client certificate requested) by hub.freebsd.org (Postfix) with ESMTPS id 37E4EDC6 for ; Fri, 7 Nov 2014 00:50:53 +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 244E6B88 for ; Fri, 7 Nov 2014 00:50:53 +0000 (UTC) Received: from skunkworks.freebsd.org ([127.0.1.74]) by skunkworks.freebsd.org (8.14.9/8.14.9) with ESMTP id sA70orvj016633 for ; Fri, 7 Nov 2014 00:50:53 GMT (envelope-from jmg@freebsd.org) Received: (from perforce@localhost) by skunkworks.freebsd.org (8.14.9/8.14.9/Submit) id sA70oqme016630 for perforce@freebsd.org; Fri, 7 Nov 2014 00:50:52 GMT (envelope-from jmg@freebsd.org) Date: Fri, 7 Nov 2014 00:50:52 GMT Message-Id: <201411070050.sA70oqme016630@skunkworks.freebsd.org> X-Authentication-Warning: skunkworks.freebsd.org: perforce set sender to jmg@freebsd.org using -f From: John-Mark Gurney Subject: PERFORCE change 1202588 for review To: Perforce Change Reviews Precedence: bulk X-BeenThere: p4-projects@freebsd.org X-Mailman-Version: 2.1.18-1 List-Id: p4 projects tree changes List-Unsubscribe: , List-Archive: List-Post: List-Help: List-Subscribe: , X-List-Received-Date: Fri, 07 Nov 2014 00:50:53 -0000 http://p4web.freebsd.org/@@1202588?ac=10 Change 1202588 by jmg@jmg_carbon2 on 2014/11/07 00:50:03 add support for fetching the name of a crid... Add a small little test program that dumps the names of all the crypto devices in the system... Sponsored by: FreeBSD Foundation Sponsored by: Netgate Affected files ... .. //depot/projects/opencrypto/tests/sys/opencrypto/cryptodev.py#3 edit Differences ... ==== //depot/projects/opencrypto/tests/sys/opencrypto/cryptodev.py#3 (text+ko) ==== @@ -94,17 +94,30 @@ _cryptodev = _getdev() +def _findop(crid, name): + fop = FindOp() + fop.crid = crid + fop.name = name + s = array.array('B', fop.pack_hdr()) + ioctl(_cryptodev, CIOCFINDDEV, s, 1) + fop.unpack(s) + + try: + idx = fop.name.index('\x00') + name = fop.name[:idx] + except ValueError: + name = fop.name + + return fop.crid, name + class Crypto: @staticmethod def findcrid(name): - fop = FindOp() - fop.crid = -1 - fop.name = name - s = array.array('B', fop.pack_hdr()) - ioctl(_cryptodev, CIOCFINDDEV, s, 1) - fop.unpack(s) + return _findop(-1, name)[0] - return fop.crid + @staticmethod + def getcridname(crid): + return _findop(crid, '')[1] def __init__(self, cipher=0, key=None, mac=0, mackey=None, crid=CRYPTOCAP_F_SOFTWARE | CRYPTOCAP_F_HARDWARE): @@ -346,8 +359,18 @@ if __name__ == '__main__': if True: - print Crypto.findcrid('aesni0') + try: + crid = Crypto.findcrid('aesni0') + print 'aesni:', crid + except IOError: + print 'aesni0 not found' + for i in xrange(10): + try: + name = Crypto.getcridname(i) + print '%2d: %s' % (i, `name`) + except IOError: + pass elif False: kp = KATParser('/usr/home/jmg/aesni.testing/format tweak value input - data unit seq no/XTSGenAES128.rsp', [ 'COUNT', 'DataUnitLen', 'Key', 'DataUnitSeqNumber', 'PT', 'CT' ]) for mode, ni in kp: