octoleo/syncthing
1
0
Fork 0
mirror of https://github.com/octoleo/syncthing.git synced 2024-11-12 16:26:37 +00:00
Code Issues Packages Projects Releases Wiki Activity

Longer RSA key and stronger node ID hash (ref #23)

Browse Source
This commit is contained in:
Jakob Borg 2014-01-07 22:04:23 +01:00
parent 69ef4d261d
commit d4fe1400d2
1 changed files with 10 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

17
tls.go
View File

@ -3,7 +3,7 @@ package main
import ( import (
"crypto/rand" "crypto/rand"
"crypto/rsa" "crypto/rsa"
"crypto/sha1" "crypto/sha256"
"crypto/tls" "crypto/tls"
"crypto/x509" "crypto/x509"
"crypto/x509/pkix" "crypto/x509/pkix"
@ -12,11 +12,12 @@ import (
"math/big" "math/big"
"os" "os"
"path" "path"
"strings"
"time" "time"
) )
const ( const (
tlsRSABits = 2048 tlsRSABits = 3072
tlsName = "syncthing" tlsName = "syncthing"
) )
@ -25,13 +26,15 @@ func loadCert(dir string) (tls.Certificate, error) {
} }
func certId(bs []byte) string { func certId(bs []byte) string {
hf := sha1.New() hf := sha256.New()
hf.Write(bs) hf.Write(bs)
id := hf.Sum(nil) id := hf.Sum(nil)
return base32.StdEncoding.EncodeToString(id) return strings.Trim(base32.StdEncoding.EncodeToString(id), "=")
} }
func newCertificate(dir string) { func newCertificate(dir string) {
infoln("Generating RSA certificate and key...")
priv, err := rsa.GenerateKey(rand.Reader, tlsRSABits) priv, err := rsa.GenerateKey(rand.Reader, tlsRSABits)
fatalErr(err) fatalErr(err)
@ -47,7 +50,7 @@ func newCertificate(dir string) {
NotAfter: notAfter, NotAfter: notAfter,
KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature, KeyUsage: x509.KeyUsageKeyEncipherment | x509.KeyUsageDigitalSignature,
ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth}, ExtKeyUsage: []x509.ExtKeyUsage{x509.ExtKeyUsageServerAuth, x509.ExtKeyUsageClientAuth},
BasicConstraintsValid: true, BasicConstraintsValid: true,
} }
@ -58,11 +61,11 @@ func newCertificate(dir string) {
fatalErr(err) fatalErr(err)
pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes}) pem.Encode(certOut, &pem.Block{Type: "CERTIFICATE", Bytes: derBytes})
certOut.Close() certOut.Close()
okln("Created TLS certificate file") okln("Created RSA certificate file")
keyOut, err := os.OpenFile(path.Join(dir, "key.pem"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600) keyOut, err := os.OpenFile(path.Join(dir, "key.pem"), os.O_WRONLY|os.O_CREATE|os.O_TRUNC, 0600)
fatalErr(err) fatalErr(err)
pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)}) pem.Encode(keyOut, &pem.Block{Type: "RSA PRIVATE KEY", Bytes: x509.MarshalPKCS1PrivateKey(priv)})
keyOut.Close() keyOut.Close()
okln("Created TLS key file") okln("Created RSA key file")
} }