dirk
/
honk
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

try to support implemenations that put the key object in a seperate place

This commit is contained in:
Ted Unangst 2019-07-17 16:33:38 -04:00
parent 5b10e20388
commit 4232c63865
1 changed files with 6 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

9
fun.go
View File

@ -457,13 +457,16 @@ func zaggy(keyname string) (key *rsa.PublicKey) {
log.Printf("error getting %s pubkey: %s", keyname, err) log.Printf("error getting %s pubkey: %s", keyname, err)
return return
} }
var ok bool keyobj, ok := j.GetMap("publicKey")
data, ok = j.FindString([]string{"publicKey", "publicKeyPem"}) if ok {
j = keyobj
}
data, ok = j.GetString("publicKeyPem")
if !ok { if !ok {
log.Printf("error finding %s pubkey", keyname) log.Printf("error finding %s pubkey", keyname)
return return
} }
_, ok = j.FindString([]string{"publicKey", "owner"}) _, ok = j.GetString("owner")
if !ok { if !ok {
log.Printf("error finding %s pubkey owner", keyname) log.Printf("error finding %s pubkey owner", keyname)
return return