pkcs11 0.2.0-x86-mingw32 → 0.2.1-x86-mingw32

data/ext/pk11.c

@@ -1,4 +1,5 @@
 #include "pk11.h"
+#include "pk11_struct_macros.h"
 
 #if defined(compile_for_windows)
   #include <winbase.h> /* for LoadLibrary() */
@@ -6,7 +7,7 @@
   #include <dlfcn.h>
 #endif
 
-static const char *VERSION = "0.2.0";
+static const char *VERSION = "0.2.1";
 
 static ID sNEW;
 static VALUE mPKCS11;
@@ -30,28 +31,21 @@ static VALUE aCK_SESSION_INFO_members;
 static VALUE cCK_MECHANISM;
 static VALUE aCK_MECHANISM_members;
 
-#define HANDLE2NUM(n) ULONG2NUM(n)
-#define NUM2HANDLE(n) PKNUM2ULONG(n)
-#define PKNUM2ULONG(n) pkcs11_num2ulong(n)
+#define MODULE_FOR_STRUCTS mPKCS11
+#define BASECLASS_FOR_STRUCTS cCStruct
 #define pkcs11_new_struct(klass) rb_funcall(klass, sNEW, 0)
 
-VALUE pkcs11_return_value_to_class(CK_RV, VALUE);
+#define PKCS11_DEFINE_METHOD(name, args) \
+  rb_define_method(cPKCS11, #name, pkcs11_##name, args);
 
-static VALUE
-pkcs11_num2ulong(VALUE val)
-{
-  if (TYPE(val) == T_BIGNUM || TYPE(val) == T_FIXNUM) {
-    return NUM2ULONG(val);
-  }
-  return NUM2ULONG(rb_to_int(val));
-}
+VALUE pkcs11_return_value_to_class(CK_RV, VALUE);
 
 static void
 pkcs11_raise(CK_RV rv)
 {
   VALUE class;
   class = pkcs11_return_value_to_class(rv, ePKCS11Error);
-  rb_raise(class, "%li", rv);
+  rb_raise(class, "%lu", rv);
 }
 
 ///////////////////////////////////////
@@ -1389,52 +1383,60 @@ ck_attr_value(VALUE self)
   Data_Get_Struct(self, CK_ATTRIBUTE, attr);
   if (attr->ulValueLen == 0) return Qnil;
   switch(attr->type){
-  case CKA_TOKEN:
-  case CKA_PRIVATE:
-  case CKA_SENSITIVE:
-  case CKA_ENCRYPT:
+  case CKA_ALWAYS_AUTHENTICATE:
+  case CKA_ALWAYS_SENSITIVE:
+  case CKA_COLOR:
+/*  case CKA_COPYABLE: v2.3 */
   case CKA_DECRYPT:
-  case CKA_WRAP:
-  case CKA_UNWRAP:
-  case CKA_SIGN:
-  case CKA_SIGN_RECOVER:
-  case CKA_VERIFY:
-  case CKA_VERIFY_RECOVER:
   case CKA_DERIVE:
-  case CKA_TRUSTED:
+  case CKA_ENCRYPT:
   case CKA_EXTRACTABLE:
+  case CKA_HAS_RESET:
   case CKA_LOCAL:
-  case CKA_NEVER_EXTRACTABLE:
-  case CKA_ALWAYS_SENSITIVE:
   case CKA_MODIFIABLE:
-  case CKA_HAS_RESET:
-  case CKA_ALWAYS_AUTHENTICATE:
-  case CKA_COLOR:
+  case CKA_NEVER_EXTRACTABLE:
   case CKA_OTP_USER_FRIENDLY_MODE:
+  case CKA_PRIVATE:
+  case CKA_SENSITIVE:
+  case CKA_SIGN:
+  case CKA_SIGN_RECOVER:
+  case CKA_TOKEN:
+  case CKA_TRUSTED:
+  case CKA_UNWRAP:
+  case CKA_VERIFY:
+  case CKA_VERIFY_RECOVER:
+  case CKA_WRAP:
   case CKA_WRAP_WITH_TRUSTED:
     if (attr->ulValueLen == sizeof(CK_BBOOL))
       return (*(CK_BBOOL*)(attr->pValue)) == CK_TRUE ? Qtrue : Qfalse;
     break;
-  case CKA_CLASS:
-  case CKA_CERTIFICATE_TYPE:
-  case CKA_KEY_TYPE:
-  case CKA_HW_FEATURE_TYPE:
   case CKA_BITS_PER_PIXEL:
   case CKA_CERTIFICATE_CATEGORY:
+  case CKA_CERTIFICATE_TYPE:
   case CKA_CHAR_COLUMNS:
   case CKA_CHAR_ROWS:
+  case CKA_CLASS:
+  case CKA_HW_FEATURE_TYPE:
   case CKA_JAVA_MIDP_SECURITY_DOMAIN:
+  case CKA_KEY_TYPE:
   case CKA_MECHANISM_TYPE:
+  case CKA_MODULUS_BITS:
+  case CKA_OTP_CHALLENGE_REQUIREMENT:
+  case CKA_OTP_COUNTER_REQUIREMENT:
+  case CKA_OTP_FORMAT:
+  case CKA_OTP_LENGTH:
+  case CKA_OTP_PIN_REQUIREMENT:
+  case CKA_OTP_TIME_INTERVAL:
+  case CKA_OTP_TIME_REQUIREMENT:
   case CKA_OTP_SERVICE_LOGO_TYPE:
   case CKA_PIXEL_X:
   case CKA_PIXEL_Y:
-  case CKA_RESOLUTION:
-  case CKA_VALUE_LEN:
-  case CKA_MODULUS_BITS:
   case CKA_PRIME_BITS:
+  case CKA_RESOLUTION:
   case CKA_SUBPRIME_BITS:
   case CKA_VALUE_BITS:
-    if (attr->ulValueLen == sizeof(CK_ULONG))
+  case CKA_VALUE_LEN:
+  if (attr->ulValueLen == sizeof(CK_ULONG))
       return ULONG2NUM(*(CK_ULONG_PTR)(attr->pValue));
     break;
   }
@@ -1443,313 +1445,6 @@ ck_attr_value(VALUE self)
 
 ///////////////////////////////////////
 
-static VALUE
-get_string(VALUE obj, off_t offset, size_t size)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  return rb_str_new(ptr+offset, size);
-}
-
-static VALUE
-set_string(VALUE obj, VALUE value, off_t offset, size_t size)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  int len = size;
-  StringValue(value);
-  if (RSTRING_LEN(value) < len) len = RSTRING_LEN(value);
-  memset(ptr+offset, 0, size);
-  memcpy(ptr+offset, RSTRING_PTR(value), len);
-  return value;
-}
-
-static VALUE
-get_ulong(VALUE obj, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  return ULONG2NUM(*(CK_ULONG_PTR)(ptr+offset));
-}
-
-static VALUE
-set_ulong(VALUE obj, VALUE value, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  *(CK_ULONG_PTR)(ptr+offset) = NUM2ULONG(value);
-  return value;
-}
-
-static VALUE
-get_byte(VALUE obj, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  return ULONG2NUM(*(CK_BYTE_PTR)(ptr+offset));
-}
-
-static VALUE
-set_byte(VALUE obj, VALUE value, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  *(CK_BYTE_PTR)(ptr+offset) = NUM2ULONG(value);
-  return value;
-}
-
-static VALUE
-get_ulong_ptr(VALUE obj, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  CK_ULONG_PTR p = *(CK_ULONG_PTR *)(ptr+offset);
-  if (!p) return Qnil;
-  return ULONG2NUM(*p);
-}
-
-static VALUE
-set_ulong_ptr(VALUE obj, VALUE value, const char *name, off_t offset)
-{
-  CK_ULONG_PTR *ptr = (CK_ULONG_PTR *)((char*)DATA_PTR(obj) + offset);
-  if (NIL_P(value)){
-    rb_iv_set(obj, name, value);
-    *ptr = NULL_PTR;
-    return value;
-  }
-  VALUE new_obj = Data_Make_Struct(rb_cInteger, CK_ULONG, 0, free, *ptr);
-  rb_iv_set(obj, name, new_obj);
-  **ptr = NUM2ULONG(value);
-  return value;
-}
-
-static VALUE
-get_handle(VALUE obj, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  return HANDLE2NUM(*(CK_OBJECT_HANDLE_PTR)(ptr+offset));
-}
-
-static VALUE
-set_handle(VALUE obj, VALUE value, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  *(CK_OBJECT_HANDLE_PTR)(ptr+offset) = NUM2HANDLE(value);
-  return value;
-}
-
-static VALUE
-get_bool(VALUE obj, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  if(*(CK_BBOOL*)(ptr+offset)) return Qtrue;
-  else return Qfalse;
-}
-
-static VALUE
-set_bool(VALUE obj, VALUE value, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-	if(value == Qfalse) *(CK_BBOOL*)(ptr+offset) = 0;
-	else if(value == Qtrue) *(CK_BBOOL*)(ptr+offset) = 1;
-	else rb_raise(rb_eArgError, "arg must be true or false");
-  return value;
-}
-
-static VALUE
-get_string_ptr(VALUE obj, const char *name, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  char *p = *(char**)(ptr+offset);
-  if (!p) return Qnil;
-  return rb_str_new2(p);
-}
-
-static VALUE
-set_string_ptr(VALUE obj, VALUE value, const char *name, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  if (NIL_P(value)){
-    rb_iv_set(obj, name, value);
-    *(CK_VOID_PTR*)(ptr+offset) = NULL_PTR;
-    return value;
-  }
-  StringValue(value);
-  value = rb_obj_freeze(rb_str_dup(value));
-  rb_iv_set(obj, name, value);
-  *(CK_VOID_PTR*)(ptr+offset) = RSTRING_PTR(value);
-  return value;
-}
-
-static VALUE
-get_string_ptr_len(VALUE obj, const char *name, off_t offset, off_t offset_len)
-{
-  unsigned long l;
-  char *ptr = (char*)DATA_PTR(obj);
-  char *p = *(char**)(ptr+offset);
-  if (!p) return Qnil;
-  l = *(unsigned long*)(ptr+offset_len);
-  return rb_str_new(p, l);
-}
-
-static VALUE
-set_string_ptr_len(VALUE obj, VALUE value, const char *name, off_t offset, off_t offset_len)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  if (NIL_P(value)){
-    rb_iv_set(obj, name, value);
-    *(CK_VOID_PTR*)(ptr+offset) = NULL_PTR;
-    *(unsigned long*)(ptr+offset_len) = 0;
-    return value;
-  }
-  StringValue(value);
-  value = rb_obj_freeze(rb_str_dup(value));
-  rb_iv_set(obj, name, value);
-  *(CK_VOID_PTR*)(ptr+offset) = RSTRING_PTR(value);
-  *(unsigned long*)(ptr+offset_len) = RSTRING_LEN(value);
-  return value;
-}
-
-static VALUE
-get_struct_inline(VALUE obj, VALUE klass, const char *name, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj) + offset;
-  VALUE inline_obj = Data_Wrap_Struct(klass, 0, 0, ptr);
-  rb_iv_set(inline_obj, name, obj);
-  return inline_obj;
-}
-
-static VALUE
-set_struct_inline(VALUE obj, VALUE klass, const char *struct_name, VALUE value, const char *name, off_t offset, int sizeofstruct)
-{
-  char *ptr = (char*)DATA_PTR(obj) + offset;
-  if (!rb_obj_is_kind_of(value, klass))
-    rb_raise(rb_eArgError, "arg must be a PKCS11::%s", struct_name);
-  memcpy(ptr, DATA_PTR(value), sizeofstruct);
-  return value;
-}
-
-static VALUE
-get_struct_ptr(VALUE obj, VALUE klass, const char *name, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj);
-  char *p = *(char**)(ptr+offset);
-  if (!p) return Qnil;
-  return rb_iv_get(obj, name);
-}
-
-static VALUE
-set_struct_ptr(VALUE obj, VALUE klass, const char *struct_name, VALUE value, const char *name, off_t offset)
-{
-  char *ptr = (char*)DATA_PTR(obj) + offset;
-  if (NIL_P(value)){
-    rb_iv_set(obj, name, value);
-    *(CK_VOID_PTR*)ptr = NULL_PTR;
-    return value;
-  }
-  if (!rb_obj_is_kind_of(value, klass))
-    rb_raise(rb_eArgError, "arg must be a PKCS11::%s", struct_name);
-  *(CK_VOID_PTR*)ptr = DATA_PTR(value);
-  rb_iv_set(obj, name, value);
-  return value;
-}
-
-#define OFFSET_OF(s, f) ((off_t)((char*)&(((s*)0)->f) - (char*)0))
-#define SIZE_OF(s, f) (sizeof(((s*)0)->f))
-
-#define PKCS11_IMPLEMENT_ALLOCATOR(s) \
-static VALUE s##_s_alloc(VALUE self){ \
-  s *info; \
-  VALUE obj = Data_Make_Struct(self, s, 0, -1, info); \
-  return obj; \
-} \
-static VALUE c##s##_to_s(VALUE self){ \
-  return rb_str_new(DATA_PTR(self), sizeof(s)); \
-} \
-static VALUE c##s##_members(VALUE self){ \
-  return a##s##_members; \
-}
-
-#define PKCS11_IMPLEMENT_STRUCT_WITH_ALLOCATOR(s) \
-static VALUE c##s;\
-static VALUE a##s##_members;\
-PKCS11_IMPLEMENT_ALLOCATOR(s);
-
-#define PKCS11_IMPLEMENT_STRING_ACCESSOR(s, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_string(o, OFFSET_OF(s, f), SIZE_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_string(o, v, OFFSET_OF(s, f), SIZE_OF(s, f)); \
-}
-
-#define PKCS11_IMPLEMENT_ULONG_ACCESSOR(s, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_ulong(o, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_ulong(o, v, OFFSET_OF(s, f)); \
-}
-
-#define PKCS11_IMPLEMENT_BYTE_ACCESSOR(s, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_byte(o, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_byte(o, v, OFFSET_OF(s, f)); \
-}
-
-#define PKCS11_IMPLEMENT_ULONG_PTR_ACCESSOR(s, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_ulong_ptr(o, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_ulong_ptr(o, v, #f, OFFSET_OF(s, f)); \
-}
-
-#define PKCS11_IMPLEMENT_HANDLE_ACCESSOR(s, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_handle(o, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_handle(o, v, OFFSET_OF(s, f)); \
-}
-
-#define PKCS11_IMPLEMENT_BOOL_ACCESSOR(s, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_bool(o, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_bool(o, v, OFFSET_OF(s, f)); \
-}
-
-#define PKCS11_IMPLEMENT_STRING_PTR_ACCESSOR(s, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_string_ptr(o, #f, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_string_ptr(o, v, #f, OFFSET_OF(s, f)); \
-}
-
-#define PKCS11_IMPLEMENT_STRING_PTR_LEN_ACCESSOR(s, f, l) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_string_ptr_len(o, #f, OFFSET_OF(s, f), OFFSET_OF(s, l)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_string_ptr_len(o, v, #f, OFFSET_OF(s, f), OFFSET_OF(s, l)); \
-}
-
-#define PKCS11_IMPLEMENT_STRUCT_ACCESSOR(s, k, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_struct_inline(o, c##k, #f, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_struct_inline(o, c##k, #k, v, #f, OFFSET_OF(s, f), sizeof(k)); \
-}
-
-#define PKCS11_IMPLEMENT_STRUCT_PTR_ACCESSOR(s, k, f) \
-static VALUE c##s##_get_##f(VALUE o){ \
-  return get_struct_ptr(o, c##k, #f, OFFSET_OF(s, f)); \
-} \
-static VALUE c##s##_set_##f(VALUE o, VALUE v){ \
-  return set_struct_ptr(o, c##k, #k, v, #f, OFFSET_OF(s, f)); \
-}
-
-///////////////////////////////////////
-
 #include "pk11_struct_impl.inc"
 
 ///////////////////////////////////////
