at least it compiles...

Author: Eduardo

objects/application.go application.go

@@ -1,22 +1,19 @@
-package objects
+package main
 
 /*
-#include "../criptoki/pkcs11go.h"
+#include "pkcs11go.h"
 */
 import "C"
-import (
-	"dtc/core"
-)
 
 type Application struct {
 	Database TokenStorage
-	DTC      *core.DTC
+	DTC      *DTC
 	Slots    []*Slot
-	Config   *core.Config
+	Config   *Config
 }
 
 func NewApplication() (app *Application, err error) {
-	config, err := core.GetConfig()
+	config, err := GetConfig()
 	if err != nil {
 		return
 	}
@@ -30,7 +27,7 @@ func NewApplication() (app *Application, err error) {
 
 	for i, slotConf := range config.Criptoki.Slots {
 		slot := &Slot{
-			ID:          CSlotID(i),
+			ID:          C.CK_SLOT_ID(i),
 			Application: app,
 		}
 		var token *Token
@@ -42,7 +39,7 @@ func NewApplication() (app *Application, err error) {
 		slot.InsertToken(token)
 		slots[i] = slot
 	}
-	dtc, err := core.NewDTC(config.DTC)
+	dtc, err := NewDTC(config.DTC)
 	if err != nil {
 		return
 	}
@@ -55,7 +52,7 @@ func NewApplication() (app *Application, err error) {
 	return
 }
 
-func (app *Application) GetSessionSlot(handle CSessionHandle) (*Slot, error) {
+func (app *Application) GetSessionSlot(handle C.CK_SESSION_HANDLE) (*Slot, error) {
 	for _, slot := range app.Slots {
 		if slot.HasSession(handle) {
 			return slot, nil
@@ -64,7 +61,7 @@ func (app *Application) GetSessionSlot(handle CSessionHandle) (*Slot, error) {
 	return nil, NewError("Application.GetSessionSlot", "session not found", C.CKR_SESSION_HANDLE_INVALID)
 }
 
-func (app *Application) GetSession(handle CSessionHandle) (*Session, error) {
+func (app *Application) GetSession(handle C.CK_SESSION_HANDLE) (*Session, error) {
 	slot, err := app.GetSessionSlot(handle)
 	if err != nil {
 		return nil, err
@@ -76,7 +73,7 @@ func (app *Application) GetSession(handle CSessionHandle) (*Session, error) {
 	return session, nil
 }
 
-func (app *Application) GetSlot(id CSlotID) (*Slot, error) {
+func (app *Application) GetSlot(id C.CK_SLOT_ID) (*Slot, error) {
 	if int(id) < len(app.Slots) {
 		return nil, NewError("Application.GetSlot", "index out of bounds", C.CKR_SLOT_ID_INVALID)
 	}

objects/attribute.go attribute.go

@@ -1,9 +1,9 @@
-package objects
+package main
 
 /*
 #include <stdlib.h>
 #include <string.h>
-#include "../criptoki/pkcs11go.h"
+#include "pkcs11go.h"
 */
 import "C"
 import (
@@ -13,19 +13,19 @@ import (
 
 // An attribute related to a crypto object.
 type Attribute struct {
-	Type  CAttrType
+	Type  C.CK_ATTRIBUTE_TYPE
 	Value []byte
 }
 
 // A map of attributes
-type Attributes map[CAttrType]*Attribute
+type Attributes map[C.CK_ATTRIBUTE_TYPE]*Attribute
 
-func CToAttributes(pAttributes CAttrPointer, ulCount CULong) (Attributes, error) {
+func CToAttributes(pAttributes C.CK_ATTRIBUTE_PTR, ulCount C.CK_ULONG) (Attributes, error) {
 	if ulCount <= 0 {
 		return nil, NewError("CToAttributes", "cannot transform: ulcount is not greater than 0", C.CKR_BUFFER_TOO_SMALL)
 	}
 
-	cAttrSlice := (*[1 << 30]CAttr)(unsafe.Pointer(pAttributes))[:ulCount:ulCount]
+	cAttrSlice := (*[1 << 30]C.CK_ATTRIBUTE)(unsafe.Pointer(pAttributes))[:ulCount:ulCount]
 
 	attributes := make(Attributes, ulCount)
 	for _, cAttr := range cAttrSlice {
@@ -61,7 +61,7 @@ func (attributes Attributes) SetIfUndefined(attr *Attribute) bool {
 	return false
 }
 
-func CToAttribute(cAttr CAttr) *Attribute {
+func CToAttribute(cAttr C.CK_ATTRIBUTE) *Attribute {
 	attrType := cAttr._type
 	attrVal := C.GoBytes(unsafe.Pointer(cAttr.pValue), C.int(cAttr.ulValueLen))
 	return &Attribute{
@@ -70,14 +70,14 @@ func CToAttribute(cAttr CAttr) *Attribute {
 	}
 }
 
-func (attribute *Attribute) ToC(cDst CAttrPointer) error {
+func (attribute *Attribute) ToC(cDst C.CK_ATTRIBUTE_PTR) error {
 	if cDst.pValue == nil {
-		cDst.ulValueLen = CULong(len(attribute.Value))
+		cDst.ulValueLen = C.CK_ULONG(len(attribute.Value))
 		return nil
 	}
-	if cDst.ulValueLen >= CULong(len(attribute.Value)) {
+	if cDst.ulValueLen >= C.CK_ULONG(len(attribute.Value)) {
 		cValue := C.CBytes(attribute.Value)
-		cValueLen := CULong(len(attribute.Value))
+		cValueLen := C.CK_ULONG(len(attribute.Value))
 		cDst._type = attribute.Type
 		cDst.ulValueLen = cValueLen
 		C.memcpy(unsafe.Pointer(cDst.pValue), unsafe.Pointer(cValue), cValueLen)
@@ -94,7 +94,7 @@ func (attribute *Attribute) Equals(attribute2 *Attribute) bool {
 		bytes.Compare(attribute.Value, attribute2.Value) == 0
 }
 
-func (attributes Attributes) GetAttributeByType(cAttr CAttrType) (*Attribute, error) {
+func (attributes Attributes) GetAttributeByType(cAttr C.CK_ATTRIBUTE_TYPE) (*Attribute, error) {
 	attr, ok := attributes[cAttr]
 	if ok {
 		return attr, nil

build.sh

@@ -1 +1 @@
-cd criptoki && go build -o dtc.so -buildmode=c-shared -v
+go build -o dtc.so -buildmode=c-shared -v

core/config.go config.go

@@ -1,4 +1,4 @@
-package core
+package main
 
 import (
 	"fmt"

objects/connection.go connection.go

@@ -1,4 +1,4 @@
-package objects
+package main
 
 import (
 	"fmt"

criptoki/dtc.so

@@ -1,41 +1,43 @@
-package objects
+package main
 
 /*
-#include "../criptoki/pkcs11go.h"
+#include "pkcs11go.h"
 */
 import "C"
 import (
 	"bytes"
 	"unsafe"
 )
 
+type CryptoObjectType int
+
 const (
 	SessionObject CryptoObjectType = iota
 	TokenObject
 )
 
 // A cryptoObject related to a token.
 type CryptoObject struct {
-	Handle     CObjectHandle
+	Handle     C.CK_OBJECT_HANDLE
 	Type       CryptoObjectType
 	Attributes Attributes
 }
 
 // A map of cryptoobjects
 type CryptoObjects []*CryptoObject
 
-func CToCryptoObject(pAttributes CAttrPointer, ulCount CULong) (*CryptoObject, error) {
+func CToCryptoObject(pAttributes C.CK_ATTRIBUTE_PTR, ulCount C.CK_ULONG) (*CryptoObject, error) {
 	attrSlice, err := CToAttributes(pAttributes, ulCount)
 	if err != nil {
 		return nil, err
 	}
 	var coType CryptoObjectType
-	tokenAttr, ok := attrSlice[CToken]
+	tokenAttr, ok := attrSlice[C.CKA_TOKEN]
 	if !ok {
 		return nil, NewError("CToCryptoObject", "Token attribute not found", C.CKR_ATTRIBUTE_VALUE_INVALID)
 	}
-	isToken := CBool(tokenAttr.Value[0])
-	if isToken == CFalse {
+	isToken := C.CK_BBOOL(tokenAttr.Value[0])
+	if isToken == C.CK_FALSE {
 		coType = SessionObject
 	} else {
 		coType = TokenObject
@@ -81,26 +83,26 @@ func (object *CryptoObject) Equals(object2 *CryptoObject) bool {
 func (object *CryptoObject) Match(attrs Attributes) bool {
 	for _, theirAttr := range attrs {
 		ourAttr, ok := object.Attributes[theirAttr.Type]
-		if !ok || bytes.Compare(ourAttr.Value, theirAttr.Value) != 0 {
+		if !ok || bytes.Compare(ourAttr.Value, ourAttr.Value) != 0 {
 			return false
 		}
 	}
 	return true
 }
 
-func (object *CryptoObject) FindAttribute(attrType CAttrType) *Attribute {
+func (object *CryptoObject) FindAttribute(attrType C.CK_ATTRIBUTE_TYPE) *Attribute {
 	if attr, ok := object.Attributes[attrType]; ok {
 		return attr
 	}
 	return nil
 }
 
 // https://stackoverflow.com/questions/28925179/cgo-how-to-pass-struct-array-from-c-to-go#28933938
-func (object *CryptoObject) CopyAttributes(pTemplate CAttrPointer, ulCount CULong) error {
+func (object *CryptoObject) CopyAttributes(pTemplate C.CK_ATTRIBUTE_PTR, ulCount C.CK_ULONG) error {
 	if pTemplate == nil {
 		return NewError("CryptoObject.CopyAttributes", "got NULL pointer", C.CKR_ARGUMENTS_BAD)
 	}
-	templateSlice := (*[1 << 30]CAttr)(unsafe.Pointer(pTemplate))[:ulCount:ulCount]
+	templateSlice := (*[1 << 30]C.CK_ATTRIBUTE)(unsafe.Pointer(pTemplate))[:ulCount:ulCount]
 
 	for i := 0; i < len(templateSlice); i++ {
 		src := object.FindAttribute(templateSlice[i]._type)

criptoki/pkcs11.c

@@ -1,4 +1,4 @@
-package core
+package main
 
 import (
 	"dtc/network"

objects/crypto_object.go crypto_object.go

@@ -1,6 +1,6 @@
 /* Code generated by cmd/cgo; DO NOT EDIT. */
 
-/* package dtc/criptoki */
+/* package dtc */
 
 
 #line 1 "cgo-builtin-export-prolog"
@@ -21,6 +21,8 @@ typedef struct { const char *p; ptrdiff_t n; } _GoString_;
 
 #line 3 "pkcs11.go"
 
+#include <stdlib.h>
+#include <string.h>
 #include "pkcs11go.h"
 
 #line 1 "cgo-generated-wrapper"
@@ -136,6 +138,8 @@ extern CK_RV C_VerifyUpdate(CK_SESSION_HANDLE p0, CK_BYTE_PTR p1, CK_ULONG p2);
 
 extern CK_RV C_VerifyFinal(CK_SESSION_HANDLE p0, CK_BYTE_PTR p1, CK_ULONG p2);
 
+extern CK_RV C_DigestInit(CK_SESSION_HANDLE p0, CK_MECHANISM_PTR p1);
+
 extern CK_RV C_Digest(CK_SESSION_HANDLE p0, CK_BYTE_PTR p1, CK_ULONG p2, CK_BYTE_PTR p3, CK_ULONG_PTR p4);
 
 extern CK_RV C_SeedRandom(CK_SESSION_HANDLE p0, CK_BYTE_PTR p1, CK_ULONG p2);
@@ -172,8 +176,6 @@ extern CK_RV C_DecryptUpdate(CK_SESSION_HANDLE p0, CK_BYTE_PTR p1, CK_ULONG p2,
 
 extern CK_RV C_DecryptFinal(CK_SESSION_HANDLE p0, CK_BYTE_PTR p1, CK_ULONG_PTR p2);
 
-extern CK_RV C_DigestInit(CK_SESSION_HANDLE p0, CK_MECHANISM_PTR p1);
-
 extern CK_RV C_DigestUpdate(CK_SESSION_HANDLE p0, CK_BYTE_PTR p1, CK_ULONG p2);
 
 extern CK_RV C_DigestKey(CK_SESSION_HANDLE p0, CK_OBJECT_HANDLE p1);