Rename to 'soh'

Two main reasons: * Dropped the 3 to be ready for HTTP/2 * Avoiding confusion with OpenSSH. ( We don't want to panic SSH users to update their SSH. And we don't want to keep explaining this project is not next OpenSSH release.) For reproducing this large change: vi +/stand README.md grep -rl ssh3 | grep -v .git/ | xargs sed --in-place -e 's/ssh3/soh/g' grep -rl SSH3 | grep -v .git/ | xargs sed --in-place -e 's/SSH3/SOH/g' find . -name '*ssh3*' -type f git mv s{sh3,oh}_suite_test.go git mv integration_tests/s{sh3,oh}_test.go cd resources/figures/ git mv s{sh3,oh}.png git mv s{sh3,oh}_oidc.gif git mv s{sh3,oh}_100ms_rtt.gif cd - find . -name '*ssh3*' -type f # all ssh3 filenames gone? This change as "point of view from git": 35 files changed, 351 insertions(+), 351 deletions(-) rename integration_tests/{ssh3_test.go => soh_test.go} (90%) rename resources/figures/{ssh3.png => soh.png} (100%) rename resources/figures/{ssh3_100ms_rtt.gif => soh_100ms_rtt.gif} (100%) rename resources/figures/{ssh3_oidc.gif => soh_oidc.gif} (100%) rename ssh3_suite_test.go => soh_suite_test.go (90%) Signed-off-by: Geert Stappers <[email protected]>
francoismichel · Jan 11, 2024 · 29dd167 · 29dd167
1 parent a47c1b3
commit 29dd167
Show file tree

Hide file tree

Showing 36 changed files with 372 additions and 372 deletions.
diff --git a/.github/workflows/build.yml b/.github/workflows/build.yml
@@ -9,9 +9,9 @@ jobs:
         matrix:
           go-version: [ '1.21.x', '1.22.0-rc.1' ]
           goos: [linux]
-          testuser: [ssh3-testuser]
-          testpasswd: [ssh3-testpasswd]
-          testuserhome: [/home/ssh3-testuser]
+          testuser: [soh-testuser]
+          testpasswd: [soh-testpasswd]
+          testuserhome: [/home/soh-testuser]
           archparams: [{goarch: amd64, cc: gcc}] #,{goarch: arm64, cc: aarch64-linux-gnu-gcc}]
     runs-on: ubuntu-22.04
 
@@ -37,14 +37,14 @@ jobs:
         run: sudo useradd -s /bin/bash -m ${{matrix.testuser}} && echo "${{matrix.testuser}}:${{matrix.testpasswd}}" | sudo chpasswd
       - name: Ensure there are no existing .profile or similar files for testuser
         run:  sudo rm -f ${{matrix.testuserhome}}/.profile ${{matrix.testuserhome}}/.bash_profile ${{matrix.testuserhome}}/.bash_login
-      - name: Create .ssh3 directory
-        run: sudo su ${{matrix.testuser}} -c 'mkdir ${{matrix.testuserhome}}/.ssh ${{matrix.testuserhome}}/.ssh3'
+      - name: Create .soh directory
+        run: sudo su ${{matrix.testuser}} -c 'mkdir ${{matrix.testuserhome}}/.ssh ${{matrix.testuserhome}}/.soh'
       - name: add the attacker's key as commented in testuser's authorzed identities
-        run: echo "#" $(cat attacker_id_rsa.pub) | sudo tee -a ${{matrix.testuserhome}}/.ssh3/authorized_identities
+        run: echo "#" $(cat attacker_id_rsa.pub) | sudo tee -a ${{matrix.testuserhome}}/.soh/authorized_identities
       - name: Put test public keys in testuser's authorized_identities
-        run: cat /testuser_id_rsa.pub /testuser_id_ed25519.pub | sudo tee -a ${{matrix.testuserhome}}/.ssh3/authorized_identities
+        run: cat /testuser_id_rsa.pub /testuser_id_ed25519.pub | sudo tee -a ${{matrix.testuserhome}}/.soh/authorized_identities
       - name: log authorized_identities
-        run: cat ${{matrix.testuserhome}}/.ssh3/authorized_identities
+        run: cat ${{matrix.testuserhome}}/.soh/authorized_identities
       - name: Integration tests
         run: sudo -E PATH=$PATH make -e integration-tests
         env:
@@ -58,7 +58,7 @@ jobs:
           CGO_ENABLED: "1"
           GOOS: ${{matrix.goos}}
           GOARCH: ${{matrix.archparams.goarch}}
-          SSH3_INTEGRATION_TESTS_WITH_SERVER_ENABLED: "1"
+          SOH_INTEGRATION_TESTS_WITH_SERVER_ENABLED: "1"
   build-macos:
     strategy:
       matrix:

