jmug/ccclip
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

Be explicit abot files when managing keys.

Browse source
This commit is contained in:
Mariano Uvalle 2023-11-12 06:58:55 +00:00
parent 39798f50f7
commit 8fa3d44d67
3 changed files with 10 additions and 10 deletions
Download patch file Download diff file Expand all files Collapse all files

8
internal/configfile/config.go
View file

@ -55,20 +55,20 @@ func Write(c ConfigFile) error {
func LoadPrivateKey() (*ecdh.PrivateKey, error) { func LoadPrivateKey() (*ecdh.PrivateKey, error) {
fp := path.Join(Path, PrivateKeyFileName) fp := path.Join(Path, PrivateKeyFileName)
return crypto.LoadPrivateKey(fp) return crypto.LoadPrivateKeyFromFile(fp)
} }
func LoadPublicKey() (*ecdh.PublicKey, error) { func LoadPublicKey() (*ecdh.PublicKey, error) {
fp := path.Join(Path, PublicKeyFileName) fp := path.Join(Path, PublicKeyFileName)
return crypto.LoadPublicKey(fp) return crypto.LoadPublicKeyFromFile(fp)
} }
func SavePrivateKey(k *ecdh.PrivateKey) error { func SavePrivateKey(k *ecdh.PrivateKey) error {
fp := path.Join(Path, PrivateKeyFileName) fp := path.Join(Path, PrivateKeyFileName)
return crypto.SavePrivateKey(fp, k) return crypto.SavePrivateKeyToFile(fp, k)
} }
func SavePublicKey(k *ecdh.PublicKey) error { func SavePublicKey(k *ecdh.PublicKey) error {
fp := path.Join(Path, PublicKeyFileName) fp := path.Join(Path, PublicKeyFileName)
return crypto.SavePublicKey(fp, k) return crypto.SavePublicKeyToFile(fp, k)
} }

4
internal/server/server.go
View file

@ -37,11 +37,11 @@ type controller struct {
func newHttpHandler() http.Handler { func newHttpHandler() http.Handler {
r := mux.NewRouter() r := mux.NewRouter()
pbk, err := crypto.LoadPublicKey(config.Default.PublicKeyPath) pbk, err := crypto.LoadPublicKeyFromFile(config.Default.PublicKeyPath)
if err != nil { if err != nil {
panic("could not load server's public key") panic("could not load server's public key")
} }
pvk, err := crypto.LoadPrivateKey(config.Default.PrivateKeyPath) pvk, err := crypto.LoadPrivateKeyFromFile(config.Default.PrivateKeyPath)
if err != nil { if err != nil {
panic("could not load server's private key") panic("could not load server's private key")
} }

8
pkg/crypto/keys.go
View file

@ -80,7 +80,7 @@ func PublicKeyFromBytes(keyBytes []byte) *ecdh.PublicKey {
return key return key
} }
func LoadPrivateKey(fp string) (*ecdh.PrivateKey, error) { func LoadPrivateKeyFromFile(fp string) (*ecdh.PrivateKey, error) {
var kb []byte var kb []byte
var err error var err error
if os.Getenv("CCCLIP_LOAD_RAW_KEYS") == "" { if os.Getenv("CCCLIP_LOAD_RAW_KEYS") == "" {
@ -96,7 +96,7 @@ func LoadPrivateKey(fp string) (*ecdh.PrivateKey, error) {
return PrivateKeyFromBytes(kb), nil return PrivateKeyFromBytes(kb), nil
} }
func LoadPublicKey(fp string) (*ecdh.PublicKey, error) { func LoadPublicKeyFromFile(fp string) (*ecdh.PublicKey, error) {
var kb []byte var kb []byte
var err error var err error
if os.Getenv("CCCLIP_LOAD_RAW_KEYS") == "" { if os.Getenv("CCCLIP_LOAD_RAW_KEYS") == "" {
@ -112,11 +112,11 @@ func LoadPublicKey(fp string) (*ecdh.PublicKey, error) {
return PublicKeyFromBytes(kb), nil return PublicKeyFromBytes(kb), nil
} }
func SavePrivateKey(fp string, k *ecdh.PrivateKey) error { func SavePrivateKeyToFile(fp string, k *ecdh.PrivateKey) error {
return saveKey(fp, k.Bytes(), privateKeyFileMode) return saveKey(fp, k.Bytes(), privateKeyFileMode)
} }
func SavePublicKey(fp string, k *ecdh.PublicKey) error { func SavePublicKeyToFile(fp string, k *ecdh.PublicKey) error {
return saveKey(fp, k.Bytes(), publicKeyFileMode) return saveKey(fp, k.Bytes(), publicKeyFileMode)
} }