crypto: Merge with security packagerefactor

4 files changed, 4 insertions, 10 deletions

diff --git a/security/cache.go b/crypto/cache.go
index d0c60b1..1e7bb60 100644
--- a/security/cache.go
+++ b/crypto/cache.go
@@ -17,7 +17,7 @@
  * the License.
  */
 
-package security
+package crypto
 
 import (
 	"log"
diff --git a/crypto/key.go b/crypto/key.go
index 9bf9098..19fb30c 100644
--- a/crypto/key.go
+++ b/crypto/key.go
@@ -41,7 +41,6 @@ import (
 	"golang.org/x/sys/unix"
 
 	"github.com/google/fscrypt/metadata"
-	"github.com/google/fscrypt/security"
 	"github.com/google/fscrypt/util"
 )
 
@@ -267,7 +266,7 @@ func InsertPolicyKey(key *Key, description string, target *user.User) error {
 	fscryptKey.Size = metadata.PolicyKeyLen
 	copy(fscryptKey.Raw[:], key.data)
 
-	return security.InsertKey(payload.data, description, target)
+	return InsertKey(payload.data, description, target)
 }
 
 var (
diff --git a/security/keyring.go b/crypto/keyring.go
index 7ce163e..9a82f80 100644
--- a/security/keyring.go
+++ b/crypto/keyring.go
@@ -17,7 +17,7 @@
  * the License.
  */
 
-package security
+package crypto
 
 import (
 	"fmt"
diff --git a/security/privileges.go b/crypto/privileges.go
index 7d69da9..c57fd30 100644
--- a/security/privileges.go
+++ b/crypto/privileges.go
@@ -17,12 +17,7 @@
  * the License.
  */
 
-// Package security manages:
-//  - Cache clearing (cache.go)
-//  - Keyring Operations (keyring.go)
-//  - Privilege manipulation (privileges.go)
-//  - Maintaining the link between the root and user keyrings.
-package security
+package crypto
 
 import (
 	"log"