kayos/zgrab2
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #164 from zmap/jb/zcrypto-update-fixes

Browse Source 
Fix for zcrypto updates
This commit is contained in:
justinbastress 2018-09-05 18:03:06 -04:00 committed by GitHub
commit 1461f2d48d
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
lib/ssh/keys.go
View File

@ -381,8 +381,7 @@ func (r *dsaPublicKey) Type() string {
}
func (r *dsaPublicKey) MarshalJSON() ([]byte, error) {
temp := make(map[string]interface{})
ztoolsX509.AddDSAPublicKeyToKeyMap(temp, (*dsa.PublicKey)(r))
temp := ztoolsX509.GetDSAPublicKeyJSON((*dsa.PublicKey)(r))
return json.Marshal(temp)
}
@ -489,8 +488,7 @@ func (key *ecdsaPublicKey) Type() string {
}
func (key *ecdsaPublicKey) MarshalJSON() ([]byte, error) {
temp := make(map[string]interface{})
ztoolsX509.AddECDSAPublicKeyToKeyMap(temp, (*ecdsa.PublicKey)(key))
temp := ztoolsX509.GetECDSAPublicKeyJSON((*ecdsa.PublicKey)(key))
return json.Marshal(temp)
}