aboutsummaryrefslogtreecommitdiff
path: root/tools
diff options
context:
space:
mode:
authorckl <ckl@google.com>2022-11-09 23:57:20 -0800
committerCopybara-Service <copybara-worker@google.com>2022-11-09 23:58:25 -0800
commit234ac31b690cdfbf678b3388f89d42e3766e903c (patch)
treeeca5d28d75b0a225526f28ca37cc534a31a62bd1 /tools
parent75cc1276e2ac9ee78d1988d035c170fb12b279b6 (diff)
downloadtink-234ac31b690cdfbf678b3388f89d42e3766e903c.tar.gz
Migrate to CreateKMSEnvelopeAEADKeyTemplate().
PiperOrigin-RevId: 487449153
Diffstat (limited to 'tools')
-rw-r--r--tools/testing/go/generate_envelope_keyset.go16
1 files changed, 12 insertions, 4 deletions
diff --git a/tools/testing/go/generate_envelope_keyset.go b/tools/testing/go/generate_envelope_keyset.go
index 24f77cd0f..e8011b425 100644
--- a/tools/testing/go/generate_envelope_keyset.go
+++ b/tools/testing/go/generate_envelope_keyset.go
@@ -58,7 +58,7 @@ func main() {
kms := os.Args[2]
dek := os.Args[3]
var dekT *tinkpb.KeyTemplate
- var kh *keyset.Handle
+ var handle *keyset.Handle
var b bytes.Buffer
switch strings.ToUpper(dek) {
case "AES128_GCM":
@@ -75,7 +75,11 @@ func main() {
log.Fatal(err)
}
registry.RegisterKMSClient(gcpclient)
- kh, err = keyset.NewHandle(aead.KMSEnvelopeAEADKeyTemplate(gcpURI, dekT))
+ template, err := aead.CreateKMSEnvelopeAEADKeyTemplate(gcpURI, dekT)
+ if err != nil {
+ log.Fatal(err)
+ }
+ handle, err = keyset.NewHandle(template)
if err != nil {
log.Fatal(err)
}
@@ -85,14 +89,18 @@ func main() {
log.Fatal(err)
}
registry.RegisterKMSClient(awsclient)
- kh, err = keyset.NewHandle(aead.KMSEnvelopeAEADKeyTemplate(awsURI, dekT))
+ template, err := aead.CreateKMSEnvelopeAEADKeyTemplate(awsURI, dekT)
+ if err != nil {
+ log.Fatal(err)
+ }
+ handle, err = keyset.NewHandle(template)
if err != nil {
log.Fatal(err)
}
default:
log.Fatalf("KMS %s, is not supported. Expecting AWS or GCP", kms)
}
- ks := insecurecleartextkeyset.KeysetMaterial(kh)
+ ks := insecurecleartextkeyset.KeysetMaterial(handle)
h, err := insecurecleartextkeyset.Read(&keyset.MemReaderWriter{Keyset: ks})
if err != nil {
log.Fatal(err)