Make Ctx an interface

Refs miekg#144
namecoin · Nov 3, 2022 · b96c85e · b96c85e
1 parent 0437106
commit b96c85e
Show file tree

Hide file tree

Showing 7 changed files with 160 additions and 90 deletions.
diff --git a/p11/module.go b/p11/module.go
@@ -100,7 +100,7 @@ func OpenModule(path string) (Module, error) {
 
 // Module represents a PKCS#11 module, and can be used to create Sessions.
 type Module struct {
-	ctx *pkcs11.Ctx
+	ctx pkcs11.Ctx
 }
 
 // Info returns general information about the module.

diff --git a/p11/session.go b/p11/session.go
@@ -58,7 +58,7 @@ type Session interface {
 
 type sessionImpl struct {
 	sync.Mutex
-	ctx    *pkcs11.Ctx
+	ctx    pkcs11.Ctx
 	handle pkcs11.SessionHandle
 }
 

diff --git a/p11/slot.go b/p11/slot.go
@@ -4,7 +4,7 @@ import "github.com/miekg/pkcs11"
 
 // Slot represents a slot that may hold a token.
 type Slot struct {
-	ctx *pkcs11.Ctx
+	ctx pkcs11.Ctx
 	id  uint
 }
 

diff --git a/parallel_test.go b/parallel_test.go
@@ -48,7 +48,7 @@ func init() {
 	os.Setenv("SOFTHSM2_CONF", wd+"/softhsm2.conf")
 }
 
-func initPKCS11Context(modulePath string) (*Ctx, error) {
+func initPKCS11Context(modulePath string) (Ctx, error) {
 	context := New(modulePath)
 
 	if context == nil {
@@ -59,7 +59,7 @@ func initPKCS11Context(modulePath string) (*Ctx, error) {
 	return context, err
 }
 
-func getSlot(p *Ctx, label string) (uint, error) {
+func getSlot(p Ctx, label string) (uint, error) {
 	slots, err := p.GetSlotList(true)
 	if err != nil {
 		return 0, err
@@ -80,7 +80,7 @@ func getSlot(p *Ctx, label string) (uint, error) {
 	return 0, fmt.Errorf("Slot not found: %s", label)
 }
 
-func getPrivateKey(context *Ctx, session SessionHandle, label string) (ObjectHandle, error) {
+func getPrivateKey(context Ctx, session SessionHandle, label string) (ObjectHandle, error) {
 	var noKey ObjectHandle
 	template := []*Attribute{
 		NewAttribute(CKA_CLASS, CKO_PRIVATE_KEY),
@@ -105,12 +105,12 @@ func getPrivateKey(context *Ctx, session SessionHandle, label string) (ObjectHan
 }
 
 type signer struct {
-	context    *Ctx
+	context    Ctx
 	session    SessionHandle
 	privateKey ObjectHandle
 }
 
-func makeSigner(context *Ctx) (*signer, error) {
+func makeSigner(context Ctx) (*signer, error) {
 	slot, err := getSlot(context, tokenLabel)
 	if err != nil {
 		return nil, err

diff --git a/params_test.go b/params_test.go
@@ -11,7 +11,7 @@ import (
 const notFound = 0xffffffff
 
 // test whether mech is available; skip the test if it isn't
-func needMech(t *testing.T, p *Ctx, sh SessionHandle, mech uint) {
+func needMech(t *testing.T, p Ctx, sh SessionHandle, mech uint) {
 	slots, err := p.GetSlotList(true)
 	if err != nil {
 		t.Fatal("GetSlotList:", err)
@@ -27,7 +27,7 @@ func needMech(t *testing.T, p *Ctx, sh SessionHandle, mech uint) {
 	t.Skipf("skipping test; mech 0x%X not supported by softhsm", mech)
 }
 
-func findObject(t *testing.T, p *Ctx, sh SessionHandle, class uint, label string) ObjectHandle {
+func findObject(t *testing.T, p Ctx, sh SessionHandle, class uint, label string) ObjectHandle {
 	template := []*Attribute{
 		NewAttribute(CKA_CLASS, class),
 		NewAttribute(CKA_LABEL, label),
@@ -49,7 +49,7 @@ func findObject(t *testing.T, p *Ctx, sh SessionHandle, class uint, label string
 }
 
 // generate a rsa key if it doesn't exist
-func getRSA(t *testing.T, p *Ctx, sh SessionHandle) (pub, priv ObjectHandle) {
+func getRSA(t *testing.T, p Ctx, sh SessionHandle) (pub, priv ObjectHandle) {
 	pub = findObject(t, p, sh, CKO_PUBLIC_KEY, "paramstest")
 	priv = findObject(t, p, sh, CKO_PUBLIC_KEY, "paramstest")
 	if pub == notFound || priv == notFound {