@@ -1823,28 +1518,6 @@ cCK_MECHANISM_set_pParameter(VALUE self, VALUE value)
   return value;
 }
 
-///////////////////////////////////////
-
-#define PKCS11_DEFINE_METHOD(name, args) \
-  rb_define_method(cPKCS11, #name, pkcs11_##name, args);
-
-#define PKCS11_DEFINE_STRUCT(s) \
-  do { \
-    c##s = rb_define_class_under(mPKCS11, #s, cCStruct); \
-    a##s##_members = rb_ary_new(); \
-    rb_define_alloc_func(c##s, s##_s_alloc); \
-    rb_define_const(c##s, "SIZEOF_STRUCT", ULONG2NUM(sizeof(s))); \
-    rb_define_method(c##s, "to_s", c##s##_to_s, 0); \
-    rb_define_method(c##s, "members", c##s##_members, 0); \
-    rb_iv_set(c##s, "members", a##s##_members); \
-  } while(0)
-
-#define PKCS11_DEFINE_MEMBER(s, f) \
-  do { \
-    rb_define_method(c##s, #f, c##s##_get_##f, 0); \
-    rb_define_method(c##s, #f "=", c##s##_set_##f, 1); \
-    rb_ary_push(a##s##_members, rb_str_new2(#f)); \
-  } while(0)
 
 void
 Init_pkcs11_ext()