From 128d07f148dcd6accc368673c3fe66ee0cef460d Mon Sep 17 00:00:00 2001
From: Mariano Cano <mariano.cano@gmail.com>
Date: Mon, 1 Feb 2021 14:17:39 -0800
Subject: [PATCH] Use new GetEncoded method.

---
 kms/pkcs11/pkcs11.go | 11 ++---------
 1 file changed, 2 insertions(+), 9 deletions(-)

diff --git a/kms/pkcs11/pkcs11.go b/kms/pkcs11/pkcs11.go
index 9ac806d8..df1e3d10 100644
--- a/kms/pkcs11/pkcs11.go
+++ b/kms/pkcs11/pkcs11.go
@@ -248,10 +248,7 @@ func parseObject(rawuri string) ([]byte, []byte, error) {
 	if err != nil {
 		return nil, nil, err
 	}
-	id, err := u.GetHex("id")
-	if err != nil {
-		return nil, nil, err
-	}
+	id := u.GetEncoded("id")
 	object := u.Get("object")
 	if len(id) == 0 && object == "" {
 		return nil, nil, errors.Errorf("key with uri %s is not valid, id or object are required", rawuri)
@@ -320,11 +317,7 @@ func findCertificate(ctx P11, rawuri string) (*x509.Certificate, error) {
 	if err != nil {
 		return nil, err
 	}
-	id, err := u.GetHex("id")
-	if err != nil {
-		return nil, err
-	}
-	object, serial := u.Get("object"), u.Get("serial")
+	id, object, serial := u.GetEncoded("id"), u.Get("object"), u.Get("serial")
 	if len(id) == 0 && object == "" && serial == "" {
 		return nil, errors.Errorf("key with uri %s is not valid, id, object or serial are required", rawuri)
 	}