Skip to content

Commit

Permalink
Update name of Go module and fix links for new repo location
Browse files Browse the repository at this point in the history
Signed-off-by: Steffen Vogel <[email protected]>
  • Loading branch information
stv0g committed Aug 14, 2023
1 parent bab962f commit 81d4820
Show file tree
Hide file tree
Showing 26 changed files with 55 additions and 41 deletions.
2 changes: 1 addition & 1 deletion .golangci.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,7 @@ linters-settings:
- "!**/*_test.go"
allow:
- $gostd
- github.com/stv0g/go-rosenpass
- cunicu.li/go-rosenpass
- github.com/pelletier/go-toml/v2
- github.com/spf13/cobra
- golang.org/x/crypto/blake2b
Expand Down
2 changes: 1 addition & 1 deletion .goreleaser.yaml
Original file line number Diff line number Diff line change
Expand Up @@ -54,7 +54,7 @@ archives:

release:
github:
owner: stv0g
owner: cunicu
name: go-rosenpass

draft: true
Expand Down
2 changes: 1 addition & 1 deletion .renovaterc.json
Original file line number Diff line number Diff line change
@@ -1,6 +1,6 @@
{
"$schema": "https://docs.renovatebot.com/renovate-schema.json",
"extends": [
"github>stv0g/renovate-config"
"github>cunicu/renovate-config"
]
}
2 changes: 1 addition & 1 deletion .reuse/dep5
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
Format: https://www.debian.org/doc/packaging-manuals/copyright-format/1.0/
Upstream-Name: go-rosenpass
Upstream-Contact: Steffen Vogel <[email protected]>
Source: https://github.com/stv0g/go-rosenpass
Source: https://github.com/cunicu/go-rosenpass