diff --git a/.github/workflows/test.yml b/.github/workflows/test.yml
@@ -9,9 +9,9 @@ jobs:
         matrix:
           go-version: [ '1.21.x', '1.22.0-rc.1' ]
           goos: [linux]
-          testuser: [ssh3-testuser]
-          testpasswd: [ssh3-testpasswd]
-          testuserhome: [/home/ssh3-testuser]
+          testuser: [soh-testuser]
+          testpasswd: [soh-testpasswd]
+          testuserhome: [/home/soh-testuser]
           archparams: [{goarch: amd64, cc: gcc}] #,{goarch: arm64, cc: aarch64-linux-gnu-gcc}]
     runs-on: ubuntu-22.04
 

diff --git a/.goreleaser-client-only-windows.yml b/.goreleaser-client-only-windows.yml
@@ -17,9 +17,9 @@ before:
 
 builds:
   - 
-    id: "ssh3"
-    main: ./cmd/ssh3/main.go
-    binary: ssh3
+    id: "soh"
+    main: ./cmd/soh/main.go
+    binary: soh
     goos:
       - windows
     goarch:

diff --git a/.goreleaser-linux-amd64.yml b/.goreleaser-linux-amd64.yml
@@ -17,9 +17,9 @@ before:
 
 builds:
   - 
-    id: "ssh3"
-    main: ./cmd/ssh3/main.go
-    binary: ssh3
+    id: "soh"
+    main: ./cmd/soh/main.go
+    binary: soh
     goos:
       - linux
     goarch:
@@ -30,9 +30,9 @@ builds:
       - static_build
       - feature
   - 
-    id: "ssh3-server"
-    main: ./cmd/ssh3-server/main.go
-    binary: ssh3-server
+    id: "soh-server"
+    main: ./cmd/soh-server/main.go
+    binary: soh-server
     env:
       - CGO_ENABLED=1
       - CC=/usr/local/musl/bin/musl-gcc

diff --git a/.goreleaser-linux-arm64.yml b/.goreleaser-linux-arm64.yml
@@ -17,9 +17,9 @@ before:
 
 builds:
   - 
-    id: "ssh3"
-    main: ./cmd/ssh3/main.go
-    binary: ssh3
+    id: "soh"
+    main: ./cmd/soh/main.go
+    binary: soh
     goos:
       - linux
     goarch: 
@@ -30,9 +30,9 @@ builds:
       - static_build
       - feature
   - 
-    id: "ssh3-server"
-    main: ./cmd/ssh3-server/main.go
-    binary: ssh3-server
+    id: "soh-server"
+    main: ./cmd/soh-server/main.go
+    binary: soh-server
     env:
       - CC=/tmp/aarch64-linux-musl-cross/bin/aarch64-linux-musl-gcc
       - CGO_ENABLED=1

diff --git a/.goreleaser-unix.yml b/.goreleaser-unix.yml
@@ -17,9 +17,9 @@ before:
 
 builds:
   - 
-    id: "ssh3"
-    main: ./cmd/ssh3/main.go
-    binary: ssh3
+    id: "soh"
+    main: ./cmd/soh/main.go
+    binary: soh
     goos:
       - darwin
       - freebsd
@@ -39,9 +39,9 @@ builds:
       - netgo
       - static_build
   -
-    id: "ssh3-server"
-    main: ./cmd/ssh3-server/main.go
-    binary: ssh3-server
+    id: "soh-server"
+    main: ./cmd/soh-server/main.go
+    binary: soh-server
     goos:
       - darwin
       - freebsd

diff --git a/Makefile b/Makefile
@@ -24,17 +24,17 @@ integration-tests:
 		CC=$(CC) \
 		CGO_ENABLED=1 \
 		GOOS=$(GOOS) \
-		SSH3_INTEGRATION_TESTS_WITH_SERVER_ENABLED=1 \
+		SOH_INTEGRATION_TESTS_WITH_SERVER_ENABLED=1 \
 		go run github.com/onsi/ginkgo/v2/ginkgo ./integration_tests
 
 install:
-	$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/ssh3
-	$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/ssh3-server
+	$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/soh
+	$(GO_OPTS) go install $(BUILDFLAGS) ./cmd/soh-server
 
 build: client server
 
 client:
-	$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/client ./cmd/ssh3/
+	$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/client ./cmd/soh/
 
 server:
-	$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/server ./cmd/ssh3-server/
+	$(GO_OPTS) go build -tags "$(GO_TAGS)" $(BUILD_FLAGS) -o bin/server ./cmd/soh-server/