@@ -135,7 +135,7 @@ func (l *HandlerWebAdmin) ServeHTTP(res http.ResponseWriter, req *http.Request)
135
135
case "/api/v1/admin/certs/replace" :
136
136
l .serveCertsReplace (res , req )
137
137
case "/api/v1/admin/csr" :
138
- l .serveCertsRequest (res , req )
138
+ l .serveCertsCSR (res , req )
139
139
case "/api/v1/admin/updates/install" :
140
140
l .serveUpdate (res , req )
141
141
default :
@@ -144,7 +144,7 @@ func (l *HandlerWebAdmin) ServeHTTP(res http.ResponseWriter, req *http.Request)
144
144
}
145
145
}
146
146
147
- func (l * HandlerWebAdmin ) serveCertsRequest (res http.ResponseWriter , req * http.Request ) {
147
+ func (l * HandlerWebAdmin ) serveCertsCSR (res http.ResponseWriter , req * http.Request ) {
148
148
if ! l .requirePostMethod (res , req ) {
149
149
return
150
150
}
@@ -239,7 +239,7 @@ func (l *HandlerWebAdmin) createCSR(data *csrRequestJSON, privateKey *rsa.Privat
239
239
// create certificate signing request
240
240
csrDER , err := x509 .CreateCertificateRequest (rand .Reader , & csrTemplate , privateKey )
241
241
if err != nil {
242
- return nil , fmt .Errorf ("could not create x509 certificate erro was: %s" , err .Error ())
242
+ return nil , fmt .Errorf ("could not create x509 certificate error was: %s" , err .Error ())
243
243
}
244
244
// Marshall to pem format
245
245
csrPEM := & pem.Block {Type : "CERTIFICATE REQUEST" , Bytes : csrDER }
@@ -254,12 +254,12 @@ func (l *HandlerWebAdmin) readPrivateKey() (*rsa.PrivateKey, error) {
254
254
if ! ok {
255
255
return nil , fmt .Errorf ("could not read certificate location from config" )
256
256
}
257
- pemdata , err := os .ReadFile (keyFile )
257
+ pemData , err := os .ReadFile (keyFile )
258
258
if err != nil {
259
259
return nil , fmt .Errorf ("could not read file: %s" , err .Error ())
260
260
}
261
261
262
- block , _ := pem .Decode (pemdata )
262
+ block , _ := pem .Decode (pemData )
263
263
if block .Type == "RSA PRIVATE KEY" {
264
264
return x509 .ParsePKCS1PrivateKey (block .Bytes ) //nolint:wrapcheck // Error is checked in calling method to avoid double checking
265
265
}
0 commit comments