@@ -110,6 +110,8 @@ pub enum AttributeType {
110110 PublicExponent ,
111111 /// DER-encoding of the SubjectPublicKeyInfo
112112 PublicKeyInfo ,
113+ /// Profile ID
114+ ProfileId ,
113115 /// Seed to derive private key
114116 Seed ,
115117 /// Determines if the key is sensitive
@@ -269,6 +271,7 @@ impl AttributeType {
269271 CKA_UNIQUE_ID => String :: from ( stringify ! ( CKA_UNIQUE_ID ) ) ,
270272 CKA_SEED => String :: from ( stringify ! ( CKA_SEED ) ) ,
271273 CKA_PARAMETER_SET => String :: from ( stringify ! ( CKA_PARAMETER_SET ) ) ,
274+ CKA_PROFILE_ID => String :: from ( stringify ! ( CKA_PROFILE_ID ) ) ,
272275 CKA_VENDOR_DEFINED ..=CK_ULONG :: MAX => {
273276 format ! ( "{}_{}" , stringify!( CKA_VENDOR_DEFINED ) , val)
274277 }
@@ -331,6 +334,7 @@ impl From<AttributeType> for CK_ATTRIBUTE_TYPE {
331334 AttributeType :: Prime2 => CKA_PRIME_2 ,
332335 AttributeType :: Private => CKA_PRIVATE ,
333336 AttributeType :: PrivateExponent => CKA_PRIVATE_EXPONENT ,
337+ AttributeType :: ProfileId => CKA_PROFILE_ID ,
334338 AttributeType :: PublicExponent => CKA_PUBLIC_EXPONENT ,
335339 AttributeType :: PublicKeyInfo => CKA_PUBLIC_KEY_INFO ,
336340 AttributeType :: Seed => CKA_SEED ,
@@ -405,6 +409,7 @@ impl TryFrom<CK_ATTRIBUTE_TYPE> for AttributeType {
405409 CKA_PRIME_2 => Ok ( AttributeType :: Prime2 ) ,
406410 CKA_PRIVATE => Ok ( AttributeType :: Private ) ,
407411 CKA_PRIVATE_EXPONENT => Ok ( AttributeType :: PrivateExponent ) ,
412+ CKA_PROFILE_ID => Ok ( AttributeType :: ProfileId ) ,
408413 CKA_PUBLIC_EXPONENT => Ok ( AttributeType :: PublicExponent ) ,
409414 CKA_PUBLIC_KEY_INFO => Ok ( AttributeType :: PublicKeyInfo ) ,
410415 CKA_SEED => Ok ( AttributeType :: Seed ) ,
@@ -526,6 +531,8 @@ pub enum Attribute {
526531 Private ( bool ) ,
527532 /// The private exponent `d`
528533 PrivateExponent ( Vec < u8 > ) ,
534+ /// The Profile ID
535+ ProfileId ( ProfileIdType ) ,
529536 /// Public exponent value of a key
530537 PublicExponent ( Vec < u8 > ) ,
531538 /// DER-encoding of the SubjectPublicKeyInfo
@@ -618,6 +625,7 @@ impl Attribute {
618625 Attribute :: Prime2 ( _) => AttributeType :: Prime2 ,
619626 Attribute :: Private ( _) => AttributeType :: Private ,
620627 Attribute :: PrivateExponent ( _) => AttributeType :: PrivateExponent ,
628+ Attribute :: ProfileId ( _) => AttributeType :: ProfileId ,
621629 Attribute :: PublicExponent ( _) => AttributeType :: PublicExponent ,
622630 Attribute :: PublicKeyInfo ( _) => AttributeType :: PublicKeyInfo ,
623631 Attribute :: Seed ( _) => AttributeType :: Seed ,
@@ -698,6 +706,7 @@ impl Attribute {
698706 Attribute :: Prime1 ( bytes) => bytes. len ( ) ,
699707 Attribute :: Prime2 ( bytes) => bytes. len ( ) ,
700708 Attribute :: PrivateExponent ( bytes) => bytes. len ( ) ,
709+ Attribute :: ProfileId ( _) => size_of :: < CK_PROFILE_ID > ( ) ,
701710 Attribute :: PublicExponent ( bytes) => bytes. len ( ) ,
702711 Attribute :: PublicKeyInfo ( bytes) => bytes. len ( ) ,
703712 Attribute :: Seed ( bytes) => bytes. len ( ) ,
@@ -792,6 +801,7 @@ impl Attribute {
792801 | Attribute :: Id ( bytes) => bytes. as_ptr ( ) as * mut c_void ,
793802 // Unique types
794803 Attribute :: ParameterSet ( val) => val as * const _ as * mut c_void ,
804+ Attribute :: ProfileId ( val) => val as * const _ as * mut c_void ,
795805 Attribute :: CertificateType ( certificate_type) => {
796806 certificate_type as * const _ as * mut c_void
797807 }
@@ -922,6 +932,9 @@ impl TryFrom<CK_ATTRIBUTE> for Attribute {
922932 AttributeType :: Value => Ok ( Attribute :: Value ( val. to_vec ( ) ) ) ,
923933 AttributeType :: Id => Ok ( Attribute :: Id ( val. to_vec ( ) ) ) ,
924934 // Unique types
935+ AttributeType :: ProfileId => Ok ( Attribute :: ProfileId ( ProfileIdType {
936+ val : CK_ULONG :: from_ne_bytes ( val. try_into ( ) ?) ,
937+ } ) ) ,
925938 AttributeType :: ParameterSet => Ok ( Attribute :: ParameterSet ( ParameterSetType {
926939 val : CK_ULONG :: from_ne_bytes ( val. try_into ( ) ?) . into ( ) ,
927940 } ) ) ,
@@ -1718,3 +1731,94 @@ impl TryFrom<CK_CERTIFICATE_TYPE> for CertificateType {
17181731 }
17191732 }
17201733}
1734+
1735+ #[ derive( Debug , Copy , Clone , PartialEq , Eq ) ]
1736+ #[ repr( transparent) ]
1737+ /// The PKCS#11 Profile ID
1738+ ///
1739+ /// The profiles and their meaning is defined in the following document:
1740+ ///
1741+ /// <https://docs.oasis-open.org/pkcs11/pkcs11-profiles/v3.1/os/pkcs11-profiles-v3.1-os.html>
1742+ pub struct ProfileIdType {
1743+ val : CK_PROFILE_ID ,
1744+ }
1745+
1746+ impl ProfileIdType {
1747+ /// Baseline Provider
1748+ pub const BASELINE_PROFIDER : ProfileIdType = ProfileIdType {
1749+ val : CKP_BASELINE_PROVIDER ,
1750+ } ;
1751+ /// Extended Provider
1752+ pub const EXTENDED_PROFIDER : ProfileIdType = ProfileIdType {
1753+ val : CKP_EXTENDED_PROVIDER ,
1754+ } ;
1755+ /// Authentication Token Provider or Consumer
1756+ pub const AUTHENTICATION_TOKEN : ProfileIdType = ProfileIdType {
1757+ val : CKP_AUTHENTICATION_TOKEN ,
1758+ } ;
1759+ /// Public Certificates Token Provider or Consumer
1760+ pub const PUBLIC_CERTIFICATES_TOKEN : ProfileIdType = ProfileIdType {
1761+ val : CKP_PUBLIC_CERTIFICATES_TOKEN ,
1762+ } ;
1763+ /// Complete Provider
1764+ pub const COMPLETE_PROVIDER : ProfileIdType = ProfileIdType {
1765+ val : CKP_COMPLETE_PROVIDER ,
1766+ } ;
1767+ /// HKDF TLS Token
1768+ pub const HKDF_TLS_TOKEN : ProfileIdType = ProfileIdType {
1769+ val : CKP_HKDF_TLS_TOKEN ,
1770+ } ;
1771+
1772+ pub ( crate ) fn stringify ( profile_id : CK_PROFILE_ID ) -> String {
1773+ match profile_id {
1774+ CKP_BASELINE_PROVIDER => String :: from ( stringify ! ( CKP_BASELINE_PROVIDER ) ) ,
1775+ CKP_EXTENDED_PROVIDER => String :: from ( stringify ! ( CKP_EXTENDED_PROVIDER ) ) ,
1776+ CKP_AUTHENTICATION_TOKEN => String :: from ( stringify ! ( CKP_AUTHENTICATION_TOKEN ) ) ,
1777+ CKP_PUBLIC_CERTIFICATES_TOKEN => {
1778+ String :: from ( stringify ! ( CKP_PUBLIC_CERTIFICATES_TOKEN ) )
1779+ }
1780+ CKP_COMPLETE_PROVIDER => String :: from ( stringify ! ( CKP_COMPLETE_PROVIDER ) ) ,
1781+ CKP_HKDF_TLS_TOKEN => String :: from ( stringify ! ( CKP_HKDF_TLS_TOKEN ) ) ,
1782+ _ => format ! ( "unknown ({profile_id:08x})" ) ,
1783+ }
1784+ }
1785+ }
1786+
1787+ impl std:: fmt:: Display for ProfileIdType {
1788+ fn fmt ( & self , f : & mut Formatter < ' _ > ) -> std:: fmt:: Result {
1789+ write ! ( f, "{}" , ProfileIdType :: stringify( self . val) )
1790+ }
1791+ }
1792+
1793+ impl Deref for ProfileIdType {
1794+ type Target = CK_PROFILE_ID ;
1795+
1796+ fn deref ( & self ) -> & Self :: Target {
1797+ & self . val
1798+ }
1799+ }
1800+
1801+ impl From < ProfileIdType > for CK_PROFILE_ID {
1802+ fn from ( profile_id : ProfileIdType ) -> Self {
1803+ * profile_id
1804+ }
1805+ }
1806+
1807+ impl TryFrom < CK_PROFILE_ID > for ProfileIdType {
1808+ type Error = Error ;
1809+
1810+ fn try_from ( profile_id : CK_PROFILE_ID ) -> Result < Self > {
1811+ match profile_id {
1812+ CKP_BASELINE_PROVIDER => Ok ( ProfileIdType :: BASELINE_PROFIDER ) ,
1813+ CKP_EXTENDED_PROVIDER => Ok ( ProfileIdType :: EXTENDED_PROFIDER ) ,
1814+ CKP_AUTHENTICATION_TOKEN => Ok ( ProfileIdType :: AUTHENTICATION_TOKEN ) ,
1815+ CKP_PUBLIC_CERTIFICATES_TOKEN => Ok ( ProfileIdType :: PUBLIC_CERTIFICATES_TOKEN ) ,
1816+ CKP_COMPLETE_PROVIDER => Ok ( ProfileIdType :: COMPLETE_PROVIDER ) ,
1817+ CKP_HKDF_TLS_TOKEN => Ok ( ProfileIdType :: HKDF_TLS_TOKEN ) ,
1818+ _ => {
1819+ error ! ( "Profile Id {} is not supported." , profile_id) ;
1820+ Err ( Error :: NotSupported )
1821+ }
1822+ }
1823+ }
1824+ }
0 commit comments