From e1ee675d2fcdf25a763a1615f5c956298f1c3b64 Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Thu, 30 Jan 2020 15:19:56 +0100 Subject: [PATCH 1/4] Readme message --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 3b83854..aac3c90 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ `go get github.com/go-fed/httpsig` +Zimpler fork. Signature sets request-target as `[METHOD] [RESOURCE URI PATH]` instead of `[METHOD] [URL]` in upstream + Implementation of [HTTP Signatures](https://tools.ietf.org/html/draft-cavage-http-signatures). Supports many different combinations of MAC, HMAC signing of hash, or RSA From 7eab2541f6edf7a775dd92b1b8a447f845ce32a8 Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Thu, 30 Jan 2020 15:26:19 +0100 Subject: [PATCH 2/4] Updated readme, added gitignore --- .gitignore | 1 + README.md | 6 ++---- go.mod | 4 +++- go.modverify | 2 -- go.sum | 4 ++++ 5 files changed, 10 insertions(+), 7 deletions(-) create mode 100644 .gitignore delete mode 100644 go.modverify create mode 100644 go.sum diff --git a/.gitignore b/.gitignore new file mode 100644 index 0000000..485dee6 --- /dev/null +++ b/.gitignore @@ -0,0 +1 @@ +.idea diff --git a/README.md b/README.md index aac3c90..81d2cc2 100644 --- a/README.md +++ b/README.md @@ -1,8 +1,6 @@ # httpsig -`go get github.com/go-fed/httpsig` - -Zimpler fork. Signature sets request-target as `[METHOD] [RESOURCE URI PATH]` instead of `[METHOD] [URL]` in upstream +`go get github.com/Zimpler/httpsig` Implementation of [HTTP Signatures](https://tools.ietf.org/html/draft-cavage-http-signatures). @@ -19,7 +17,7 @@ signing of hash schemes. Its goals are: ## How to use -`import "github.com/go-fed/httpsig"` +`import "github.com/Zimpler/httpsig"` ### Signing diff --git a/go.mod b/go.mod index 2dbb7f7..fea329e 100644 --- a/go.mod +++ b/go.mod @@ -1,6 +1,8 @@ -module github.com/go-fed/httpsig +module github.com/Zimpler/httpsig require ( golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59 golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43 ) + +go 1.13 diff --git a/go.modverify b/go.modverify deleted file mode 100644 index c13a726..0000000 --- a/go.modverify +++ /dev/null @@ -1,2 +0,0 @@ -golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59 h1:hk3yo72LXLapY9EXVttc3Z1rLOxT9IuAPPX3GpY2+jo= -golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43 h1:PvnWIWTbA7gsEBkKjt0HV9hckYfcqYv8s/ju7ArZ0do= diff --git a/go.sum b/go.sum new file mode 100644 index 0000000..fa96bf3 --- /dev/null +++ b/go.sum @@ -0,0 +1,4 @@ +golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59 h1:hk3yo72LXLapY9EXVttc3Z1rLOxT9IuAPPX3GpY2+jo= +golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= +golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43 h1:PvnWIWTbA7gsEBkKjt0HV9hckYfcqYv8s/ju7ArZ0do= +golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= From 14cec775110bb20d40fe2974a2705d7a0ef07e93 Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Wed, 24 Jun 2020 13:27:15 +0200 Subject: [PATCH 3/4] updated readme --- README.md | 2 ++ 1 file changed, 2 insertions(+) diff --git a/README.md b/README.md index 81d2cc2..65ca1d4 100644 --- a/README.md +++ b/README.md @@ -2,6 +2,8 @@ `go get github.com/Zimpler/httpsig` +NOTE: why a fork? For verifying and locking versions + Implementation of [HTTP Signatures](https://tools.ietf.org/html/draft-cavage-http-signatures). Supports many different combinations of MAC, HMAC signing of hash, or RSA From 3b923867c499b40b72c85333addccbfa6b91c3ac Mon Sep 17 00:00:00 2001 From: Donal Byrne Date: Wed, 24 Jun 2020 13:36:20 +0200 Subject: [PATCH 4/4] Fixed merge conflict in mod --- go.sum | 7 +------ 1 file changed, 1 insertion(+), 6 deletions(-) diff --git a/go.sum b/go.sum index ff95908..fcff9fd 100644 --- a/go.sum +++ b/go.sum @@ -1,15 +1,10 @@ -<<<<<<< HEAD -golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59 h1:hk3yo72LXLapY9EXVttc3Z1rLOxT9IuAPPX3GpY2+jo= golang.org/x/crypto v0.0.0-20180527072434-ab813273cd59/go.mod h1:6SG95UA2DQfeDnfUPMdvaQW0Q7yPrPDi9nlGo2tz2b4= -golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43 h1:PvnWIWTbA7gsEBkKjt0HV9hckYfcqYv8s/ju7ArZ0do= -golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= -======= golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9 h1:vEg9joUBmeBcK9iSJftGNf3coIG4HqZElCPehJsfAYM= golang.org/x/crypto v0.0.0-20200604202706-70a84ac30bf9/go.mod h1:LzIPMQfyMNhhGPhUkYOs5KpL4U8rLKemX1yGLhDgUto= golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg= +golang.org/x/sys v0.0.0-20180525142821-c11f84a56e43/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY= golang.org/x/sys v0.0.0-20190412213103-97732733099d h1:+R4KGOnez64A81RvjARKc4UT5/tI9ujCIVX+P5KiHuI= golang.org/x/sys v0.0.0-20190412213103-97732733099d/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs= golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ= ->>>>>>> upstream/master