abc/GmSSL
1
0
Fork 0
mirror of https://github.com/guanzhi/GmSSL.git synced 2026-08-07 21:53:41 +08:00
Code Issues Packages Projects Releases Wiki Activity

bug fixed: no fixed order in map, which may cause GeneratePrivateKey throw an error.

Browse Source
This commit is contained in:
X-Hawk
2019-10-21 21:42:54 +08:00
parent a097e49719
commit eba487efd3
2 changed files with 13 additions and 9 deletions
Download Patch File Download Diff File Expand all files Collapse all files

10
go/gmssl/pkey.go
View File

@@ -667,7 +667,7 @@ type PrivateKey struct {
pkey *C.EVP_PKEY pkey *C.EVP_PKEY
} }
func GeneratePrivateKey(alg string, args map[string]string, eng *Engine) (*PrivateKey, error) { func GeneratePrivateKey(alg string, args [][2]string, eng *Engine) (*PrivateKey, error) {
calg := C.CString(alg) calg := C.CString(alg)
defer C.free(unsafe.Pointer(calg)) defer C.free(unsafe.Pointer(calg))
@@ -688,7 +688,9 @@ func GeneratePrivateKey(alg string, args map[string]string, eng *Engine) (*Priva
if 1 != C.EVP_PKEY_paramgen_init(ctx) { if 1 != C.EVP_PKEY_paramgen_init(ctx) {
return nil, GetErrors() return nil, GetErrors()
} }
for name, value := range args { for _, arg := range args {
name := arg[0]
value := arg[1]
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
cvalue := C.CString(value) cvalue := C.CString(value)
@@ -712,7 +714,9 @@ func GeneratePrivateKey(alg string, args map[string]string, eng *Engine) (*Priva
return nil, GetErrors() return nil, GetErrors()
} }
for name, value := range args { for _, arg := range args {
name := arg[0]
value := arg[1]
cname := C.CString(name) cname := C.CString(name)
defer C.free(unsafe.Pointer(cname)) defer C.free(unsafe.Pointer(cname))
cvalue := C.CString(value) cvalue := C.CString(value)

12
go/gmssltest/gmssltest.go
View File

@@ -149,9 +149,9 @@ func main() {
fmt.Println() fmt.Println()
/* private key */ /* private key */
rsa_args := map[string]string { rsa_args := [][2]string{
"rsa_keygen_bits": "2048", {"rsa_keygen_bits", "2048"},
"rsa_keygen_pubexp" : "65537", {"rsa_keygen_pubexp", "65537"},
} }
rsa, err := gmssl.GeneratePrivateKey("RSA", rsa_args, nil) rsa, err := gmssl.GeneratePrivateKey("RSA", rsa_args, nil)
@@ -175,9 +175,9 @@ func main() {
fmt.Println() fmt.Println()
/* SM2 key pair operations */ /* SM2 key pair operations */
sm2keygenargs := map[string]string { sm2keygenargs := [][2]string{
"ec_paramgen_curve": "sm2p256v1", {"ec_paramgen_curve", "sm2p256v1"},
"ec_param_enc": "named_curve", {"ec_param_enc", "named_curve"},
} }
sm2sk, _ := gmssl.GeneratePrivateKey("EC", sm2keygenargs, nil) sm2sk, _ := gmssl.GeneratePrivateKey("EC", sm2keygenargs, nil)
sm2sktxt, _ := sm2sk.GetText() sm2sktxt, _ := sm2sk.GetText()