tRemove useless bool returns from Save{Pub,Priv}Rsa in crypto_rsa.go - tordam - A library for peer discovery inside the Tor network
HTML git clone https://git.parazyd.org/tordam
DIR Log
DIR Files
DIR Refs
DIR README
DIR LICENSE
---
DIR commit 6ae6d0a4a59118debcf2c4d15c169ce24ab639b2
DIR parent 4476e4b3a62aa25d375bd1fde5a1087aff54d77c
HTML Author: parazyd <parazyd@dyne.org>
Date: Wed, 13 Dec 2017 01:02:43 +0100
Remove useless bool returns from Save{Pub,Priv}Rsa in crypto_rsa.go
Diffstat:
M cmd/dam-client/main.go | 2 +-
M pkg/damlib/crypto_rsa.go | 31 ++++++++++++++-----------------
2 files changed, 15 insertions(+), 18 deletions(-)
---
DIR diff --git a/cmd/dam-client/main.go b/cmd/dam-client/main.go
t@@ -111,7 +111,7 @@ func main() {
if _, err := os.Stat(lib.PrivKeyPath); os.IsNotExist(err) {
key, err := lib.GenRsa(lib.RsaBits)
lib.CheckError(err)
- _, err = lib.SavePrivRsa(lib.PrivKeyPath, key)
+ err = lib.SavePrivRsa(lib.PrivKeyPath, key)
lib.CheckError(err)
}
DIR diff --git a/pkg/damlib/crypto_rsa.go b/pkg/damlib/crypto_rsa.go
t@@ -33,19 +33,17 @@ func GenRsa(bitSize int) (*rsa.PrivateKey, error) {
// SavePubRsa saves a given RSA public key to a given filename.
// SavePubRsa takes the filename to write as a string, and the key as
-// rsa.PublicKey. It returns a boolean value and an error, depending on whether
-// it has failed or not.
-func SavePubRsa(filename string, pubkey rsa.PublicKey) (bool, error) {
- log.Printf("Writing pubkey to %s\n", filename)
- // FIXME: worry or not about creating the path if it doesn't exist?
+// rsa.PublicKey. It returns an error on failure, otherwise: nil
+func SavePubRsa(filename string, pubkey rsa.PublicKey) error {
+ log.Println("Writing RSA pubkey to", filename)
outfile, err := os.Create(filename)
defer outfile.Close()
if err != nil {
- return false, err
+ return err
}
asn1Bytes, err := asn1.Marshal(pubkey)
if err != nil {
- return false, err
+ return err
}
var pemkey = &pem.Block{
Type: "RSA PUBLIC KEY",
t@@ -53,26 +51,25 @@ func SavePubRsa(filename string, pubkey rsa.PublicKey) (bool, error) {
}
err = pem.Encode(outfile, pemkey)
if err != nil {
- return false, err
+ return err
}
err = outfile.Chmod(0400)
if err != nil {
- return false, err
+ return err
}
- return true, nil
+ return nil
}
// SavePrivRsa saves a given RSA private key to a given filename.
// SavePrivRsa takes the filename to write as a string, and the key as
-// *rsa.PrivateKey. It returns a boolean value and an error, depending on whether
-// it has failed or not.
-func SavePrivRsa(filename string, privkey *rsa.PrivateKey) (bool, error) {
+// *rsa.PrivateKey. It returns an error on failure, otherwise: nil
+func SavePrivRsa(filename string, privkey *rsa.PrivateKey) error {
log.Printf("Writing private key to %s\n", filename)
// FIXME: worry or not about creating the path if it doesn't exist?
outfile, err := os.Create(filename)
defer outfile.Close()
if err != nil {
- return false, err
+ return err
}
var pemkey = &pem.Block{
Type: "RSA PRIVATE KEY",
t@@ -80,13 +77,13 @@ func SavePrivRsa(filename string, privkey *rsa.PrivateKey) (bool, error) {
}
err = pem.Encode(outfile, pemkey)
if err != nil {
- return false, err
+ return err
}
err = outfile.Chmod(0400)
if err != nil {
- return false, err
+ return err
}
- return true, nil
+ return nil
}
// LoadRsaKeyFromFile loads a RSA private key from a given filename.