From 4232c638652214d1b6c8f10baefaf64ba25e2192 Mon Sep 17 00:00:00 2001 From: Ted Unangst Date: Wed, 17 Jul 2019 16:33:38 -0400 Subject: [PATCH] try to support implemenations that put the key object in a seperate place --- fun.go | 9 ++++++--- 1 file changed, 6 insertions(+), 3 deletions(-) diff --git a/fun.go b/fun.go index 75ce1f4..ab24886 100644 --- a/fun.go +++ b/fun.go @@ -457,13 +457,16 @@ func zaggy(keyname string) (key *rsa.PublicKey) { log.Printf("error getting %s pubkey: %s", keyname, err) return } - var ok bool - data, ok = j.FindString([]string{"publicKey", "publicKeyPem"}) + keyobj, ok := j.GetMap("publicKey") + if ok { + j = keyobj + } + data, ok = j.GetString("publicKeyPem") if !ok { log.Printf("error finding %s pubkey", keyname) return } - _, ok = j.FindString([]string{"publicKey", "owner"}) + _, ok = j.GetString("owner") if !ok { log.Printf("error finding %s pubkey owner", keyname) return