Merge pull request #164 from zmap/jb/zcrypto-update-fixes
Fix for zcrypto updates
This commit is contained in:
commit
1461f2d48d
@ -381,8 +381,7 @@ func (r *dsaPublicKey) Type() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (r *dsaPublicKey) MarshalJSON() ([]byte, error) {
|
func (r *dsaPublicKey) MarshalJSON() ([]byte, error) {
|
||||||
temp := make(map[string]interface{})
|
temp := ztoolsX509.GetDSAPublicKeyJSON((*dsa.PublicKey)(r))
|
||||||
ztoolsX509.AddDSAPublicKeyToKeyMap(temp, (*dsa.PublicKey)(r))
|
|
||||||
return json.Marshal(temp)
|
return json.Marshal(temp)
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -489,8 +488,7 @@ func (key *ecdsaPublicKey) Type() string {
|
|||||||
}
|
}
|
||||||
|
|
||||||
func (key *ecdsaPublicKey) MarshalJSON() ([]byte, error) {
|
func (key *ecdsaPublicKey) MarshalJSON() ([]byte, error) {
|
||||||
temp := make(map[string]interface{})
|
temp := ztoolsX509.GetECDSAPublicKeyJSON((*ecdsa.PublicKey)(key))
|
||||||
ztoolsX509.AddECDSAPublicKeyToKeyMap(temp, (*ecdsa.PublicKey)(key))
|
|
||||||
return json.Marshal(temp)
|
return json.Marshal(temp)
|
||||||
}
|
}
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user