Fix typos
This commit is contained in:
parent
08aa7d278c
commit
084d39f6cf
|
@ -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")
|
||||
|
|
|
@ -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 {
|
||||
|
|
|
@ -183,9 +183,9 @@ func CheckBufferHash(hash160 *hash.Hash, hash512 *hash.Hash, digest []byte) ([]b
|
|||
func checkFileHash(filePath string, digest []byte) (dgst []byte, size int64, err error) {
|
||||
if digest == nil {
|
||||
return []byte{}, 0, errors.New("No digest given.")
|
||||
} else if fi, errr := os.Stat(filePath); err != nil {
|
||||
} else if fi, errr := os.Stat(filePath); errr != nil {
|
||||
return []byte{}, 0, errr
|
||||
} else if fd, errr := os.Open(filePath); err != nil {
|
||||
} else if fd, errr := os.Open(filePath); errr != nil {
|
||||
return []byte{}, fi.Size(), errr
|
||||
} else {
|
||||
defer fd.Close()
|
||||
|
|
|
@ -70,11 +70,11 @@ func (e Exercice) GetMCQ() ([]MCQ, error) {
|
|||
|
||||
// GetMCQbyChoice returns the MCQ corresponding to a choice ID.
|
||||
func GetMCQbyChoice(cid int64) (m MCQ, c MCQ_entry, err error) {
|
||||
if errr := DBQueryRow("SELECT id_mcq, id_exercice, title FROM exercice_mcq WHERE id_mcq = (SELECT id_mcq FROM mcq_entries WHERE id_mcq_entry = ?)", cid).Scan(&m.Id, &m.IdExercice, &m.Title); err != nil {
|
||||
if errr := DBQueryRow("SELECT id_mcq, id_exercice, title FROM exercice_mcq WHERE id_mcq = (SELECT id_mcq FROM mcq_entries WHERE id_mcq_entry = ?)", cid).Scan(&m.Id, &m.IdExercice, &m.Title); errr != nil {
|
||||
return MCQ{}, MCQ_entry{}, errr
|
||||
}
|
||||
|
||||
if entries_rows, errr := DBQuery("SELECT id_mcq_entry, label, response FROM mcq_entries WHERE id_mcq = ?", m.Id); err != nil {
|
||||
if entries_rows, errr := DBQuery("SELECT id_mcq_entry, label, response FROM mcq_entries WHERE id_mcq = ?", m.Id); errr != nil {
|
||||
return MCQ{}, MCQ_entry{}, errr
|
||||
} else {
|
||||
defer entries_rows.Close()
|
||||
|
|
|
@ -278,7 +278,7 @@ func (t Team) HasSolved(e Exercice) (bool, time.Time) {
|
|||
|
||||
// GetSolvedRank returns the number of teams that solved the challenge before the Team.
|
||||
func (t Team) GetSolvedRank(e Exercice) (nb int64, err error) {
|
||||
if rows, errr := DBQuery("SELECT id_team FROM exercice_solved WHERE id_exercice = ? ORDER BY time ASC", e.Id); err != nil {
|
||||
if rows, errr := DBQuery("SELECT id_team FROM exercice_solved WHERE id_exercice = ? ORDER BY time ASC", e.Id); errr != nil {
|
||||
return nb, errr
|
||||
} else {
|
||||
defer rows.Close()
|
||||
|
|
Loading…
Reference in New Issue