fic/server
Archived
1
0
Fork 0
Code Issues Pull requests 10 Releases Wiki Activity

Fix typos

Browse source
This commit is contained in:
nemunaire 2020-01-18 23:45:28 +01:00
commit 084d39f6cf
5 changed files with 12 additions and 12 deletions
Download patch file Download diff file Expand all files Collapse all files

12
admin/pki/ca.go
View file

@ -75,18 +75,18 @@ func GenerateCA(notBefore time.Time, notAfter time.Time) error {
func LoadCA() (priv ecdsa.PrivateKey, ca x509.Certificate, err error) {
// Load certificate
if fd, errr := os.Open(CACertPath()); err != nil {
if fd, errr := os.Open(CACertPath()); errr != nil {
return priv, ca, errr
} else {
defer fd.Close()
if cert, errr := ioutil.ReadAll(fd); err != nil {
if cert, errr := ioutil.ReadAll(fd); errr != nil {
return priv, ca, errr
} else {
block, _ := pem.Decode(cert)
if block == nil || block.Type != "CERTIFICATE" {
return priv, ca, errors.New("failed to decode PEM block containing certificate")
}
if catmp, errr := x509.ParseCertificate(block.Bytes); err != nil {
if catmp, errr := x509.ParseCertificate(block.Bytes); errr != nil {
return priv, ca, errr
} else if catmp == nil {
return priv, ca, errors.New("failed to parse certificate")
@ -97,11 +97,11 @@ func LoadCA() (priv ecdsa.PrivateKey, ca x509.Certificate, err error) {
}
// Load private key
if fd, errr := os.Open(CAPrivkeyPath()); err != nil {
if fd, errr := os.Open(CAPrivkeyPath()); errr != nil {
return priv, ca, errr
} else {
defer fd.Close()
if privkey, errr := ioutil.ReadAll(fd); err != nil {
if privkey, errr := ioutil.ReadAll(fd); errr != nil {
return priv, ca, errr
} else {
block, _ := pem.Decode(privkey)
@ -119,7 +119,7 @@ func LoadCA() (priv ecdsa.PrivateKey, ca x509.Certificate, err error) {
decrypted_der = block.Bytes
}
if tmppriv, errr := x509.ParseECPrivateKey(decrypted_der); err != nil {
if tmppriv, errr := x509.ParseECPrivateKey(decrypted_der); errr != nil {
return priv, ca, errr
} else if tmppriv == nil {
return priv, ca, errors.New("failed to parse private key")

2
admin/pki/team.go
View file

@ -17,7 +17,7 @@ func GetCertificateAssociation(serial uint64) string {
}
func GetAssociations(dirname string) (assocs []string, err error) {
if ds, errr := ioutil.ReadDir(dirname); err != nil {
if ds, errr := ioutil.ReadDir(dirname); errr != nil {
return nil, errr
} else {
for _, d := range ds {