[BACK]Return to pkcs11.h CVS log [TXT][DIR] Up to [local] / src / usr.bin / ssh

Diff for /src/usr.bin/ssh/pkcs11.h between version 1.2 and 1.3

version 1.2, 2010/02/24 06:12:53 version 1.3, 2013/11/26 19:15:09
Line 319 
Line 319 
 #define CKO_HW_FEATURE          (5)  #define CKO_HW_FEATURE          (5)
 #define CKO_DOMAIN_PARAMETERS   (6)  #define CKO_DOMAIN_PARAMETERS   (6)
 #define CKO_MECHANISM           (7)  #define CKO_MECHANISM           (7)
 #define CKO_VENDOR_DEFINED      ((unsigned long) (1 << 31))  #define CKO_VENDOR_DEFINED      (1U << 31)
   
   
 typedef unsigned long ck_hw_feature_type_t;  typedef unsigned long ck_hw_feature_type_t;
Line 327 
Line 327 
 #define CKH_MONOTONIC_COUNTER   (1)  #define CKH_MONOTONIC_COUNTER   (1)
 #define CKH_CLOCK               (2)  #define CKH_CLOCK               (2)
 #define CKH_USER_INTERFACE      (3)  #define CKH_USER_INTERFACE      (3)
 #define CKH_VENDOR_DEFINED      ((unsigned long) (1 << 31))  #define CKH_VENDOR_DEFINED      (1U << 31)
   
   
 typedef unsigned long ck_key_type_t;  typedef unsigned long ck_key_type_t;
Line 357 
Line 357 
 #define CKK_AES                 (0x1f)  #define CKK_AES                 (0x1f)
 #define CKK_BLOWFISH            (0x20)  #define CKK_BLOWFISH            (0x20)
 #define CKK_TWOFISH             (0x21)  #define CKK_TWOFISH             (0x21)
 #define CKK_VENDOR_DEFINED      ((unsigned long) (1 << 31))  #define CKK_VENDOR_DEFINED      (1U << 31)
   
 typedef unsigned long ck_certificate_type_t;  typedef unsigned long ck_certificate_type_t;
   
 #define CKC_X_509               (0)  #define CKC_X_509               (0)
 #define CKC_X_509_ATTR_CERT     (1)  #define CKC_X_509_ATTR_CERT     (1)
 #define CKC_WTLS                (2)  #define CKC_WTLS                (2)
 #define CKC_VENDOR_DEFINED      ((unsigned long) (1 << 31))  #define CKC_VENDOR_DEFINED      (1U << 31)
   
   
 typedef unsigned long ck_attribute_type_t;  typedef unsigned long ck_attribute_type_t;
Line 453 
Line 453 
 #define CKA_WRAP_TEMPLATE               (CKF_ARRAY_ATTRIBUTE | 0x211)  #define CKA_WRAP_TEMPLATE               (CKF_ARRAY_ATTRIBUTE | 0x211)
 #define CKA_UNWRAP_TEMPLATE             (CKF_ARRAY_ATTRIBUTE | 0x212)  #define CKA_UNWRAP_TEMPLATE             (CKF_ARRAY_ATTRIBUTE | 0x212)
 #define CKA_ALLOWED_MECHANISMS          (CKF_ARRAY_ATTRIBUTE | 0x600)  #define CKA_ALLOWED_MECHANISMS          (CKF_ARRAY_ATTRIBUTE | 0x600)
 #define CKA_VENDOR_DEFINED              ((unsigned long) (1 << 31))  #define CKA_VENDOR_DEFINED              (1U << 31)
   
   
 struct ck_attribute  struct ck_attribute
Line 672 
Line 672 
 #define CKM_DSA_PARAMETER_GEN           (0x2000)  #define CKM_DSA_PARAMETER_GEN           (0x2000)
 #define CKM_DH_PKCS_PARAMETER_GEN       (0x2001)  #define CKM_DH_PKCS_PARAMETER_GEN       (0x2001)
 #define CKM_X9_42_DH_PARAMETER_GEN      (0x2002)  #define CKM_X9_42_DH_PARAMETER_GEN      (0x2002)
 #define CKM_VENDOR_DEFINED              ((unsigned long) (1 << 31))  #define CKM_VENDOR_DEFINED              (1U << 31)
   
   
 struct ck_mechanism  struct ck_mechanism
Line 703 
Line 703 
 #define CKF_WRAP                (1 << 17)  #define CKF_WRAP                (1 << 17)
 #define CKF_UNWRAP              (1 << 18)  #define CKF_UNWRAP              (1 << 18)
 #define CKF_DERIVE              (1 << 19)  #define CKF_DERIVE              (1 << 19)
 #define CKF_EXTENSION           ((unsigned long) (1 << 31))  #define CKF_EXTENSION           (1U << 31)
   
   
 /* Flags for C_WaitForSlotEvent.  */  /* Flags for C_WaitForSlotEvent.  */
Line 1179 
Line 1179 
 #define CKR_MUTEX_BAD                           (0x1a0)  #define CKR_MUTEX_BAD                           (0x1a0)
 #define CKR_MUTEX_NOT_LOCKED                    (0x1a1)  #define CKR_MUTEX_NOT_LOCKED                    (0x1a1)
 #define CKR_FUNCTION_REJECTED                   (0x200)  #define CKR_FUNCTION_REJECTED                   (0x200)
 #define CKR_VENDOR_DEFINED                      ((unsigned long) (1 << 31))  #define CKR_VENDOR_DEFINED                      (1U << 31)
   
   
   

Legend:
Removed from v.1.2  
changed lines
  Added in v.1.3