From f63dc17f90bf5b989da66b7c5f388493d61dac7d Mon Sep 17 00:00:00 2001 From: Frank Denis Date: Wed, 18 Apr 2018 18:47:10 +0200 Subject: [PATCH] stamps -> dnsstamps --- dnscrypt-proxy/config.go | 2 +- dnscrypt-proxy/proxy.go | 2 +- dnscrypt-proxy/serversInfo.go | 2 +- dnscrypt-proxy/sources.go | 2 +- dnscrypt-proxy/xtransport.go | 4 ++-- stamps/stamps.go => dnsstamps/dnsstamps.go | 3 ++- 6 files changed, 8 insertions(+), 7 deletions(-) rename stamps/stamps.go => dnsstamps/dnsstamps.go (99%) diff --git a/dnscrypt-proxy/config.go b/dnscrypt-proxy/config.go index 1eac5bf1..e8df0703 100644 --- a/dnscrypt-proxy/config.go +++ b/dnscrypt-proxy/config.go @@ -13,7 +13,7 @@ import ( "github.com/BurntSushi/toml" "github.com/jedisct1/dlog" - "github.com/jedisct1/dnscrypt-proxy/stamps" + stamps "github.com/jedisct1/dnscrypt-proxy/dnsstamps" ) type Config struct { diff --git a/dnscrypt-proxy/proxy.go b/dnscrypt-proxy/proxy.go index f5fb0a05..20007e2c 100644 --- a/dnscrypt-proxy/proxy.go +++ b/dnscrypt-proxy/proxy.go @@ -9,9 +9,9 @@ import ( "time" "github.com/jedisct1/dlog" + stamps "github.com/jedisct1/dnscrypt-proxy/dnsstamps" clocksmith "github.com/jedisct1/go-clocksmith" "golang.org/x/crypto/curve25519" - "github.com/jedisct1/dnscrypt-proxy/stamps" ) type Proxy struct { diff --git a/dnscrypt-proxy/serversInfo.go b/dnscrypt-proxy/serversInfo.go index 25018275..ffc8a93f 100644 --- a/dnscrypt-proxy/serversInfo.go +++ b/dnscrypt-proxy/serversInfo.go @@ -17,7 +17,7 @@ import ( "github.com/VividCortex/ewma" "github.com/jedisct1/dlog" - "github.com/jedisct1/dnscrypt-proxy/stamps" + stamps "github.com/jedisct1/dnscrypt-proxy/dnsstamps" "golang.org/x/crypto/ed25519" ) diff --git a/dnscrypt-proxy/sources.go b/dnscrypt-proxy/sources.go index bd0f3553..aac01ed0 100644 --- a/dnscrypt-proxy/sources.go +++ b/dnscrypt-proxy/sources.go @@ -17,8 +17,8 @@ import ( "github.com/dchest/safefile" "github.com/jedisct1/dlog" + stamps "github.com/jedisct1/dnscrypt-proxy/dnsstamps" "github.com/jedisct1/go-minisign" - "github.com/jedisct1/dnscrypt-proxy/stamps" ) type SourceFormat int diff --git a/dnscrypt-proxy/xtransport.go b/dnscrypt-proxy/xtransport.go index 10d9f6c6..84cbe2af 100644 --- a/dnscrypt-proxy/xtransport.go +++ b/dnscrypt-proxy/xtransport.go @@ -16,9 +16,9 @@ import ( "strings" "sync" "time" - - "github.com/jedisct1/dnscrypt-proxy/stamps" + "github.com/jedisct1/dlog" + stamps "github.com/jedisct1/dnscrypt-proxy/dnsstamps" "github.com/miekg/dns" "golang.org/x/net/http2" ) diff --git a/stamps/stamps.go b/dnsstamps/dnsstamps.go similarity index 99% rename from stamps/stamps.go rename to dnsstamps/dnsstamps.go index 520280f4..658c6d89 100644 --- a/stamps/stamps.go +++ b/dnsstamps/dnsstamps.go @@ -1,4 +1,4 @@ -package stamps +package dnsstamps import ( "encoding/base64" @@ -29,6 +29,7 @@ const ( StampProtoTypePlain = StampProtoType(0x00) StampProtoTypeDNSCrypt = StampProtoType(0x01) StampProtoTypeDoH = StampProtoType(0x02) + StampProtoTypeTLS = StampProtoType(0x03) ) func (stampProtoType *StampProtoType) String() string {