kirillius
/
Cloak
mirror of https://github.com/cbeuw/Cloak
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Unbreak server keygen

This commit is contained in:
Andy Wang 2020-04-09 00:37:59 +01:00
parent 86095ba5e6
commit 140c8022f5
1 changed files with 3 additions and 2 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

5
cmd/ck-server/keygen.go
View File

@ -2,6 +2,7 @@ package main
import ( import (
"crypto/rand" "crypto/rand"
"encoding/base64"
"github.com/cbeuw/Cloak/internal/ecdh" "github.com/cbeuw/Cloak/internal/ecdh"
"github.com/cbeuw/Cloak/internal/util" "github.com/cbeuw/Cloak/internal/util"
) )
@ -9,12 +10,12 @@ import (
func generateUID() string { func generateUID() string {
UID := make([]byte, 16) UID := make([]byte, 16)
util.CryptoRandRead(UID) util.CryptoRandRead(UID)
return b64(UID) return base64.StdEncoding.EncodeToString(UID)
} }
func generateKeyPair() (string, string) { func generateKeyPair() (string, string) {
staticPv, staticPub, _ := ecdh.GenerateKey(rand.Reader) staticPv, staticPub, _ := ecdh.GenerateKey(rand.Reader)
marshPub := ecdh.Marshal(staticPub) marshPub := ecdh.Marshal(staticPub)
marshPv := staticPv.(*[32]byte)[:] marshPv := staticPv.(*[32]byte)[:]
return b64(marshPub), b64(marshPv) return base64.StdEncoding.EncodeToString(marshPub), base64.StdEncoding.EncodeToString(marshPv)
} }