diff options
| author | Jason King <jason.brian.king+github@gmail.com> | 2015-09-16 20:50:23 -0500 |
|---|---|---|
| committer | Richard Lowe <richlowe@richlowe.net> | 2016-12-22 13:35:06 -0500 |
| commit | b106467fd72e9bfd9e2bd78fbaa00a96a4eead45 (patch) | |
| tree | 3aeaa53c7dde1ca05dd9463763d3f6f5f8ce6dce /usr/src/common | |
| parent | ee89337b3cc91051d11d67625a9672ffa4f83016 (diff) | |
| download | illumos-joyent-b106467fd72e9bfd9e2bd78fbaa00a96a4eead45.tar.gz | |
6239 Add PKCS#11 v2.40 support
6240 pkcs11_mech2keytype returns incorrect key type for CKM_DH_PKCS_PARAMETER_GEN
Reviewed by: Dan McDonald <danmcd@omniti.com>
Reviewed by: Robert Mustacci <rm@joyent.com>
Reviewed by: Igor Kozhukhov <igor@dilos.org>
Approved by: Richard Lowe <richlowe@richlowe.net>
Diffstat (limited to 'usr/src/common')
| -rw-r--r-- | usr/src/common/crypto/ecc/oid.c | 8 |
1 files changed, 3 insertions, 5 deletions
diff --git a/usr/src/common/crypto/ecc/oid.c b/usr/src/common/crypto/ecc/oid.c index 1f4cfc7637..fbc7fd8f03 100644 --- a/usr/src/common/crypto/ecc/oid.c +++ b/usr/src/common/crypto/ecc/oid.c @@ -41,8 +41,6 @@ * Sun elects to use this software under the MPL license. */ -#pragma ident "%Z%%M% %I% %E% SMI" - #include <sys/types.h> #include <sys/systm.h> #include <sys/param.h> @@ -147,9 +145,9 @@ CONST_OID ansiX962c2tnb431r1[] = { ANSI_X962_GF2m_OID, 0x14 }; /* XXX this is incorrect */ #define INVALID_CERT_EXTENSION 1 -#define CKM_ECDSA 0x00001041 -#define CKM_ECDSA_SHA1 0x00001042 -#define CKM_ECDH1_DERIVE 0x00001050 +#define CKM_ECDSA 0x00001041UL +#define CKM_ECDSA_SHA1 0x00001042UL +#define CKM_ECDH1_DERIVE 0x00001050UL static SECOidData ANSI_prime_oids[] = { { { siDEROID, NULL, 0 }, ECCurve_noName, |