From 8bb3a4f4d03ad5cb219498725e5254dda688d88f Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Michael=20Mur=C3=A9?= <batolettre@gmail.com>
Date: Thu, 12 Dec 2024 16:04:31 +0100
Subject: [PATCH] expose secretbox, notably for the GenerateKey() function that
 should be public

---
 pkg/meta/meta.go                                       | 10 +++++-----
 pkg/{meta/internal/crypto => secretbox}/secretbox.go   |  2 +-
 .../internal/crypto => secretbox}/secretbox_test.go    |  2 +-
 3 files changed, 7 insertions(+), 7 deletions(-)
 rename pkg/{meta/internal/crypto => secretbox}/secretbox.go (99%)
 rename pkg/{meta/internal/crypto => secretbox}/secretbox_test.go (99%)

diff --git a/pkg/meta/meta.go b/pkg/meta/meta.go
index 9b0e79f..bf12815 100644
--- a/pkg/meta/meta.go
+++ b/pkg/meta/meta.go
@@ -10,8 +10,8 @@ import (
 	"github.com/ipld/go-ipld-prime"
 	"github.com/ipld/go-ipld-prime/printer"
 
-	"github.com/ucan-wg/go-ucan/pkg/meta/internal/crypto"
 	"github.com/ucan-wg/go-ucan/pkg/policy/literal"
+	"github.com/ucan-wg/go-ucan/pkg/secretbox"
 )
 
 var ErrNotFound = errors.New("key not found in meta")
@@ -63,7 +63,7 @@ func (m *Meta) GetEncryptedString(key string, encryptionKey []byte) (string, err
 		return "", err
 	}
 
-	decrypted, err := crypto.DecryptStringWithKey(v, encryptionKey)
+	decrypted, err := secretbox.DecryptStringWithKey(v, encryptionKey)
 	if err != nil {
 		return "", err
 	}
@@ -111,7 +111,7 @@ func (m *Meta) GetEncryptedBytes(key string, encryptionKey []byte) ([]byte, erro
 		return nil, err
 	}
 
-	decrypted, err := crypto.DecryptStringWithKey(v, encryptionKey)
+	decrypted, err := secretbox.DecryptStringWithKey(v, encryptionKey)
 	if err != nil {
 		return nil, err
 	}
@@ -157,12 +157,12 @@ func (m *Meta) AddEncrypted(key string, val any, encryptionKey []byte) error {
 
 	switch val := val.(type) {
 	case string:
-		encrypted, err = crypto.EncryptWithKey([]byte(val), encryptionKey)
+		encrypted, err = secretbox.EncryptWithKey([]byte(val), encryptionKey)
 		if err != nil {
 			return err
 		}
 	case []byte:
-		encrypted, err = crypto.EncryptWithKey(val, encryptionKey)
+		encrypted, err = secretbox.EncryptWithKey(val, encryptionKey)
 		if err != nil {
 			return err
 		}
diff --git a/pkg/meta/internal/crypto/secretbox.go b/pkg/secretbox/secretbox.go
similarity index 99%
rename from pkg/meta/internal/crypto/secretbox.go
rename to pkg/secretbox/secretbox.go
index 690be7e..227a333 100644
--- a/pkg/meta/internal/crypto/secretbox.go
+++ b/pkg/secretbox/secretbox.go
@@ -1,4 +1,4 @@
-package crypto
+package secretbox
 
 import (
 	"crypto/rand"
diff --git a/pkg/meta/internal/crypto/secretbox_test.go b/pkg/secretbox/secretbox_test.go
similarity index 99%
rename from pkg/meta/internal/crypto/secretbox_test.go
rename to pkg/secretbox/secretbox_test.go
index d87f860..df8ab89 100644
--- a/pkg/meta/internal/crypto/secretbox_test.go
+++ b/pkg/secretbox/secretbox_test.go
@@ -1,4 +1,4 @@
-package crypto
+package secretbox
 
 import (
 	"bytes"