diff --git a/contrib/backends/srndv2/src/srnd/installer.go b/contrib/backends/srndv2/src/srnd/installer.go index 6100bd9..f34504a 100644 --- a/contrib/backends/srndv2/src/srnd/installer.go +++ b/contrib/backends/srndv2/src/srnd/installer.go @@ -297,7 +297,7 @@ func handleKeyPost(self *dialogNode, form url.Values, conf *configparser.Configu func prepareKeyModel(self *dialogNode, err error, conf *configparser.Configuration) templateModel { param := make(map[string]interface{}) - public, secret := newSignKeypair() + public, secret := newNaclSignKeypair() param["dialog"] = &KeyModel{ErrorModel{err}, StepModel{self}, public, secret} return param } diff --git a/contrib/backends/srndv2/src/srnd/mod_http.go b/contrib/backends/srndv2/src/srnd/mod_http.go index 14f73e9..0408213 100644 --- a/contrib/backends/srndv2/src/srnd/mod_http.go +++ b/contrib/backends/srndv2/src/srnd/mod_http.go @@ -701,7 +701,7 @@ func (self httpModUI) HandleLogin(wr http.ResponseWriter, r *http.Request) { } func (self httpModUI) HandleKeyGen(wr http.ResponseWriter, r *http.Request) { - pk, sk := newSignKeypair() + pk, sk := newNaclSignKeypair() tripcode := makeTripcode(pk) self.writeTemplateParam(wr, r, "keygen.mustache", map[string]interface{}{"public": pk, "secret": sk, "tripcode": tripcode}) } diff --git a/contrib/backends/srndv2/src/srnd/tools.go b/contrib/backends/srndv2/src/srnd/tools.go index f98d221..81d941a 100644 --- a/contrib/backends/srndv2/src/srnd/tools.go +++ b/contrib/backends/srndv2/src/srnd/tools.go @@ -84,7 +84,7 @@ func reThumbnail(threads int, store ArticleStore, missing bool) { // generate a keypair from the command line func KeygenTool() { - pub, sec := newSignKeypair() + pub, sec := newNaclSignKeypair() log.Println("public key:", pub) log.Println("secret key:", sec) } diff --git a/contrib/backends/srndv2/src/srnd/util.go b/contrib/backends/srndv2/src/srnd/util.go index 0a105c9..57004bc 100644 --- a/contrib/backends/srndv2/src/srnd/util.go +++ b/contrib/backends/srndv2/src/srnd/util.go @@ -296,7 +296,7 @@ func ValidNewsgroup(newsgroup string) bool { return newsgroupValidFormat(newsgroup) } -func genKeypair() (pk, sk []byte) { +func genNaclKeypair() (pk, sk []byte) { sk = randbytes(32) pk, _ = naclSeedToKeyPair(sk) return @@ -304,8 +304,8 @@ func genKeypair() (pk, sk []byte) { // generate a new signing keypair // public, secret -func newSignKeypair() (string, string) { - pk, sk := genKeypair() +func newNaclSignKeypair() (string, string) { + pk, sk := genNaclKeypair() return hex.EncodeToString(pk), hex.EncodeToString(sk) }