diff --git a/.github/workflows/default.yml b/.github/workflows/default.yml index ea017240a..750b3771d 100644 --- a/.github/workflows/default.yml +++ b/.github/workflows/default.yml @@ -44,7 +44,7 @@ jobs: id: go - name: Patch ASN1 - run: sudo make patch-asn1 + run: make patch-asn1-sudo - name: Build run: make build @@ -63,7 +63,7 @@ jobs: id: go - name: Patch ASN1 - run: sudo make patch-asn1 + run: make patch-asn1-sudo - name: Test run: make test diff --git a/.github/workflows/nightly.yml b/.github/workflows/nightly.yml index 73dc2be1f..40ef26225 100644 --- a/.github/workflows/nightly.yml +++ b/.github/workflows/nightly.yml @@ -82,7 +82,7 @@ jobs: run: pip install --upgrade cloudsmith-cli - name: Patch ASN1 - run: sudo make patch-asn1 + run: make patch-asn1-sudo - name: Create nightly build uses: goreleaser/goreleaser-action@v3 diff --git a/.github/workflows/release.yml b/.github/workflows/release.yml index 566edf3cf..570090251 100644 --- a/.github/workflows/release.yml +++ b/.github/workflows/release.yml @@ -68,7 +68,7 @@ jobs: run: pip install --upgrade cloudsmith-cli - name: Patch ASN1 - run: sudo make patch-asn1 + run: make patch-asn1-sudo # gokrazy image # - name: Prepare Image diff --git a/Makefile b/Makefile index 2ba1c74a0..8fe16a816 100644 --- a/Makefile +++ b/Makefile @@ -127,6 +127,12 @@ soc:: go build $(BUILD_TAGS) $(BUILD_ARGS) github.com/evcc-io/evcc/cmd/soc # patch asn1.go to allow Elli buggy certificates to be accepted with EEBUS +patch-asn1-sudo:: + # echo $(GOROOT) + cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true" + sudo patch -N -t -d $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte -i $(CURRDIR)/patch/asn1.diff + cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true" + patch-asn1:: # echo $(GOROOT) cat $(GOROOT)/src/vendor/golang.org/x/crypto/cryptobyte/asn1.go | grep -C 1 "out = true"