Merge remote-tracking branch 'origin/master' into envelope

2020-10-15 14:29:48 +02:00
parent 3c152dc5bd d9a156298b
commit 0988471a16
1264 changed files with 24235 additions and 43996 deletions
@@ -0,0 +1,16 @@
+package securedata
+
+import (
+	"github.com/grafana/grafana/pkg/setting"
+	"github.com/grafana/grafana/pkg/util"
+)
+
+type SecureData []byte
+
+func Encrypt(data []byte) (SecureData, error) {
+	return util.Encrypt(data, setting.SecretKey)
+}
+
+func (s SecureData) Decrypt() ([]byte, error) {
+	return util.Decrypt(s, setting.SecretKey)
+}