Files: go.mod go.sum testdata/**
Copyright: 2023 Steffen Vogel <[email protected]>
Expand Down
14 changes: 7 additions & 7 deletions README.md
Original file line number Diff line number Diff line change
@@ -1,11 +1,11 @@
# go-rosenpass

<!-- [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/stv0g/go-rosenpass/test.yaml?style=flat-square)](https://github.com/stv0g/go-rosenpass/actions) -->
[![Codecov branch](https://img.shields.io/codecov/c/github/stv0g/go-rosenpass/master?style=flat-square&token=xUGG2iEsuQ)](https://app.codecov.io/gh/stv0g/go-rosenpass/tree/master)
[![goreportcard](https://goreportcard.com/badge/github.com/stv0g/go-rosenpass?style=flat-square)](https://goreportcard.com/report/github.com/stv0g/go-rosenpass)
[![License](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)](https://github.com/stv0g/go-rosenpass/blob/master/LICENSES/Apache-2.0.txt)
![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/stv0g/go-rosenpass?style=flat-square)
[![Go Reference](https://pkg.go.dev/badge/github.com/stv0g/go-rosenpass.svg)](https://pkg.go.dev/github.com/stv0g/go-rosenpass)
<!-- [![GitHub Workflow Status](https://img.shields.io/github/actions/workflow/status/cunicu/go-rosenpass/test.yaml?style=flat-square)](https://github.com/cunicu/go-rosenpass/actions) -->
[![Codecov branch](https://img.shields.io/codecov/c/github/cunicu/go-rosenpass/master?style=flat-square&token=xUGG2iEsuQ)](https://app.codecov.io/gh/cunicu/go-rosenpass/tree/master)
[![goreportcard](https://goreportcard.com/badge/github.com/cunicu/go-rosenpass?style=flat-square)](https://goreportcard.com/report/github.com/cunicu/go-rosenpass)
[![License](https://img.shields.io/badge/license-Apache%202.0-blue?style=flat-square)](https://github.com/cunicu/go-rosenpass/blob/master/LICENSES/Apache-2.0.txt)
![GitHub go.mod Go version](https://img.shields.io/github/go-mod/go-version/cunicu/go-rosenpass?style=flat-square)
[![Go Reference](https://pkg.go.dev/badge/github.com/cunicu/go-rosenpass.svg)](https://pkg.go.dev/github.com/cunicu/go-rosenpass)

🚧 go-rosenpass has not been audited. Please use with care!

Expand All @@ -20,7 +20,7 @@ The implementation aims to be compatible with the reference implementation in Ru

### Pre-build binaries

_go-rosenpass_ distributes builds via [GitHub Releases](https://github.com/stv0g/go-rosenpass/releases).
_go-rosenpass_ distributes builds via [GitHub Releases](https://github.com/cunicu/go-rosenpass/releases).
You can download a pre-built binary from there.

## References
Expand Down
6 changes: 4 additions & 2 deletions cmd/exchange.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,9 +6,11 @@ package main
import (
"fmt"

"cunicu.li/go-rosenpass/config"

rp "cunicu.li/go-rosenpass"

"github.com/spf13/cobra"
rp "github.com/stv0g/go-rosenpass"
"github.com/stv0g/go-rosenpass/config"
)

func exchange(_ *cobra.Command, args []string) error {
Expand Down
6 changes: 4 additions & 2 deletions cmd/gen_config.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,9 +7,11 @@ import (
"fmt"
"os"

"cunicu.li/go-rosenpass/config"

rp "cunicu.li/go-rosenpass"

"github.com/spf13/cobra"
rp "github.com/stv0g/go-rosenpass"
"github.com/stv0g/go-rosenpass/config"
)

func genConfig(_ *cobra.Command, args []string) error {
Expand Down
6 changes: 4 additions & 2 deletions cmd/gen_key.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,9 +8,11 @@ import (
"fmt"
"os"

"cunicu.li/go-rosenpass/config"

rp "cunicu.li/go-rosenpass"

"github.com/spf13/cobra"
rp "github.com/stv0g/go-rosenpass"
"github.com/stv0g/go-rosenpass/config"
)

func genKey(_ *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion cmd/main.go
Original file line number Diff line number Diff line change
Expand Up @@ -20,7 +20,7 @@ var (
genManOpts = doc.GenManTreeOptions{
CommandSeparator: "-",
Header: &doc.GenManHeader{
Source: "https://github.com/stv0g/go-rosenpass",
Source: "https://github.com/cunicu/go-rosenpass",
},
}

Expand Down
3 changes: 2 additions & 1 deletion cmd/validate.go
Original file line number Diff line number Diff line change
Expand Up @@ -7,8 +7,9 @@ import (
"fmt"
"log/slog"

"cunicu.li/go-rosenpass/config"

"github.com/spf13/cobra"
"github.com/stv0g/go-rosenpass/config"
)

func validate(_ *cobra.Command, args []string) error {
Expand Down
2 changes: 1 addition & 1 deletion config/arguments.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"log/slog"

rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"
)

var (
Expand Down
3 changes: 2 additions & 1 deletion config/arguments_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ package config_test
import (
"testing"

"cunicu.li/go-rosenpass/config"

"github.com/stretchr/testify/require"
"github.com/stv0g/go-rosenpass/config"
)

func TestArguments(t *testing.T) {
Expand Down
3 changes: 2 additions & 1 deletion config/file.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,9 @@ import (
"os"
"path/filepath"

rp "cunicu.li/go-rosenpass"

"github.com/pelletier/go-toml/v2"
rp "github.com/stv0g/go-rosenpass"
)

type File struct {
Expand Down
2 changes: 1 addition & 1 deletion config/handler_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"os/exec"
"strings"

rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"
)

type exchangeCommandHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion config/handler_keyout.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"os"
"path/filepath"

rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"
)

type keyoutFileHandler struct {
Expand Down
2 changes: 1 addition & 1 deletion config/handler_wg_cmd.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package config

import (
rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"
)

type wireGuardHandler struct {
Expand Down
3 changes: 2 additions & 1 deletion config/handler_wg_wgctrl.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,8 @@ import (
"fmt"
"log/slog"

rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"

"golang.zx2c4.com/wireguard/wgctrl"
"golang.zx2c4.com/wireguard/wgctrl/wgtypes"
)
Expand Down
5 changes: 2 additions & 3 deletions config/peer_section.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,8 +10,7 @@ import (
"os"
"path/filepath"

"github.com/stv0g/go-rosenpass"
rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"
)

type WireGuardSection struct {
Expand Down Expand Up @@ -42,7 +41,7 @@ type PeerSection struct {
WireGuard *WireGuardSection `toml:"wireguard,inline" comment:"Settings for directly configuring a WireGuard peer with the negotiated PSK"`
}

func (ps *PeerSection) ToConfig() (pc rosenpass.PeerConfig, err error) {
func (ps *PeerSection) ToConfig() (pc rp.PeerConfig, err error) {
if pc.PublicKey, err = os.ReadFile(ps.PublicKey); err != nil {
return pc, fmt.Errorf("failed to read public key: %w", err)
}
Expand Down
4 changes: 2 additions & 2 deletions go.mod
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
module github.com/stv0g/go-rosenpass
module cunicu.li/go-rosenpass

go 1.21

Expand Down Expand Up @@ -34,4 +34,4 @@ require (
// For Classic McEliece support
// Based on older version of https://github.com/cloudflare/circl/pull/378
// implementing the round 3 version of Classic McEliece without plaintext confirmation
replace github.com/cloudflare/circl => github.com/stv0g/circl v0.0.0-20230801113412-fec58fc7b5f6
replace github.com/cloudflare/circl => github.com/cunicu/circl v0.0.0-20230801113412-fec58fc7b5f6
4 changes: 2 additions & 2 deletions go.sum
Original file line number Diff line number Diff line change
@@ -1,5 +1,7 @@
github.com/cpuguy83/go-md2man/v2 v2.0.2 h1:p1EgwI/C7NhT0JmVkwCD2ZBK8j4aeHQX2pMHHBfMQ6w=
github.com/cpuguy83/go-md2man/v2 v2.0.2/go.mod h1:tgQtvFlXSQOSOSIRvRPT7W67SCa46tRHOmNcaadrF8o=
github.com/cunicu/circl v0.0.0-20230801113412-fec58fc7b5f6 h1:/DS5cDX3FJdl+XaN2D7XAwFpuanTxnp52DBLZAaJKx0=
github.com/cunicu/circl v0.0.0-20230801113412-fec58fc7b5f6/go.mod h1:+CauBF6R70Jqcyl8N2hC8pAXYbWkGIezuSbuGLtRhnw=
github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
Expand Down Expand Up @@ -34,8 +36,6 @@ github.com/stretchr/testify v1.7.1/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/
github.com/stretchr/testify v1.8.0/go.mod h1:yNjHg4UonilssWZ8iaSj1OCr/vHnekPRkoO+kdMU+MU=
github.com/stretchr/testify v1.8.4 h1:CcVxjf3Q8PM0mHUKJCdn+eZZtm5yQwehR5yeSVQQcUk=
github.com/stretchr/testify v1.8.4/go.mod h1:sz/lmYIOXD/1dqDmKjjqLyZ2RngseejIcXlSw2iwfAo=
github.com/stv0g/circl v0.0.0-20230801113412-fec58fc7b5f6 h1:+lCakOkbjp3Qcc73KlV8sHoxTGfBA9VA22J1s3mVwaM=
github.com/stv0g/circl v0.0.0-20230801113412-fec58fc7b5f6/go.mod h1:+CauBF6R70Jqcyl8N2hC8pAXYbWkGIezuSbuGLtRhnw=
golang.org/x/crypto v0.12.0 h1:tFM/ta59kqch6LlvYnPa0yx5a83cL2nHflFhYKvv9Yk=
golang.org/x/crypto v0.12.0/go.mod h1:NF0Gs7EO5K4qLn+Ylc+fih8BSTeIjAP05siRnAh98yw=
golang.org/x/net v0.14.0 h1:BONx9s002vGdD9umnlX1Po8vOZmrgH34qlHcD1MfK14=
Expand Down
2 changes: 1 addition & 1 deletion internal/test/keyout.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"os"

rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"
)

func readKeyOutFile(fn string) (rp.Key, error) {
Expand Down
5 changes: 3 additions & 2 deletions internal/test/server_standalone.go
Original file line number Diff line number Diff line change
Expand Up @@ -14,8 +14,9 @@ import (
"os/exec"
"path/filepath"

rp "github.com/stv0g/go-rosenpass"
"github.com/stv0g/go-rosenpass/config"
"cunicu.li/go-rosenpass/config"

rp "cunicu.li/go-rosenpass"
)

type StandaloneServer struct {
Expand Down
2 changes: 1 addition & 1 deletion main_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"testing"
"time"

rp "github.com/stv0g/go-rosenpass"
rp "cunicu.li/go-rosenpass"
)

func TestMain(m *testing.M) {
Expand Down
3 changes: 2 additions & 1 deletion output_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ package rosenpass_test
import (
"testing"

rp "cunicu.li/go-rosenpass"

"github.com/stretchr/testify/require"
rp "github.com/stv0g/go-rosenpass"
)

func TestOutput(t *testing.T) {
Expand Down
6 changes: 4 additions & 2 deletions server_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,11 @@ import (
"path/filepath"
"testing"

"cunicu.li/go-rosenpass/internal/test"

rp "cunicu.li/go-rosenpass"

"github.com/stretchr/testify/require"
rp "github.com/stv0g/go-rosenpass"
"github.com/stv0g/go-rosenpass/internal/test"
)

type handshakeHandler struct {
Expand Down
3 changes: 2 additions & 1 deletion types_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,8 +6,9 @@ package rosenpass_test
import (
"testing"

rp "cunicu.li/go-rosenpass"

"github.com/stretchr/testify/require"
rp "github.com/stv0g/go-rosenpass"
)

func TestKey(t *testing.T) {
Expand Down

0 comments on commit 81d4820

Please sign in to comment.